Merge branch 'master' into sata-ahci-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 25e153f592e906528f54d6673dc8d4be8e2a653f..b13dee0f183ca68df855856ea0de59fca239f74f 100644 (file)
--- a/lunaix-os/kernel/asm/x86/syscall.S
+++ b/lunaix-os/kernel/asm/x86/syscall.S
@@ -7,15 +7,28 @@
     */
     syscall_table:
         1:
     */
     syscall_table:
         1:

-        .dc.l 0
-        .dc.l dup_proc
-        .dc.l schedule
-        .dc.l terminate_process
-        .dc.l _syscall_sbrk
-        .dc.l _syscall_brk
+        .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
+        .long __lxsys_kill          /* 15 */
+        .long __lxsys_alarm
+        .long __lxsys_sigpending
+        .long __lxsys_sigsuspend

         2:
         .rept __SYSCALL_MAX - (2b - 1b)/4
         2:
         .rept __SYSCALL_MAX - (2b - 1b)/4

-            .dc.l 0
+            .long 0

         .endr
 
 .global syscall_hndlr
         .endr
 
 .global syscall_hndlr


@@ -23,11 +36,9 @@
 .section .text
     syscall_hndlr:
         pushl %ebp
 .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
         jae 2f
 
         cmpl  $__SYSCALL_MAX, %eax
         jae 2f
 


@@ -40,19 +51,19 @@
         popl  %ebp
         ret
     1:
         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 */
+        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)
 
         
         call (%eax)
 

-        addl $24, %esp
+        movl %eax, (%ebp)    /* save the return value */
+
+        addl $24, %esp      /* remove the parameters from stack */

 
         popl %ebp
         
 
         popl %ebp
         

-        ret
-
-
+        ret
\ No newline at end of file