RTC64 Pro: Desktop Utility and Build Hardening

Makefile

@@ -7,30 +7,34 @@ CFLAGS = -Wall -Wextra -Werror -std=c11 -ffreestanding -fno-stack-protector \
          -isystem ./external/limine -isystem ./external/CherryUSB/common -isystem ./external/CherryUSB/core -isystem ./external/CherryUSB/class/msc -isystem ./external/CherryUSB/class/hid -isystem ./external/CherryUSB/class/hub \
          -include kernel/usb_config.h -DKERNEL_MODE -Wno-unused-function
 LDFLAGS = -nostdlib -static -m elf_x86_64 -z max-page-size=0x1000 -T kernel/linker.ld
-KERNEL_OBJS = kernel/entry.o kernel/kernel.o src/app_ui.o src/chell.o src/lab.o src/installer.o \
+KERNEL_OBJS = kernel/entry.o kernel/kernel.o src/app_ui.o \
+              src/ui_icons.o \
+              kernel/nanosvg_impl.o \
               kernel/nuklear_kernel_impl.o kernel/stb_image_impl.o \
-              src/nuklear_impl.o kernel/syscall.o kernel/sys_shell.o \
+              src/nuklear_impl.o src/nk_software_renderer.o kernel/syscall.o kernel/sys_shell.o \
+              kernel/crash_notify.o \
               kernel/usb_osal.o kernel/usb_hal_ports.o kernel/storage.o kernel/input.o \
               kernel/app_loader.o kernel/usb_hal.o kernel/vfs.o kernel/scheduler.o \
               kernel/serial.o kernel/i18n.o kernel/uac_policy.o kernel/tgx_impl.o \
               kernel/tlsf_impl.o kernel/math.o kernel/panic.o \
-              kernel/gdt.o kernel/interrupts.o kernel/isr_stubs.o \
+              kernel/gdt.o kernel/msr.o kernel/interrupts.o kernel/isr_stubs.o \
               kernel/apic.o kernel/pmm.o kernel/comprec.o kernel/cm.o \
               kernel/malloc_glue.o kernel/vga_log.o kernel/storage_hal.o src/main.o kernel/panic_hal.o \
+              kernel/registry.o kernel/net.o \
               kernel/diskio_impl.o kernel/ffsystem_impl.o \
               kernel/fatfs/ff.o kernel/fatfs/ffunicode.o \
               kernel/drivers/pci.o kernel/drivers/xhci.o kernel/drivers/ehci.o \
               kernel/drivers/virtio_net.o kernel/drivers/virtio_net_linux.o \
               kernel/linux_compat.o kernel/linux_irq.o kernel/linux_pci_compat.o \
-              src/app_studio.o kernel/drivers/nvme.o kernel/drivers/ahci.o kernel/drivers/ramdisk.o \
+              kernel/drivers/nvme.o kernel/drivers/ahci.o kernel/drivers/ramdisk.o \
               kernel/drivers/ps2.o kernel/drivers/rtc.o \
               external/CherryUSB/core/usbh_core.o \
               external/CherryUSB/class/msc/usbh_msc.o \
               external/CherryUSB/class/hid/usbh_hid.o \
               external/CherryUSB/class/hub/usbh_hub.o \
               external/CherryUSB/port/ehci/usb_hc_ehci.o
 .PHONY: all clean environment iso run
-all: environment kernel/kernel iso
+all: environment userland kernel/kernel iso
 environment:
 	chmod +x build.sh
 	./build.sh
@@ -60,5 +64,9 @@ iso: kernel/kernel
 	./external/limine/limine bios-install os.iso
 run: all
 	qemu-system-x86_64 -m 512M -cdrom os.iso -boot d -device qemu-xhci -device usb-kbd -device usb-mouse -serial stdio
+userland:
+	make -C apps all
+
 clean:
 	rm -rf $(KERNEL_OBJS) kernel/kernel kernel/ramdisk.img os.iso iso_root/
+	make -C apps clean

apps/Makefile

