diff options
Diffstat (limited to 'src/userspace/syscall.h')
| -rw-r--r-- | src/userspace/syscall.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/userspace/syscall.h b/src/userspace/syscall.h index 4ddd9d2..5de717e 100644 --- a/src/userspace/syscall.h +++ b/src/userspace/syscall.h @@ -1,6 +1,8 @@ #ifndef MELVIX_SYSCALL_H #define MELVIX_SYSCALL_H +#include <stdint.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) @@ -16,7 +18,7 @@ #define DEFN_SYSCALL1(fn, num, P1) \ int syscall_##fn(P1 p1) { \ - int __res; __asm__ __volatile__("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \ + int __res; __asm__ __volatile__("int $0x80" \ : "=a" (__res) \ : "0" (num), "b" ((int)(p1)) \ : "memory"); \ @@ -25,7 +27,7 @@ #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" \ + int __res; __asm__ __volatile__("int $0x80" \ : "=a" (__res) \ : "0" (num), "b" ((int)(p1)), "c"((int)(p2)) \ : "memory"); \ @@ -34,7 +36,7 @@ #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" \ + int __res; __asm__ __volatile__("int $0x80" \ : "=a" (__res) \ : "0" (num), "b" ((int)(p1)), "c"((p2)), "d"((int)(p3)) \ : "memory"); \ @@ -43,7 +45,7 @@ #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" \ + int __res; __asm__ __volatile__("int $0x80" \ : "=a" (__res) \ : "0" (num), "b" ((int)(p1)), "c"((int)(p2)), "d"((int)(p3)), "S"((int)(p4)) \ : "memory"); \ @@ -52,7 +54,7 @@ #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" \ + int __res; __asm__ __volatile__("int $0x80" \ : "=a" (__res) \ : "0" (num), "b" ((int)(p1)), "c"((int)(p2)), "d"((int)(p3)), "S"((int)(p4)), "D"((int)(p5)) \ : "memory"); \ @@ -62,24 +64,18 @@ /** * DECLARATIONS */ +DECL_SYSCALL0(halt); + DECL_SYSCALL1(write, char *); DECL_SYSCALL1(read, char *); -DECL_SYSCALL1(writec, char); - -DECL_SYSCALL0(readc); - - -/** - * DEFINITIONS - */ -DEFN_SYSCALL1(write, 1, char *); +DECL_SYSCALL1(writec, char *); -DEFN_SYSCALL1(read, 2, char *); +DECL_SYSCALL1(readc, char *); -DEFN_SYSCALL1(writec, 3, char); +DECL_SYSCALL1(paging_alloc, uint32_t); -DEFN_SYSCALL0(readc, 4); +DECL_SYSCALL2(paging_free, uint32_t, uint32_t); #endif |