Reduce the size of tcb by four bytes.

Signed-off-by: wangzhi16 <[email protected]>
apache · Dec 30, 2024 · 817406d · 817406d
1 parent 12ddf5d
commit 817406d
Show file tree

Hide file tree

Showing 70 changed files with 295 additions and 230 deletions.
diff --git a/arch/arm/src/arm/arm_schedulesigaction.c b/arch/arm/src/arm/arm_schedulesigaction.c
@@ -35,6 +35,7 @@
 
 #include "arm.h"
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 
 /****************************************************************************
@@ -90,8 +91,8 @@ void up_schedule_sigaction(struct tcb_s *tcb)
     {
       /* In this case just deliver the signal now. */
 
-      (tcb->sigdeliver)(tcb);
-      tcb->sigdeliver = NULL;
+      nxsig_deliver(tcb);
+      tcb->flags &= ~TCB_FLAG_SIGDELIVER;
     }
 
   /* Otherwise, we are (1) signaling a task is not running

diff --git a/arch/arm/src/arm/arm_sigdeliver.c b/arch/arm/src/arm/arm_sigdeliver.c
@@ -37,6 +37,7 @@
 #include <arch/board/board.h>
 
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 
 /****************************************************************************
@@ -59,9 +60,9 @@ void arm_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-        rtcb, rtcb->sigdeliver, rtcb->sigpendactionq.head);
-  DEBUGASSERT(rtcb->sigdeliver != NULL);
+  sinfo("rtcb=%p sigpendactionq.head=%p\n",
+        rtcb, rtcb->sigpendactionq.head);
+  DEBUGASSERT((rtcb->flags & TCB_FLAG_SIGDELIVER) != 0);
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
   /* Then make sure that interrupts are enabled.  Signal handlers must always
@@ -73,7 +74,7 @@ void arm_sigdeliver(void)
 
   /* Deliver the signal */
 
-  (rtcb->sigdeliver)(rtcb);
+  nxsig_deliver(rtcb);
 
   /* Output any debug messages BEFORE restoring errno (because they may
    * alter errno), then disable interrupts again and restore the original
@@ -93,7 +94,7 @@ void arm_sigdeliver(void)
    * could be modified by a hostile program.
    */
 
-  rtcb->sigdeliver = NULL;  /* Allows next handler to be scheduled */
+  rtcb->flags &= ~TCB_FLAG_SIGDELIVER;  /* Allows next handler to be scheduled */
 
   /* Then restore the correct state for this thread of execution. */
 

diff --git a/arch/arm/src/armv6-m/arm_doirq.c b/arch/arm/src/armv6-m/arm_doirq.c
@@ -34,6 +34,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 #include <sched/sched.h>
+#include <signal/signal.h>
 
 #include "arm_internal.h"
 #include "exc_return.h"
@@ -86,7 +87,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
 
       irq_dispatch(irq, regs);
 #endif
