refactor: decouple i386 specific instruction invocation

[lunaix-os.git] / lunaix-os / includes / lunaix / syscall.h

diff --git a/lunaix-os/includes/lunaix/syscall.h b/lunaix-os/includes/lunaix/syscall.h
index ee63c40250351e14ecd47797aee9969fb90afe05..919f93a0c2efdf748d94af1ea055dddae86286db 100644 (file)
--- a/lunaix-os/includes/lunaix/syscall.h
+++ b/lunaix-os/includes/lunaix/syscall.h
@@ -1,29 +1,15 @@
 #ifndef __LUNAIX_SYSCALL_H
 #define __LUNAIX_SYSCALL_H
 
 #ifndef __LUNAIX_SYSCALL_H
 #define __LUNAIX_SYSCALL_H
 

-#include <arch/x86/vectors.h>
-
-#define __SYSCALL_fork    1
-#define __SYSCALL_yield   2
-#define __SYSCALL_sbrk    3
-#define __SYSCALL_brk     4
-#define __SYSCALL_getpid     5
-#define __SYSCALL_getppid    6
-#define __SYSCALL_sleep    7
-#define __SYSCALL__exit    8
-
-#define __SYSCALL_MAX     0x100
+#include <arch/i386/vectors.h>
+#include <usr/lunaix/syscallid.h>

 
 #ifndef __ASM__
 
 #ifndef __ASM__

-void syscall_install();

 
 

-static void* syscall(unsigned int callcode) {
-    asm volatile(
-        "int %0"
-        ::"i"(LUNAIX_SYS_CALL), "D"(callcode)
-        :"eax"
-    );
-}
+#define SYSCALL_ESTATUS(errno) -((errno) != 0)
+
+void
+syscall_install();

 
 #define asmlinkage __attribute__((regparm(0)))
 
 
 #define asmlinkage __attribute__((regparm(0)))
 


@@ -34,57 +20,29 @@ static void* syscall(unsigned int callcode) {
 #define __PARAM_MAP5(t1, p1, ...) t1 p1, __PARAM_MAP4(__VA_ARGS__)
 #define __PARAM_MAP6(t1, p1, ...) t1 p1, __PARAM_MAP5(__VA_ARGS__)
 
 #define __PARAM_MAP5(t1, p1, ...) t1 p1, __PARAM_MAP4(__VA_ARGS__)
 #define __PARAM_MAP6(t1, p1, ...) t1 p1, __PARAM_MAP5(__VA_ARGS__)
 

-#define ___DOINT33(callcode, rettype)\
-    int v;    \
-    asm volatile (  \
-        "int %1\n"    \
-        :"=a"(v)    \
-        :"i"(LUNAIX_SYS_CALL), "a"(callcode));  \
-    return (rettype)v;     \
-
-#define __DEFINE_LXSYSCALL(rettype, name) \
-    asmlinkage rettype __lxsys_##name()
+#define __DEFINE_LXSYSCALL(rettype, name) asmlinkage rettype __lxsys_##name()

 
 

-#define __DEFINE_LXSYSCALL1(rettype, name, t1, p1) \
+#define __DEFINE_LXSYSCALL1(rettype, name, t1, p1)                             \

     asmlinkage rettype __lxsys_##name(__PARAM_MAP1(t1, p1))
 
     asmlinkage rettype __lxsys_##name(__PARAM_MAP1(t1, p1))
 

-#define __DEFINE_LXSYSCALL2(rettype, name, t1, p1, t2, p2) \
+#define __DEFINE_LXSYSCALL2(rettype, name, t1, p1, t2, p2)                     \

     asmlinkage rettype __lxsys_##name(__PARAM_MAP2(t1, p1, t2, p2))
 
     asmlinkage rettype __lxsys_##name(__PARAM_MAP2(t1, p1, t2, p2))
 

-#define __DEFINE_LXSYSCALL3(rettype, name, t1, p1, t2, p2, t3, p3) \
-    asmlinkage rettype __lxsys_##name(__PARAM_MAP3(t1, p1, t2, p2, t3, p3));
-
-#define __DEFINE_LXSYSCALL4(rettype, name, t1, p1, t2, p2, t3, p3, t4, p4) \
-    asmlinkage rettype __lxsys_##nam (__PARAM_MAP4(t1, p1, t2, p2, t3, p3, t4, p4))
-
-
-#define __LXSYSCALL(rettype, name) \
-    rettype name () { \
-        ___DOINT33(__SYSCALL_##name, rettype) \
-    }
-
-#define __LXSYSCALL1(rettype, name, t1, p1) \
-    rettype name (__PARAM_MAP1(t1, p1)) { \
-        asm (""::"b"(p1)); \
-        ___DOINT33(__SYSCALL_##name, rettype) \
-    }
+#define __DEFINE_LXSYSCALL3(rettype, name, t1, p1, t2, p2, t3, p3)             \
+    asmlinkage rettype __lxsys_##name(__PARAM_MAP3(t1, p1, t2, p2, t3, p3))

 
 

-#define __LXSYSCALL2(rettype, name, t1, p1, t2, p2) \
-    rettype name (__PARAM_MAP2(t1, p1, t2, p2)) { \
-        asm ("\n"::"b"(p1), "c"(p2)); \
-        ___DOINT33(__SYSCALL_##name, rettype) \
-    }
+#define __DEFINE_LXSYSCALL4(rettype, name, t1, p1, t2, p2, t3, p3, t4, p4)     \
+    asmlinkage rettype __lxsys_##name(                                         \
+      __PARAM_MAP4(t1, p1, t2, p2, t3, p3, t4, p4))

 
 

-#define __LXSYSCALL3(rettype, name, t1, p1, t2, p2, t3, p3) \
-    rettype name (__PARAM_MAP3(t1, p1, t2, p2, t3, p3)) { \
-        asm ("\n"::"b"(p1), "c"(p2), "d"(p3)); \
-        ___DOINT33(__SYSCALL_##name, rettype) \
-    }
+#define __DEFINE_LXSYSCALL5(                                                   \
+  rettype, name, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5)                       \
+    asmlinkage rettype __lxsys_##name(                                         \
+      __PARAM_MAP5(t1, p1, t2, p2, t3, p3, t4, p4, t5, p5))

 
 

-#define __LXSYSCALL4(rettype, name, t1, p1, t2, p2, t3, p3, t4, p4) \
-    rettype name (__PARAM_MAP3(t1, p1, t2, p2, t3, p3, t4, p4)) { \
-        asm ("\n"::"b"(p1), "c"(p2), "d"(p3), "D"(p4)); \
-        ___DOINT33(__SYSCALL_##name, rettype) \
-    }
+#define __SYSCALL_INTERRUPTIBLE(code)                                          \
+    asm("sti");                                                                \
+    { code };                                                                  \
+    asm("cli");

 #endif
 #endif /* __LUNAIX_SYSCALL_H */
 #endif
 #endif /* __LUNAIX_SYSCALL_H */