refactor: use a more decent physical memory map

[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 d00e75755cf16136481e6e1213ebe7865d70abd4..c4e1662c1a89aa4ec78f3405c71fa8e93245e481 100644 (file)
--- a/lunaix-os/kernel/process/signal.c
+++ b/lunaix-os/kernel/process/signal.c
@@ -6,15 +6,19 @@
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 

-LOG_MODULE("SIG")
-

 #include <klibc/string.h>
 
 #include <klibc/string.h>
 

+#include <sys/mm/mempart.h>
+
+LOG_MODULE("SIG")
+

 extern struct scheduler sched_ctx; /* kernel/sched.c */
 
 #define UNMASKABLE (sigset(SIGKILL) | sigset(SIGTERM))
 #define TERMSIG (sigset(SIGSEGV) | sigset(SIGINT) | UNMASKABLE)
 #define CORE (sigset(SIGSEGV))
 extern struct scheduler sched_ctx; /* kernel/sched.c */
 
 #define UNMASKABLE (sigset(SIGKILL) | sigset(SIGTERM))
 #define TERMSIG (sigset(SIGSEGV) | sigset(SIGINT) | UNMASKABLE)
 #define CORE (sigset(SIGSEGV))

+#define within_kstack(addr)                                                    \
+    (KERNEL_STACK <= (addr) && (addr) <= KERNEL_STACK_END)

 
 static inline void
 signal_terminate(int errcode)
 
 static inline void
 signal_terminate(int errcode)


@@ -57,7 +61,7 @@ signal_dispatch()
 
     ptr_t ustack = __current->ustack_top;
 
 
     ptr_t ustack = __current->ustack_top;
 

-    if ((int)(ustack - USTACK_END) < (int)sizeof(struct proc_sig)) {
+    if ((int)(ustack - USR_STACK) < (int)sizeof(struct proc_sig)) {

         // 用户栈没有空间存放信号上下文
         return 0;
     }
         // 用户栈没有空间存放信号上下文
         return 0;
     }


@@ -77,6 +81,12 @@ signal_dispatch()
     return sigframe;
 }
 
     return sigframe;
 }
 

+void
+proc_clear_signal(struct proc_info* proc)
+{
+    memset(&proc->sigctx, 0, sizeof(proc->sigctx));
+}
+

 void
 proc_setsignal(struct proc_info* proc, int signum)
 {
 void
 proc_setsignal(struct proc_info* proc, int signum)
 {