diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | apps/Makefile | 4 | ||||
| -rw-r--r-- | apps/init.c | 2 | ||||
| -rw-r--r-- | apps/wm.c | 17 | ||||
| -rw-r--r-- | kernel/features/mm.c | 1 | ||||
| -rw-r--r-- | libc/alloc.c | 7 | ||||
| -rw-r--r-- | libc/crt/crt0.asm | 6 | ||||
| -rw-r--r-- | libc/inc/sys.h | 47 | ||||
| -rw-r--r-- | libc/print.c | 1 | ||||
| -rw-r--r-- | libc/sys.c | 130 | ||||
| -rwxr-xr-x | run | 3 |
11 files changed, 162 insertions, 58 deletions
@@ -24,8 +24,6 @@ compile: @echo "Compiled libgui" @$(MAKE) --no-print-directory -C libtxt/ @echo "Compiled libtxt" - @$(MAKE) --no-print-directory -C libnet/ - @echo "Compiled libnet" @$(MAKE) --no-print-directory -C kernel/ @echo "Compiled kernel" @$(MAKE) --no-print-directory -C boot/ diff --git a/apps/Makefile b/apps/Makefile index 2c6c643..1a7aff3 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -5,14 +5,14 @@ CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy -CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -I../libnet/inc/ -fPIE -Duserspace +CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -fPIE -Duserspace all: $(COBJS) %.o: %.c @mkdir -p ../build/apps/ @$(CC) -c $(CFLAGS) $< -o $@ - @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lnet -lc + @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lc @$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=) @cp $(@:.o=.elf) ../build/apps/$(@:.o=.elf) diff --git a/apps/init.c b/apps/init.c index 5a233c1..35d296b 100644 --- a/apps/init.c +++ b/apps/init.c @@ -4,8 +4,6 @@ #include <def.h> #include <sys.h> -#include <cpu.h> - int main(int argc, char **argv) { UNUSED(argc); @@ -350,10 +350,23 @@ static void handle_message(void *msg) } } +static void handle_exit(void) +{ + if (keymap) + free(keymap); + if (windows) + list_destroy(windows); + if (screen.fb) + memset(screen.fb, COLOR_RED, screen.height * screen.pitch); +} + int main(int argc, char **argv) { UNUSED(argc); UNUSED(argv); + + atexit(handle_exit); + assert(ioctl("/dev/fb", IO_FB_GET, &screen) == 0); log("WM loaded: %dx%d\n", screen.width, screen.height); wm_client = (struct client){ .pid = getpid() }; @@ -408,9 +421,5 @@ int main(int argc, char **argv) panic("Poll/read error: %s\n", strerror(errno)); } - // TODO: Execute? - free(keymap); - list_destroy(windows); - return 0; } diff --git a/kernel/features/mm.c b/kernel/features/mm.c index 2171598..d007039 100644 --- a/kernel/features/mm.c +++ b/kernel/features/mm.c @@ -421,6 +421,7 @@ void memory_bypass_disable(void) memory_bypass_validity = 0; } +// TODO: Limit by proc stack and data range u8 memory_valid(const void *addr) { if (proc_current() && !memory_bypass_validity) diff --git a/libc/alloc.c b/libc/alloc.c index be986dc..8522203 100644 --- a/libc/alloc.c +++ b/libc/alloc.c @@ -24,17 +24,14 @@ static int liballoc_free(void *ptr, u32 p) #include <sys.h> -#define sys_alloc(size) (void *)sys1(SYS_ALLOC, size) -#define sys_free(ptr, size) (u32) sys2(SYS_FREE, ptr, size) - static void *liballoc_alloc(u32 p) { - return sys_alloc((u32)p); + return sys_alloc(p); } static int liballoc_free(void *ptr, u32 p) { - sys_free((u32)ptr, (u32)p); + sys_free(ptr, p); return 0; } diff --git a/libc/crt/crt0.asm b/libc/crt/crt0.asm index 0f8024d..e002952 100644 --- a/libc/crt/crt0.asm +++ b/libc/crt/crt0.asm @@ -3,13 +3,13 @@ section .text extern main -extern sys1 +extern exit +extern atexit_trigger global _start _start: call main push eax - push 9 - call sys1 + call exit jmp $ diff --git a/libc/inc/sys.h b/libc/inc/sys.h index 8add0de..46a5849 100644 --- a/libc/inc/sys.h +++ b/libc/inc/sys.h @@ -59,37 +59,24 @@ struct stat { #if defined(userspace) -int sys0(enum sys num); -int sys1(enum sys num, int d1); -int sys2(enum sys num, int d1, int d2); -int sys3(enum sys num, int d1, int d2, int d3); -int sys4(enum sys num, int d1, int d2, int d3, int d4); -int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5); -int sysv(enum sys num, ...); - /** * Syscall wrappers */ -#define loop(void) sys0(SYS_LOOP) -#define read(path, buf, offset, count) \ - (s32) sys4(SYS_READ, (int)(path), (int)(buf), (int)(offset), (int)(count)) -#define write(path, buf, offset, count) \ - (s32) sys4(SYS_WRITE, (int)(path), (int)(buf), (int)(offset), (int)(count)) -#define ioctl(path, ...) (s32) sysv(SYS_IOCTL, (int)(path), ##__VA_ARGS__) -#define stat(path, stat) (s32) sys2(SYS_STAT, (int)(path), (int)(stat)) -#define poll(files) (s32) sys1(SYS_POLL, (int)(files)) -#define exec(path, ...) (s32) sysv(SYS_EXEC, (int)(path), ##__VA_ARGS__) -#define exit(status) \ - { \ - sys1(SYS_EXIT, (int)status); \ - while (1) { \ - yield(); \ - } \ - } -#define boot(cmd) (s32) sys2(SYS_BOOT, SYS_BOOT_MAGIC, cmd) -#define yield(void) (s32) sys0(SYS_YIELD) -#define time(void) (u32) sys0(SYS_TIME) +void loop(void); +s32 read(const char *path, void *buf, u32 offset, u32 count); +s32 write(const char *path, const void *buf, u32 offset, u32 count); +s32 ioctl(const char *path, ...); +s32 stat(const char *path, struct stat *buf); +s32 poll(const char **files); +s32 exec(const char *path, ...); +s32 yield(void); +void exit(s32 status); +s32 boot(u32 cmd); +u32 time(void); + +void *sys_alloc(u32 size); +void sys_free(void *ptr, u32 size); static inline u32 getpid(void) { @@ -129,5 +116,11 @@ static inline void *sread(const char *path) return buf; } +/** + * At exit + */ + +void atexit(void (*func)(void)); + #endif #endif diff --git a/libc/print.c b/libc/print.c index b687239..1d58f0a 100644 --- a/libc/print.c +++ b/libc/print.c @@ -147,6 +147,7 @@ int err(int code, const char *format, ...) vfprintf(PATH_ERR, format, ap); va_end(ap); exit(code); + return -1; } int print(const char *str) @@ -16,30 +16,35 @@ errno = -ret; \ return -1; \ } \ + errno = 0; \ return ret -int sys0(enum sys num) +s32 sys0(enum sys num); +s32 sys0(enum sys num) { int a; __asm__ volatile("int $0x80" : "=a"(a) : "0"(num)); ERRIFY(a); } -int sys1(enum sys num, int d1) +s32 sys1(enum sys num, int d1); +s32 sys1(enum sys num, int d1) { int a; __asm__ volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)d1)); ERRIFY(a); } -int sys2(enum sys num, int d1, int d2) +s32 sys2(enum sys num, int d1, int d2); +s32 sys2(enum sys num, int d1, int d2) { int a; __asm__ volatile("int $0x80" : "=a"(a) : "0"(num), "b"((int)d1), "c"((int)d2)); ERRIFY(a); } -int sys3(enum sys num, int d1, int d2, int d3) +s32 sys3(enum sys num, int d1, int d2, int d3); +s32 sys3(enum sys num, int d1, int d2, int d3) { int a; __asm__ volatile("int $0x80" @@ -48,7 +53,8 @@ int sys3(enum sys num, int d1, int d2, int d3) ERRIFY(a); } -int sys4(enum sys num, int d1, int d2, int d3, int d4) +s32 sys4(enum sys num, int d1, int d2, int d3, int d4); +s32 sys4(enum sys num, int d1, int d2, int d3, int d4) { int a; __asm__ volatile("int $0x80" @@ -57,7 +63,8 @@ int sys4(enum sys num, int d1, int d2, int d3, int d4) ERRIFY(a); } -int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5) +s32 sys5(enum sys num, int d1, int d2, int d3, int d4, int d5); +s32 sys5(enum sys num, int d1, int d2, int d3, int d4, int d5) { int a; __asm__ volatile("int $0x80" @@ -67,17 +74,118 @@ int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5) ERRIFY(a); } -int sysv(enum sys num, ...) +/** + * Syscalls + */ + +void *sys_alloc(u32 size) +{ + return (void *)sys1(SYS_ALLOC, (int)size); +} + +void sys_free(void *ptr, u32 size) +{ + sys2(SYS_FREE, (int)ptr, (int)size); +} + +void loop(void) +{ + sys0(SYS_LOOP); +} + +s32 read(const char *path, void *buf, u32 offset, u32 count) +{ + return sys4(SYS_READ, (int)path, (int)buf, (int)offset, (int)count); +} + +s32 write(const char *path, const void *buf, u32 offset, u32 count) +{ + return sys4(SYS_WRITE, (int)path, (int)buf, (int)offset, (int)count); +} + +s32 ioctl(const char *path, ...) { va_list ap; - int args[5]; + int args[4] = { 0 }; - va_start(ap, num); - for (int i = 0; i < 5; i++) + va_start(ap, path); + for (int i = 0; i < 4; i++) args[i] = va_arg(ap, int); va_end(ap); - return sys5(num, args[0], args[1], args[2], args[3], args[4]); + return sys5(SYS_IOCTL, (int)path, args[0], args[1], args[2], args[3]); +} + +s32 stat(const char *path, struct stat *buf) +{ + return sys2(SYS_STAT, (int)path, (int)buf); +} + +s32 poll(const char **files) +{ + return sys1(SYS_POLL, (int)files); +} + +s32 exec(const char *path, ...) +{ + va_list ap; + int args[4] = { 0 }; + + va_start(ap, path); + for (int i = 0; i < 4; i++) + args[i] = va_arg(ap, int); + va_end(ap); + + return sys5(SYS_EXEC, (int)path, args[0], args[1], args[2], args[3]); +} + +s32 yield(void) +{ + return sys0(SYS_YIELD); +} + +static void atexit_trigger(void); +void exit(s32 status) +{ + atexit_trigger(); + sys1(SYS_EXIT, (int)status); + while (1) + yield(); +} + +s32 boot(u32 cmd) +{ + return sys2(SYS_BOOT, SYS_BOOT_MAGIC, cmd); +} + +u32 time(void) +{ + return (u32)sys0(SYS_TIME); +} + +/** + * At exit + */ + +#define ATEXIT_MAX 32 + +static u32 slot = 0; +static void (*funcs[ATEXIT_MAX])(void) = { 0 }; + +static void atexit_trigger(void) +{ + while (slot-- > 0) { + if (funcs[slot]) { + funcs[slot](); + funcs[slot] = NULL; + } + } +} + +void atexit(void (*func)(void)) +{ + if (slot < ATEXIT_MAX) + funcs[slot++] = func; } #endif @@ -216,8 +216,7 @@ make_sync() { echo "$output" | make_append_commands libc libk libc echo "$output" | make_append_commands libk libgui libgui echo "$output" | make_append_commands libgui libtxt libtxt - echo "$output" | make_append_commands libtxt libnet libnet - echo "$output" | make_append_commands libnet kernel kernel + echo "$output" | make_append_commands libtxt kernel kernel echo "$output" | make_append_commands kernel boot boot echo "$output" | make_append_commands boot apps apps tr <compile_commands.json '\n' '\r' | sed -e 's/\r]\r\[/,/g' | tr '\r' '\n' >tmp |