@@ -0,0 +1,8 @@
+SUBDIRS = shell lab studio notepad tests
+
+all:
+	for dir in $(SUBDIRS); do $(MAKE) -C $$dir all; done
+
+clean:
+	for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean; done
+	rm -f lib/*.o

apps/app.mk

@@ -0,0 +1,24 @@
+CC = gcc
+LD = ld
+LIB_DIR = ../lib
+CFLAGS = -Wall -Wextra -Werror -std=c11 -ffreestanding -fno-stack-protector -fno-stack-check -fno-lto -fno-pic -m64 -march=x86-64 -I../../include -I../../kernel -I$(LIB_DIR)
+LDFLAGS = -nostdlib -static -m elf_x86_64 -T $(LIB_DIR)/app.ld
+
+OBJS = app.o $(LIB_DIR)/crt0.o $(LIB_DIR)/user_rsl.o
+
+all: app.bin
+
+app.bin: $(OBJS)
+	$(LD) $(LDFLAGS) $(OBJS) -o app.bin
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.c
+	$(CC) $(CFLAGS) -DRSL_IMPLEMENTATION -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.s
+	$(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
+
+clean:
+	rm -f *.o app.bin

apps/lab/Makefile

@@ -0,0 +1,24 @@
+CC = gcc
+LD = ld
+LIB_DIR = ../lib
+CFLAGS = -Wall -Wextra -Werror -std=c11 -ffreestanding -fno-stack-protector -fno-stack-check -fno-lto -fno-pic -m64 -march=x86-64 -I../../include -I../../kernel -I$(LIB_DIR)
+LDFLAGS = -nostdlib -static -m elf_x86_64 -T $(LIB_DIR)/app.ld
+
+OBJS = app.o $(LIB_DIR)/crt0.o $(LIB_DIR)/user_rsl.o
+
+all: app.bin
+
+app.bin: $(OBJS)
+	$(LD) $(LDFLAGS) $(OBJS) -o app.bin
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.c
+	$(CC) $(CFLAGS) -DRSL_IMPLEMENTATION -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.s
+	$(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
+
+clean:
+	rm -f *.o app.bin

apps/lab/app.c

@@ -0,0 +1,6 @@
+#include "user_rsl.h"
+
+int main() {
+    rsl_printf("Diagnostics active.\n");
+    return 0;
+}

apps/lib/app.ld

@@ -0,0 +1,23 @@
+ENTRY(_start)
+
+SECTIONS
+{
+    . = 0x400000;
+
+    .text : {
+        *(.text.prologue)
+        *(.text*)
+    }
+
+    .rodata : {
+        *(.rodata*)
+    }
+
+    .data : {
+        *(.data*)
+    }
+
+    .bss : {
+        *(.bss*)
+    }
+}

apps/lib/crt0.s

@@ -0,0 +1,9 @@
+.section .text.prologue
+.global _start
+_start:
+    call main
+    movq %rax, %rdi
+    /* Exit syscall */
+    movq $0x0E, %rax /* SYS_EXIT */
+    syscall
+    hlt

apps/lib/rsl.h

@@ -0,0 +1,30 @@
+/* Rtech Standard Library (RSL) Header */
+#ifndef RSL_H
+#define RSL_H
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+
+#define SYS_VFS_LS 0x01
+#define SYS_VFS_CAT 0x02
+#define SYS_VFS_MKDIR 0x03
+#define SYS_VFS_WRITE 0x04
+#define SYS_MALLOC 0x08
+#define SYS_EXIT 0x0E
+
+static inline long syscall3(long num, void* a1, void* a2, size_t a3) {
+    long ret;
+    __asm__ volatile("mov %1, %%rax\n\t"
+                     "mov %2, %%rdi\n\t"
+                     "mov %3, %%rsi\n\t"
+                     "mov %4, %%rdx\n\t"
+                     "syscall" : "=a"(ret) : "g"(num), "g"(a1), "g"(a2), "g"(a3) : "rcx", "r11", "memory");
+    return ret;
+}
+
+static inline int rsl_ls(const char* path, char* buf, size_t sz) { return (int)syscall3(SYS_VFS_LS, (void*)path, (void*)buf, sz); }
+static inline int rsl_write(const char* path, const char* content) { return (int)syscall3(SYS_VFS_WRITE, (void*)path, (void*)content, 0); }
+static inline void* rsl_malloc(size_t sz) { return (void*)syscall3(SYS_MALLOC, (void*)sz, 0, 0); }
+static inline void rsl_exit(void) { syscall3(SYS_EXIT, 0, 0, 0); }
+
+#endif

