diff options
| author | Marvin Borner | 2020-01-26 18:41:23 +0100 |
|---|---|---|
| committer | GitHub | 2020-01-26 18:41:23 +0100 |
| commit | 43f501c74aa09f18c904ace902dc4cc5d241c218 (patch) | |
| tree | ea30b53ac6043faddd1cdb2fdea17f37178b1cc7 /src/kernel/syscall/syscall.c | |
| parent | d5d1749257ff8b9aa6b5ace4b4720b484a2860f3 (diff) | |
| parent | bb2a6b4d93512e8afc1b1999eb58f1f506cc27ae (diff) | |
Merged task-based userspace switching and updated heap/paging code
Awesome!
Diffstat (limited to 'src/kernel/syscall/syscall.c')
| -rw-r--r-- | src/kernel/syscall/syscall.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c index 93abc83..7ca7f99 100644 --- a/src/kernel/syscall/syscall.c +++ b/src/kernel/syscall/syscall.c @@ -3,12 +3,9 @@ #include <kernel/interrupts/interrupts.h> #include <kernel/system.h> #include <kernel/lib/stdio.h> -#include <kernel/paging/paging.h> typedef uint32_t (*syscall_func)(unsigned int, ...); -extern void jump_userspace(); - uint32_t (*syscalls[])() = { [0] = (uint32_t (*)()) halt_loop, // DEBUG! [1] = sys_write, @@ -22,7 +19,6 @@ uint32_t (*syscalls[])() = { void syscall_handler(struct regs *r) { - paging_switch_directory(0); serial_printf("Received syscall!"); if (r->eax >= sizeof(syscalls) / sizeof(*syscalls)) @@ -35,7 +31,6 @@ void syscall_handler(struct regs *r) //serial_printf("[SYSCALL] %d (0x%x) 0x%x 0x%x 0x%x 0x%x 0x%x", r->eax, location, r->ebx, r->ecx, r->edx, r->esi, r->edi); r->eax = location(r->ebx, r->ecx, r->edx, r->esi, r->edi); - paging_switch_directory(1); } void syscalls_install() |