From 50f949d994c33ab23d63bdb9e8a438560ab0b4c4 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 30 Nov 2019 21:07:22 +0100
Subject: Working userspace!

---
 src/kernel/syscall/syscall.c | 45 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 34 deletions(-)

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

diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index 5acd525..289274b 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -1,42 +1,19 @@
 #include <stdint.h>
 #include <kernel/syscall/syscall.h>
 #include <kernel/interrupts/interrupts.h>
-#include <kernel/graphics/vesa.h>
-#include <kernel/io/io.h>
 
-DEFN_SYSCALL1(serial_write, 0, const char *);
-
-static void *syscalls[3] = {
-        &serial_write
-};
-uint32_t num_syscalls = 3;
-
-void syscall_handler(struct regs *r)
+void syscalls_install()
 {
-    serial_write("SYSCALL");
-    if (r->eax >= num_syscalls)
-        return;
-
-    void *location = syscalls[r->eax];
-
-    int ret;
-    asm (" \
-     push %1; \
-     push %2; \
-     push %3; \
-     push %4; \
-     push %5; \
-     call *%6; \
-     pop %%ebx; \
-     pop %%ebx; \
-     pop %%ebx; \
-     pop %%ebx; \
-     pop %%ebx; \
-   " : "=a" (ret) : "r" (r->edi), "r" (r->esi), "r" (r->edx), "r" (r->ecx), "r" (r->ebx), "r" (location));
-    r->eax = ret;
+    // 11100111
+    idt_set_gate(0x80, (unsigned) idt_syscall, 0x08, 0xEE);
 }
 
-void syscalls_install()
+uint32_t syscall_handler(uint32_t id, uint32_t arg0, uint32_t arg1, uint32_t arg2)
 {
-    irq_install_handler(0x80, syscall_handler);
-}
+    switch (id) {
+        case 1:
+            return sys_write((char *) arg0, arg1);
+    }
+
+    return -1;
+}
\ No newline at end of file
-- 
cgit v1.2.3