chore: fix almost *ALL* warnings.

[lunaix-os.git] / lunaix-os / kernel / process / signal.c

diff --git a/lunaix-os/kernel/process/signal.c b/lunaix-os/kernel/process/signal.c
index 0f43b1f65216adc7d1dfadae52f365318b40248e..9e46976e36440e17ceb23b2a05a10e4a9c5cc6f5 100644 (file)
--- a/lunaix-os/kernel/process/signal.c
+++ b/lunaix-os/kernel/process/signal.c
@@ -9,6 +9,9 @@
 
 extern struct scheduler sched_ctx; /* kernel/sched.c */
 
 
 extern struct scheduler sched_ctx; /* kernel/sched.c */
 

+extern void
+_exit(int status);
+

 void __USER__
 default_sighandler_term(int signum)
 {
 void __USER__
 default_sighandler_term(int signum)
 {


@@ -17,12 +20,12 @@ default_sighandler_term(int signum)
 
 void* default_handlers[_SIG_NUM] = {
     // TODO: 添加默认handler
 
 void* default_handlers[_SIG_NUM] = {
     // TODO: 添加默认handler

-    [_SIGINT] = default_sighandler_term,  [_SIGTERM] = default_sighandler_term,
-    [_SIGKILL] = default_sighandler_term, [_SIGSEGV] = default_sighandler_term,

     [_SIGINT] = default_sighandler_term,
     [_SIGINT] = default_sighandler_term,

+    [_SIGTERM] = default_sighandler_term,
+    [_SIGKILL] = default_sighandler_term,
+    [_SIGSEGV] = default_sighandler_term,

 };
 
 };
 

-volatile struct proc_sigstate __temp_save;

 // Referenced in kernel/asm/x86/interrupt.S
 void*
 signal_dispatch()
 // Referenced in kernel/asm/x86/interrupt.S
 void*
 signal_dispatch()


@@ -43,13 +46,17 @@ signal_dispatch()
         return 0;
     }
 
         return 0;
     }
 

+    // TODO: SIG{INT|TERM|KILL|SEGV} should have highest priority.
+    //       Terminate the process right here if any of unmaskable signal is
+    //       set.
+

     if (!__current->sig_handler[sig_selected] &&
         !default_handlers[sig_selected]) {
         // 如果该信号没有handler，则忽略
         return 0;
     }
 
     if (!__current->sig_handler[sig_selected] &&
         !default_handlers[sig_selected]) {
         // 如果该信号没有handler，则忽略
         return 0;
     }
 

-    uintptr_t ustack = __current->ustack_top & ~0xf;
+    ptr_t ustack = __current->ustack_top & ~0xf;

 
     if ((int)(ustack - USTACK_END) < (int)sizeof(struct proc_sig)) {
         // 用户栈没有空间存放信号上下文
 
     if ((int)(ustack - USTACK_END) < (int)sizeof(struct proc_sig)) {
         // 用户栈没有空间存放信号上下文


@@ -79,6 +86,7 @@ signal_dispatch()
 
         解决办法就是先吧intr_ctx拷贝到一个静态分配的区域里，然后再注入到用户栈。
     */
 
         解决办法就是先吧intr_ctx拷贝到一个静态分配的区域里，然后再注入到用户栈。
     */

+    static volatile struct proc_sigstate __temp_save;

     __temp_save.proc_regs = __current->intr_ctx;
     memcpy(__temp_save.fxstate, __current->fxstate, 512);
 
     __temp_save.proc_regs = __current->intr_ctx;
     memcpy(__temp_save.fxstate, __current->fxstate, 512);
 


@@ -145,6 +153,9 @@ __DEFINE_LXSYSCALL1(int, sigreturn, struct proc_sig, *sig_ctx)
     __current->flags &= ~PROC_FINPAUSE;
     __SIGCLEAR(__current->sig_inprogress, sig_ctx->sig_num);
     schedule();
     __current->flags &= ~PROC_FINPAUSE;
     __SIGCLEAR(__current->sig_inprogress, sig_ctx->sig_num);
     schedule();

+
+    // never reach!
+    return 0;

 }
 
 __DEFINE_LXSYSCALL3(int,
 }
 
 __DEFINE_LXSYSCALL3(int,