Merge branch 'signal-dev'

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / syscall.S

diff --git a/lunaix-os/kernel/asm/x86/syscall.S b/lunaix-os/kernel/asm/x86/syscall.S
index 2ea22d499124c94bd60e974cd5bd0ee974851d54..0922a96a334060046d0d4983a8b784cbd56d7af2 100644 (file)
--- a/lunaix-os/kernel/asm/x86/syscall.S
+++ b/lunaix-os/kernel/asm/x86/syscall.S
@@ -6,43 +6,60 @@
         注意，这里的顺序非常重要。每个系统调用在这个地址表里的索引等于其调用号。
     */
     syscall_table:
-        .dc.l 0
-        .dc.l dup_proc
-        .dc.l schedule
-        .dc.l terminate_process
-        .dc.l _syscall_sbrk
-        .dc.l _syscall_brk
+        1:
+        .long 0
+        .long __lxsys_fork          /* 1 */
+        .long __lxsys_yield
+        .long __lxsys_sbrk
+        .long __lxsys_brk
+        .long __lxsys_getpid        /* 5 */
+        .long __lxsys_getppid
+        .long __lxsys_sleep
+        .long __lxsys_exit
+        .long __lxsys_wait          
+        .long __lxsys_waitpid       /* 10 */
+        .long __lxsys_sigreturn
+        .long __lxsys_sigprocmask
+        .long __lxsys_signal
+        .long __lxsys_pause
+        2:
+        .rept __SYSCALL_MAX - (2b - 1b)/4
+            .long 0
+        .endr
 
 .global syscall_hndlr
 
 .section .text
     syscall_hndlr:
         pushl %ebp
-        movl %esp, %ebp
-        addl $0x8, %ebp
-        movl (%ebp), %ebp
+        movl 8(%esp), %ebp
 
-        movl  (%ebp), %eax
+        movl  (%ebp), %eax          /* eax: call code as well as the return value from syscall */
         cmpl  $__SYSCALL_MAX, %eax
-        jb 1f
+        jae 2f
+
+        shll $2, %eax
+        addl $syscall_table, %eax
+        cmpl $0, (%eax)
+        jne 1f
+    2:    
         neg   %eax
         popl  %ebp
         ret
     1:
-        pushl 24(%ebp)    /* esi - #6 arg */
-        pushl 20(%ebp)    /* ebp - #5 arg */
-        pushl 16(%ebp)    /* edi - #4 arg */
-        pushl 12(%ebp)    /* edx - #3 arg */
-        pushl 8(%ebp)    /* ecx - #2 arg */
-        pushl 4(%ebp)    /* ebx - #1 arg */
-        shll $2, %eax
-        addl $syscall_table, %eax
-
+        pushl 24(%ebp)      /* esi - #6 arg */
+        pushl 20(%ebp)      /* ebp - #5 arg */
+        pushl 16(%ebp)      /* edi - #4 arg */
+        pushl 12(%ebp)      /* edx - #3 arg */
+        pushl 8(%ebp)       /* ecx - #2 arg */
+        pushl 4(%ebp)       /* ebx - #1 arg */
+        
         call (%eax)
 
-        addl $24, %esp
-
-        popl %ebp
-        ret
+        movl %eax, (%ebp)    /* save the return value */
 
+        addl $24, %esp      /* remove the parameters from stack */
 
+        popl %ebp
+        
+        ret
\ No newline at end of file