From cd3ad989210dc8a3f5805dd5d4c4a6bd74e281db Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 16 Jan 2020 17:15:53 +0100
Subject: Quite a different approach to userspace paging

Hope this works soon!
---
 src/kernel/syscall/syscall.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/kernel/syscall/syscall.c')

diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index 7ca7f99..93abc83 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -3,9 +3,12 @@
 #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,
@@ -19,6 +22,7 @@ uint32_t (*syscalls[])() = {
 
 void syscall_handler(struct regs *r)
 {
+    paging_switch_directory(0);
     serial_printf("Received syscall!");
 
     if (r->eax >= sizeof(syscalls) / sizeof(*syscalls))
@@ -31,6 +35,7 @@ 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()
-- 
cgit v1.2.3