apps/lib/user_rsl.c

@@ -0,0 +1,38 @@
+#include "user_rsl.h"
+#include <stdarg.h>
+#include <stdio.h>
+
+/* Very minimal vsnprintf for userland apps if we don't link with kernel implementation */
+/* For now, just a dummy or we can try to reuse the kernel headers if we're careful. */
+/* Userland shouldn't ideally include kernel headers. */
+
+void rsl_printf(const char* fmt, ...) {
+    /* For simplicity in this demo, just send the raw string to serial */
+    /* Real implementation would use vsnprintf */
+    syscall(SYS_SERIAL_WRITE, fmt, NULL, 0);
+}
+
+int rsl_ls(const char* path, char* out, size_t sz) {
+    return (int)syscall(SYS_VFS_LS, path, out, sz);
+}
+
+void* rsl_malloc(size_t size) {
+    return (void*)syscall(SYS_MALLOC, (void*)size, NULL, 0);
+}
+
+int rsl_read(const char* path, void* buffer, size_t sz) {
+    return (int)syscall(SYS_VFS_READ, path, buffer, sz);
+}
+
+int rsl_write(const char* path, const char* content) {
+    return (int)syscall(SYS_VFS_WRITE, path, (void*)content, 0);
+}
+
+int rsl_mkdir(const char* path) {
+    return (int)syscall(SYS_VFS_MKDIR, path, NULL, 0);
+}
+
+void rsl_exit(int code) {
+    (void)code;
+    syscall(SYS_EXIT, NULL, NULL, 0);
+}

apps/lib/user_rsl.h

@@ -0,0 +1,45 @@
+#ifndef USER_RSL_H
+#define USER_RSL_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+/* These should match include/syscall_nums.h */
+#define SYS_VFS_LS          0x01
+#define SYS_VFS_CAT         0x02
+#define SYS_VFS_MKDIR       0x03
+#define SYS_VFS_WRITE       0x04
+#define SYS_VFS_MOUNTS      0x05
+#define SYS_DEVMGR_LIST     0x06
+#define SYS_I18N_TRANSLATE  0x07
+#define SYS_MALLOC          0x08
+#define SYS_FREE            0x09
+#define SYS_GET_UPTIME      0x0A
+#define SYS_GET_CPU_LOAD    0x0B
+#define SYS_SPAWN           0x0C
+#define SYS_YIELD           0x0D
+#define SYS_EXIT            0x0E
+#define SYS_SERIAL_WRITE    0x0F
+#define SYS_VFS_READ        0x10
+#define SYS_VFS_RM          0x11
+
+static inline long syscall(long num, const void* a1, const void* a2, size_t a3) {
+    long ret;
+    __asm__ volatile (
+        "syscall"
+        : "=a"(ret)
+        : "a"(num), "D"(a1), "S"(a2), "d"(a3)
+        : "rcx", "r11", "memory"
+    );
+    return ret;
+}
+
+void rsl_printf(const char* fmt, ...);
+int rsl_ls(const char* path, char* out, size_t sz);
+void* rsl_malloc(size_t size);
+int rsl_read(const char* path, void* buffer, size_t sz);
+int rsl_write(const char* path, const char* content);
+int rsl_mkdir(const char* path);
+void rsl_exit(int code);
+
+#endif

apps/notepad/Makefile

