Working userspace!

3 files changed, 22 insertions, 67 deletions

diff --git a/src/kernel/syscall/actions/sys_write.c b/src/kernel/syscall/actions/sys_write.c
new file mode 100644
index 0000000..c537d12
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_write.c
@@ -0,0 +1,9 @@
+#include <stdint-gcc.h>
+#include <mlibc/stdio.h>
+
+uint32_t sys_write(char *buf, uint32_t count)
+{
+    for (uint32_t i = 0; i < count; i++)
+        writec(*(buf++));
+    return count;
+}
\ No newline at end of file
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
diff --git a/src/kernel/syscall/syscall.h b/src/kernel/syscall/syscall.h
index 78a1ab5..7fe7862 100644
--- a/src/kernel/syscall/syscall.h
+++ b/src/kernel/syscall/syscall.h
@@ -1,40 +1,9 @@
 #ifndef MELVIX_SYSCALL_H
 #define MELVIX_SYSCALL_H
 
-#include <kernel/interrupts/interrupts.h>
-
+extern void idt_syscall();
 void syscalls_install();
 
-void syscall_handler(struct regs *r);
-
-#define DECL_SYSCALL0(fn) int syscall_##fn();
-#define DECL_SYSCALL1(fn, p1) int syscall_##fn(p1);
-#define DECL_SYSCALL2(fn, p1, p2) int syscall_##fn(p1,p2);
-#define DECL_SYSCALL3(fn, p1, p2, p3) int syscall_##fn(p1,p2,p3);
-#define DECL_SYSCALL4(fn, p1, p2, p3, p4) int syscall_##fn(p1,p2,p3,p4);
-#define DECL_SYSCALL5(fn, p1, p2, p3, p4, p5) int syscall_##fn(p1,p2,p3,p4,p5);
-
-#define DEFN_SYSCALL0(fn, num) \
-int syscall_##fn() { \
- int a; \
- asm volatile("int $0x80" : "=a" (a) : "0" (num)); \
- return a; \
-}
-
-#define DEFN_SYSCALL1(fn, num, P1) \
-int syscall_##fn(P1 p1) { \
- int a; \
- asm volatile("int $0x80" : "=a" (a) : "0" (num), "b" ((int)p1)); \
- return a; \
-}
-
-#define DEFN_SYSCALL2(fn, num, P1, P2) \
-int syscall_##fn(P1 p1, P2 p2) { \
- int a; \
- asm volatile("int $0x80" : "=a" (a) : "0" (num), "b" ((int)p1), "c" ((int)p2)); \
- return a; \
-}
-
-DECL_SYSCALL1(serial_write, const char *)
+uint32_t sys_write(char *buf, uint32_t count);
 
 #endif