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 b8d021973cbec4eda95d8daf7c78d6c53a86ad36..ff30f444d9c6b8d32352cf030768b84d928de89b 100644 (file)
--- a/lunaix-os/kernel/asm/x86/syscall.S
+++ b/lunaix-os/kernel/asm/x86/syscall.S
@@ -55,6 +55,10 @@
         .long __lxsys_setxattr      /* 45 */
         .long __lxsys_fgetxattr
         .long __lxsys_fsetxattr
         .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
         2:
         .rept __SYSCALL_MAX - (2b - 1b)/4
             .long 0


@@ -65,10 +69,11 @@
 .section .text
     syscall_hndlr:
         pushl %ebp
 .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
         jae 2f
 
         shll $2, %eax