@@ -0,0 +1,24 @@
+CC = gcc
+LD = ld
+LIB_DIR = ../lib
+CFLAGS = -Wall -Wextra -Werror -std=c11 -ffreestanding -fno-stack-protector -fno-stack-check -fno-lto -fno-pic -m64 -march=x86-64 -I../../include -I../../kernel -I$(LIB_DIR)
+LDFLAGS = -nostdlib -static -m elf_x86_64 -T $(LIB_DIR)/app.ld
+
+OBJS = app.o $(LIB_DIR)/crt0.o $(LIB_DIR)/user_rsl.o
+
+all: app.bin
+
+app.bin: $(OBJS)
+	$(LD) $(LDFLAGS) $(OBJS) -o app.bin
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.c
+	$(CC) $(CFLAGS) -DRSL_IMPLEMENTATION -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.s
+	$(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
+
+clean:
+	rm -f *.o app.bin

apps/notepad/app.c

@@ -0,0 +1,6 @@
+#include "user_rsl.h"
+
+int main() {
+    rsl_printf("Notepad active.\n");
+    return 0;
+}

apps/shell/Makefile

@@ -0,0 +1,24 @@
+CC = gcc
+LD = ld
+LIB_DIR = ../lib
+CFLAGS = -Wall -Wextra -Werror -std=c11 -ffreestanding -fno-stack-protector -fno-stack-check -fno-lto -fno-pic -m64 -march=x86-64 -I../../include -I../../kernel -I$(LIB_DIR)
+LDFLAGS = -nostdlib -static -m elf_x86_64 -T $(LIB_DIR)/app.ld
+
+OBJS = app.o $(LIB_DIR)/crt0.o $(LIB_DIR)/user_rsl.o
+
+all: app.bin
+
+app.bin: $(OBJS)
+	$(LD) $(LDFLAGS) $(OBJS) -o app.bin
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.c
+	$(CC) $(CFLAGS) -DRSL_IMPLEMENTATION -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.s
+	$(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
+
+clean:
+	rm -f *.o app.bin

apps/shell/app.c

@@ -0,0 +1,6 @@
+#include "user_rsl.h"
+
+int main() {
+    rsl_printf("Userland Shell Ready.\n");
+    return 0;
+}

apps/studio/Makefile

@@ -0,0 +1,24 @@
+CC = gcc
+LD = ld
+LIB_DIR = ../lib
+CFLAGS = -Wall -Wextra -Werror -std=c11 -ffreestanding -fno-stack-protector -fno-stack-check -fno-lto -fno-pic -m64 -march=x86-64 -I../../include -I../../kernel -I$(LIB_DIR)
+LDFLAGS = -nostdlib -static -m elf_x86_64 -T $(LIB_DIR)/app.ld
+
+OBJS = app.o $(LIB_DIR)/crt0.o $(LIB_DIR)/user_rsl.o
+
+all: app.bin
+
+app.bin: $(OBJS)
+	$(LD) $(LDFLAGS) $(OBJS) -o app.bin
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.c
+	$(CC) $(CFLAGS) -DRSL_IMPLEMENTATION -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.s
+	$(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
+
+clean:
+	rm -f *.o app.bin

apps/studio/app.c

@@ -0,0 +1,6 @@
+#include "user_rsl.h"
+
+int main() {
+    rsl_printf("Studio active.\n");
+    return 0;
+}

apps/tests/Makefile

@@ -0,0 +1,24 @@
+CC = gcc
+LD = ld
+LIB_DIR = ../lib
+CFLAGS = -Wall -Wextra -Werror -std=c11 -ffreestanding -fno-stack-protector -fno-stack-check -fno-lto -fno-pic -m64 -march=x86-64 -I../../include -I../../kernel -I$(LIB_DIR)
+LDFLAGS = -nostdlib -static -m elf_x86_64 -T $(LIB_DIR)/app.ld
+
+OBJS = app.o $(LIB_DIR)/crt0.o $(LIB_DIR)/user_rsl.o
+
+all: app.bin
+
+app.bin: $(OBJS)
+	$(LD) $(LDFLAGS) $(OBJS) -o app.bin
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.c
+	$(CC) $(CFLAGS) -DRSL_IMPLEMENTATION -c $< -o $@
+
+$(LIB_DIR)/%.o: $(LIB_DIR)/%.s
+	$(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
+
+clean:
+	rm -f *.o app.bin