Fully working syscall interface

2 files changed, 75 insertions, 9 deletions

diff --git a/src/userspace/main.c b/src/userspace/main.c
index 5df961f..f7cd3ba 100644
--- a/src/userspace/main.c
+++ b/src/userspace/main.c
@@ -1,15 +1,9 @@
-void write(const char *str, int len)
-{
-    int ret;
-    asm volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
-                : "=a" (ret) \
-                : "0" (1), "b" ((int) (str)), "c"((int) (len)));
-}
+#include <syscall.h>
 
 void user_main()
 {
-    const char hello[] = "Switched to usermode!\n";
-    write(hello, sizeof(hello));
+    const char hello[] = "> Successfully to usermode!\n";
+    syscall_write(0, hello, sizeof(hello));
 
     while (1) {};
 }
\ No newline at end of file
diff --git a/src/userspace/syscall.h b/src/userspace/syscall.h
new file mode 100644
index 0000000..162b219
--- /dev/null
+++ b/src/userspace/syscall.h
@@ -0,0 +1,72 @@
+#ifndef MELVIX_SYSCALL_H
+#define MELVIX_SYSCALL_H
+
+#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 __res; __asm__ __volatile__("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+                : "=a" (__res) \
+                : "0" (num), "b" ((int)(p1)) \
+                : "memory"); \
+        return __res; \
+    }
+
+#define DEFN_SYSCALL2(fn, num, P1, P2) \
+    int syscall_##fn(P1 p1, P2 p2) { \
+        int __res; __asm__ __volatile__("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+                : "=a" (__res) \
+                : "0" (num), "b" ((int)(p1)), "c"((int)(p2)) \
+                : "memory"); \
+        return __res; \
+    }
+
+#define DEFN_SYSCALL3(fn, num, P1, P2, P3) \
+    int syscall_##fn(P1 p1, P2 p2, P3 p3) { \
+        int __res; __asm__ __volatile__("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+                : "=a" (__res) \
+                : "0" (num), "b" ((int)(p1)), "c"((p2)), "d"((int)(p3)) \
+                : "memory"); \
+        return __res; \
+    }
+
+#define DEFN_SYSCALL4(fn, num, P1, P2, P3, P4) \
+    int syscall_##fn(P1 p1, P2 p2, P3 p3, P4 p4) { \
+        int __res; __asm__ __volatile__("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+                : "=a" (__res) \
+                : "0" (num), "b" ((int)(p1)), "c"((int)(p2)), "d"((int)(p3)), "S"((int)(p4)) \
+                : "memory"); \
+        return __res; \
+    }
+
+#define DEFN_SYSCALL5(fn, num, P1, P2, P3, P4, P5) \
+    int syscall_##fn(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) { \
+        int __res; __asm__ __volatile__("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+                : "=a" (__res) \
+                : "0" (num), "b" ((int)(p1)), "c"((int)(p2)), "d"((int)(p3)), "S"((int)(p4)), "D"((int)(p5)) \
+                : "memory"); \
+        return __res; \
+    }
+
+/**
+ * DECLARATIONS
+ */
+DECL_SYSCALL3(write, int, const char *, int);
+
+/**
+ * DEFINITIONS
+ */
+DEFN_SYSCALL3(write, 1, int, const char *, int);
+
+#endif