-      if (tcb->sigdeliver)
+      if ((tcb->flags & TCB_FLAG_SIGDELIVER) != 0)
         {
           /* Pendsv able to access running tcb with no critical section */
 

diff --git a/arch/arm/src/armv6-m/arm_schedulesigaction.c b/arch/arm/src/armv6-m/arm_schedulesigaction.c
@@ -37,6 +37,7 @@
 #include "psr.h"
 #include "exc_return.h"
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 #include "irq/irq.h"
 #include "nvic.h"
@@ -96,8 +97,8 @@ void up_schedule_sigaction(struct tcb_s *tcb)
        * REVISIT:  Signal handle will run in a critical section!
        */
 
-      (tcb->sigdeliver)(tcb);
-      tcb->sigdeliver = NULL;
+      nxsig_deliver(tcb);
+      tcb->flags &= ~TCB_FLAG_SIGDELIVER;
     }
   else if (tcb == rtcb && ipsr != NVIC_IRQ_PENDSV)
     {

diff --git a/arch/arm/src/armv6-m/arm_sigdeliver.c b/arch/arm/src/armv6-m/arm_sigdeliver.c
@@ -37,6 +37,7 @@
 #include <arch/board/board.h>
 
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 
 /****************************************************************************
@@ -69,9 +70,9 @@ void arm_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-        rtcb, rtcb->sigdeliver, rtcb->sigpendactionq.head);
-  DEBUGASSERT(rtcb->sigdeliver != NULL);
+  sinfo("rtcb=%p sigpendactionq.head=%p\n",
+        rtcb, rtcb->sigpendactionq.head);
+  DEBUGASSERT((rtcb->flags & TCB_FLAG_SIGDELIVER) != 0);
 
 retry:
 #ifdef CONFIG_SMP
@@ -103,7 +104,7 @@ void arm_sigdeliver(void)
 
   /* Deliver the signal */
 
-  (rtcb->sigdeliver)(rtcb);
+  nxsig_deliver(rtcb);
 
   /* Output any debug messages BEFORE restoring errno (because they may
    * alter errno), then disable interrupts again and restore the original
@@ -150,7 +151,7 @@ void arm_sigdeliver(void)
    * could be modified by a hostile program.
    */
 
-  rtcb->sigdeliver = NULL;  /* Allows next handler to be scheduled */
+  rtcb->flags &= ~TCB_FLAG_SIGDELIVER;  /* Allows next handler to be scheduled */
 
   /* Then restore the correct state for this thread of
    * execution.

diff --git a/arch/arm/src/armv7-a/arm_schedulesigaction.c b/arch/arm/src/armv7-a/arm_schedulesigaction.c
@@ -36,6 +36,7 @@
 
 #include "arm.h"
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 #include "irq/irq.h"
 
@@ -94,8 +95,8 @@ void up_schedule_sigaction(struct tcb_s *tcb)
        * REVISIT:  Signal handler will run in a critical section!
        */
 
-      (tcb->sigdeliver)(tcb);
-      tcb->sigdeliver = NULL;
+      nxsig_deliver(tcb);
+      tcb->flags &= ~TCB_FLAG_SIGDELIVER;
     }
   else
     {

diff --git a/arch/arm/src/armv7-a/arm_sigdeliver.c b/arch/arm/src/armv7-a/arm_sigdeliver.c
@@ -37,6 +37,7 @@
 #include <arch/board/board.h>
 
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 
 /****************************************************************************
@@ -69,9 +70,9 @@ void arm_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-        rtcb, rtcb->sigdeliver, rtcb->sigpendactionq.head);
-  DEBUGASSERT(rtcb->sigdeliver != NULL);
+  sinfo("rtcb=%p sigpendactionq.head=%p\n",
+        rtcb, rtcb->sigpendactionq.head);
+  DEBUGASSERT((rtcb->flags & TCB_FLAG_SIGDELIVER) != 0);
 
 retry:
 #ifdef CONFIG_SMP
@@ -103,7 +104,7 @@ void arm_sigdeliver(void)
 
   /* Deliver the signal */
 
-  (rtcb->sigdeliver)(rtcb);
+  nxsig_deliver(rtcb);
 
   /* Output any debug messages BEFORE restoring errno (because they may
    * alter errno), then disable interrupts again and restore the original
@@ -150,7 +151,7 @@ void arm_sigdeliver(void)
    * could be modified by a hostile program.
    */
 
-  rtcb->sigdeliver = NULL;  /* Allows next handler to be scheduled */
+  rtcb->flags &= ~TCB_FLAG_SIGDELIVER; /* Allows next handler to be scheduled */
 
   /* Then restore the correct state for this thread of execution. */
 

diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
@@ -410,7 +410,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
               /* Copy "info" into user stack */
 
-              if (rtcb->sigdeliver)
+              if ((rtcb->flags & TCB_FLAG_SIGDELIVER) != 0)
                 {
                   usp = rtcb->xcp.saved_regs[REG_SP];
                 }

diff --git a/arch/arm/src/armv7-m/arm_doirq.c b/arch/arm/src/armv7-m/arm_doirq.c
@@ -34,6 +34,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 #include <sched/sched.h>
+#include <signal/signal.h>
 
 #include "arm_internal.h"
 #include "exc_return.h"
@@ -86,7 +87,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
 
       irq_dispatch(irq, regs);
 #endif
-      if (tcb->sigdeliver)
+      if ((tcb->flags & TCB_FLAG_SIGDELIVER) != 0)
         {
           /* Pendsv able to access running tcb with no critical section */
 

diff --git a/arch/arm/src/armv7-m/arm_schedulesigaction.c b/arch/arm/src/armv7-m/arm_schedulesigaction.c
@@ -38,6 +38,7 @@
 #include "psr.h"
 #include "exc_return.h"
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 #include "irq/irq.h"
 #include "nvic.h"
@@ -97,8 +98,8 @@ void up_schedule_sigaction(struct tcb_s *tcb)
        * REVISIT:  Signal handle will run in a critical section!
        */
 
-      (tcb->sigdeliver)(tcb);
-      tcb->sigdeliver = NULL;
+      nxsig_deliver(tcb);
+      tcb->flags &= ~TCB_FLAG_SIGDELIVER;
     }
   else if (tcb == rtcb && ipsr != NVIC_IRQ_PENDSV)
     {

diff --git a/arch/arm/src/armv7-m/arm_sigdeliver.c b/arch/arm/src/armv7-m/arm_sigdeliver.c
@@ -37,6 +37,7 @@
 #include <arch/board/board.h>
 
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 
 /****************************************************************************
@@ -69,9 +70,9 @@ void arm_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-        rtcb, rtcb->sigdeliver, rtcb->sigpendactionq.head);
-  DEBUGASSERT(rtcb->sigdeliver != NULL);
+  sinfo("rtcb=%p sigpendactionq.head=%p\n",
+        rtcb, rtcb->sigpendactionq.head);
+  DEBUGASSERT((rtcb->flags & TCB_FLAG_SIGDELIVER) != 0);
 
 retry:
 #ifdef CONFIG_SMP
@@ -103,7 +104,7 @@ void arm_sigdeliver(void)
 
   /* Deliver the signal */
 
-  (rtcb->sigdeliver)(rtcb);
+  nxsig_deliver(rtcb);
 
   /* Output any debug messages BEFORE restoring errno (because they may
    * alter errno), then disable interrupts again and restore the original
@@ -150,7 +151,7 @@ void arm_sigdeliver(void)
    * could be modified by a hostile program.
    */
 
-  rtcb->sigdeliver = NULL;  /* Allows next handler to be scheduled */
+  rtcb->flags &= ~TCB_FLAG_SIGDELIVER;  /* Allows next handler to be scheduled */
 
   /* Then restore the correct state for this thread of
    * execution.

diff --git a/arch/arm/src/armv7-r/arm_schedulesigaction.c b/arch/arm/src/armv7-r/arm_schedulesigaction.c
@@ -35,6 +35,7 @@
 
 #include "arm.h"
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 
 /****************************************************************************
@@ -92,8 +93,8 @@ void up_schedule_sigaction(struct tcb_s *tcb)
        * REVISIT:  Signal handler will run in a critical section!
        */
 
-      (tcb->sigdeliver)(tcb);
-      tcb->sigdeliver = NULL;
+      nxsig_deliver(tcb);
+      tcb->flags &= ~TCB_FLAG_SIGDELIVER;
     }
   else
     {

diff --git a/arch/arm/src/armv7-r/arm_sigdeliver.c b/arch/arm/src/armv7-r/arm_sigdeliver.c
@@ -37,6 +37,7 @@
 #include <arch/board/board.h>
 
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 
 /****************************************************************************
@@ -69,9 +70,9 @@ void arm_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-        rtcb, rtcb->sigdeliver, rtcb->sigpendactionq.head);
-  DEBUGASSERT(rtcb->sigdeliver != NULL);
+  sinfo("rtcb=%p sigpendactionq.head=%p\n",
+        rtcb, rtcb->sigpendactionq.head);
+  DEBUGASSERT((rtcb->flags & TCB_FLAG_SIGDELIVER) != 0);
 
 retry:
 #ifdef CONFIG_SMP
@@ -103,7 +104,7 @@ void arm_sigdeliver(void)
 
   /* Deliver the signal */
 
-  (rtcb->sigdeliver)(rtcb);
+  nxsig_deliver(rtcb);
 
   /* Output any debug messages BEFORE restoring errno (because they may
    * alter errno), then disable interrupts again and restore the original
@@ -147,7 +148,7 @@ void arm_sigdeliver(void)
    * could be modified by a hostile program.
    */
 
-  rtcb->sigdeliver = NULL;  /* Allows next handler to be scheduled */
+  rtcb->flags &= ~TCB_FLAG_SIGDELIVER;  /* Allows next handler to be scheduled */
 
   /* Then restore the correct state for this thread of execution. */
 

diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
@@ -407,7 +407,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
               /* Copy "info" into user stack */
 
-              if (rtcb->sigdeliver)
+              if ((rtcb->flags & TCB_FLAG_SIGDELIVER) != 0)
                 {
                   usp = rtcb->xcp.saved_regs[REG_SP];
                 }

diff --git a/arch/arm/src/armv8-m/arm_doirq.c b/arch/arm/src/armv8-m/arm_doirq.c
@@ -97,7 +97,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
 
       irq_dispatch(irq, regs);
 #endif
-      if (tcb->sigdeliver)
+      if ((tcb->flags & TCB_FLAG_SIGDELIVER) != 0)
         {
           /* Pendsv able to access running tcb with no critical section */
 

diff --git a/arch/arm/src/armv8-m/arm_schedulesigaction.c b/arch/arm/src/armv8-m/arm_schedulesigaction.c
@@ -38,6 +38,7 @@
 #include "psr.h"
 #include "exc_return.h"
 #include "sched/sched.h"
+#include "signal/signal.h"
 #include "arm_internal.h"
 #include "irq/irq.h"
 #include "nvic.h"
@@ -97,8 +98,8 @@ void up_schedule_sigaction(struct tcb_s *tcb)
        * REVISIT:  Signal handle will run in a critical section!
        */
 
-      (tcb->sigdeliver)(tcb);
-      tcb->sigdeliver = NULL;
+      nxsig_deliver(tcb);
+      tcb->flags &= ~TCB_FLAG_SIGDELIVER;
     }
   else if (tcb == rtcb && ipsr != NVIC_IRQ_PENDSV)
     {