refactor: separate syscall interfaces from kernel space, into posix compliant structure.

[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 04ae40bc88964e7d1a1d242da69ef561a8dd4514..6c4225202fde2cef1d171a573c013578699efbc8 100644 (file)
--- a/lunaix-os/includes/lunaix/syscall.h
+++ b/lunaix-os/includes/lunaix/syscall.h
@@ -27,7 +27,7 @@
 
 #define __SYSCALL_read 21
 #define __SYSCALL_write 22
-#define __SYSCALL_readdir 23
+#define __SYSCALL_sys_readdir 23
 #define __SYSCALL_mkdir 24
 #define __SYSCALL_lseek 25
 #define __SYSCALL_geterrno 26
@@ -60,7 +60,7 @@
 
 #define __SYSCALL_syslog 51
 
-#define __SYSCALL_mmap 52
+#define __SYSCALL_sys_mmap 52
 #define __SYSCALL_munmap 53
 
 #define __SYSCALL_MAX 0x100
@@ -112,56 +112,54 @@ syscall_install();
     return (rettype)v;
 
 #define __LXSYSCALL(rettype, name)                                             \
-    static rettype name()                                                      \
+    rettype name()                                                             \
     {                                                                          \
         ___DOINT33(__SYSCALL_##name, rettype)                                  \
     }
 
 #define __LXSYSCALL1(rettype, name, t1, p1)                                    \
-    static rettype name(__PARAM_MAP1(t1, p1))                                  \
+    rettype name(__PARAM_MAP1(t1, p1))                                         \
     {                                                                          \
         asm("" ::"b"(p1));                                                     \
         ___DOINT33(__SYSCALL_##name, rettype)                                  \
     }
 
 #define __LXSYSCALL2(rettype, name, t1, p1, t2, p2)                            \
-    static rettype name(__PARAM_MAP2(t1, p1, t2, p2))                          \
+    rettype name(__PARAM_MAP2(t1, p1, t2, p2))                                 \
     {                                                                          \
         asm("\n" ::"b"(p1), "c"(p2));                                          \
         ___DOINT33(__SYSCALL_##name, rettype)                                  \
     }
 
 #define __LXSYSCALL3(rettype, name, t1, p1, t2, p2, t3, p3)                    \
-    static rettype name(__PARAM_MAP3(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 __LXSYSCALL4(rettype, name, t1, p1, t2, p2, t3, p3, t4, p4)            \
-    static rettype name(__PARAM_MAP4(t1, p1, t2, p2, t3, p3, t4, p4))          \
+    rettype name(__PARAM_MAP4(t1, p1, t2, p2, t3, p3, t4, p4))                 \
     {                                                                          \
         asm("\n" ::"b"(p1), "c"(p2), "d"(p3), "D"(p4));                        \
         ___DOINT33(__SYSCALL_##name, rettype)                                  \
     }
 
 #define __LXSYSCALL5(rettype, name, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5)    \
-    static rettype name(__PARAM_MAP5(t1, p1, t2, p2, t3, p3, t4, p4, t5, p5))  \
+    rettype name(__PARAM_MAP5(t1, p1, t2, p2, t3, p3, t4, p4, t5, p5))         \
     {                                                                          \
-        asm("movl %0, %%ebp\n" ::"r"(p5), "b"(p1), "c"(p2), "d"(p3), "D"(p4)   \
-            : "%ebp");                                                         \
+        asm("" ::"r"(p5), "b"(p1), "c"(p2), "d"(p3), "D"(p4), "S"(p5));        \
         ___DOINT33(__SYSCALL_##name, rettype)                                  \
     }
 
 #define __LXSYSCALL2_VARG(rettype, name, t1, p1, t2, p2)                       \
-    __attribute__((noinline)) static rettype name(                             \
-      __PARAM_MAP2(t1, p1, t2, p2), ...)                                       \
+    __attribute__((noinline)) rettype name(__PARAM_MAP2(t1, p1, t2, p2), ...)  \
     {                                                                          \
         /* No inlining! This depends on the call frame assumption */           \
         void* _last = (void*)&p2 + sizeof(void*);                              \
         asm("\n" ::"b"(p1), "c"(p2), "d"(_last));                              \
         ___DOINT33(__SYSCALL_##name, rettype)                                  \
     }
-#endif
 
+#endif
 #endif /* __LUNAIX_SYSCALL_H */