X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/642855f81fd03b9fd6540ac99c665b57b4b38cc8..3f0311875965aae84de3a23fea05860dcd602dab:/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 eb16783..ac3fe80 100644 --- a/lunaix-os/kernel/asm/x86/syscall.S +++ b/lunaix-os/kernel/asm/x86/syscall.S @@ -20,7 +20,7 @@ .long __lxsys_waitpid /* 10 */ .long __lxsys_sigreturn .long __lxsys_sigprocmask - .long __lxsys_signal + .long __lxsys_sys_sigaction .long __lxsys_pause .long __lxsys_kill /* 15 */ .long __lxsys_alarm @@ -61,6 +61,7 @@ .long __lxsys_syslog .long __lxsys_sys_mmap .long __lxsys_munmap + .long __lxsys_execve 2: .rept __SYSCALL_MAX - (2b - 1b)/4 .long 0 @@ -71,10 +72,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 @@ -92,7 +94,7 @@ pushl 8(%ebp) /* ecx - #2 arg */ pushl 4(%ebp) /* ebx - #1 arg */ - call (%eax) + call *(%eax) movl %eax, (%ebp) /* save the return value */