fix: previous interrupt context lost after a nested interrupt

[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 ab9e79f641b8252b737d50bf1c38b2520aac7a7a..ff30f444d9c6b8d32352cf030768b84d928de89b 100644 (file)
--- a/lunaix-os/kernel/asm/x86/syscall.S
+++ b/lunaix-os/kernel/asm/x86/syscall.S
@@ -27,11 +27,38 @@
         .long __lxsys_sigpending
         .long __lxsys_sigsuspend
         .long __lxsys_open
-        .long __lxsys_close
-        // .long __lxsys_read
-        // .long __lxsys_write
+        .long __lxsys_close         /* 20 */
+        .long __lxsys_read
+        .long __lxsys_write
         .long __lxsys_readdir
         .long __lxsys_mkdir
+        .long __lxsys_lseek         /* 25 */
+        .long __lxsys_geterrno
+        .long __lxsys_readlink
+        .long __lxsys_readlinkat
+        .long __lxsys_rmdir
+        .long __lxsys_unlink        /* 30 */
+        .long __lxsys_unlinkat
+        .long __lxsys_link
+        .long __lxsys_fsync
+        .long __lxsys_dup
+        .long __lxsys_dup2          /* 35 */
+        .long __lxsys_realpathat
+        .long __lxsys_symlink
+        .long __lxsys_chdir
+        .long __lxsys_fchdir
+        .long __lxsys_getcwd        /* 40 */
+        .long __lxsys_rename
+        .long __lxsys_mount
+        .long __lxsys_unmount
+        .long __lxsys_getxattr
+        .long __lxsys_setxattr      /* 45 */
+        .long __lxsys_fgetxattr
+        .long __lxsys_fsetxattr
+        .long __lxsys_ioctl
+        .long __lxsys_getpgid
+        .long __lxsys_setpgid       /* 50 */
+        .long __lxsys_syslog
         2:
         .rept __SYSCALL_MAX - (2b - 1b)/4
             .long 0
@@ -42,10 +69,11 @@
 .section .text
     syscall_hndlr:
         pushl %ebp
-        movl 8(%esp), %ebp
+        movl 8(%esp), %ebp          // isr_param*
 
-        movl  (%ebp), %eax          /* eax: call code as well as the return value from syscall */
-        cmpl  $__SYSCALL_MAX, %eax
+        addl $4, %ebp
+        movl (%ebp), %eax          /* eax: call code as well as the return value from syscall */
+        cmpl $__SYSCALL_MAX, %eax
         jae 2f
 
         shll $2, %eax