X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2Fnestedvm%2Fsupport.s;h=2af9010fc6467b0c3c2a07052a9dc86ded2fa436;hb=47e2513b584db639600b57c79be03093f99b0073;hp=b7781d508df903febced737ca71d0be651129d7f;hpb=c2b2704764af1ade923ba8f15d517b87f9d16189;p=nestedvm.git

diff --git a/src/org/ibex/nestedvm/support.s b/src/org/ibex/nestedvm/support.s
index b7781d5..2af9010 100644
--- a/src/org/ibex/nestedvm/support.s
+++ b/src/org/ibex/nestedvm/support.s
@@ -29,13 +29,14 @@ name:               \
     nop;            \
     .end name;
 
-#define SYSCALL_R(name)        \
-    .section .text._##name##_r,"ax",@progbits; \
+#define SYSCALL_R(name) SYSCALL_R2(_##name##_r,SYS_##name)
+#define SYSCALL_R2(name,number) \
+    .section .text.name,"ax",@progbits; \
     .align 2;                  \
-    .globl _##name##_r;        \
-    .ent _##name##_r;          \
-_##name##_r:                   \
-    li v0, SYS_##name;         \
+    .globl name;               \
+    .ent name;                 \
+name:                          \
+    li v0, number;             \
     move t0, a0;               \
     move a0, a1;               \
     move a1, a2;               \
@@ -52,7 +53,7 @@ $L##name##_errno:              \
     move a1, v0;               \
     j _syscall_set_errno;      \
     nop;                       \
-    .end _##name##_r;
+    .end name;
 
 
     .align   2
@@ -97,7 +98,6 @@ SYSCALL_R(read)
 SYSCALL_R(write)
 SYSCALL_R(sbrk)
 SYSCALL_R(fstat)
-SYSCALL(isatty)
 SYSCALL_R(lseek)
 SYSCALL_R(kill)
 SYSCALL_R(getpid)
@@ -115,8 +115,16 @@ SYSCALL_R(pipe)
 SYSCALL_R(dup2)
 SYSCALL_R(fork)
 SYSCALL_R(waitpid)
-SYSCALL_R(getcwd)
-SYSCALL_R(execve)
+SYSCALL_R2(__getcwd_r,SYS_getcwd)
+SYSCALL_R2(__execve_r,SYS_exec)
 SYSCALL_R(fcntl)
 SYSCALL_R(rmdir)
 SYSCALL_R(sysconf)
+SYSCALL_R(readlink)
+SYSCALL_R(lstat)
+SYSCALL_R(symlink)
+SYSCALL_R(link)
+SYSCALL_R(getdents)
+SYSCALL(memcpy)
+SYSCALL(memset)
+SYSCALL_R(dup)