(nuttx) branch master updated: arm64: change name saved_reg to saved_regs

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 111a0746c2 arm64: change name saved_reg to saved_regs
111a0746c2 is described below

commit 111a0746c2cb20954850942b75fb318115a5292a
Author: hujun5 <huj...@xiaomi.com>
AuthorDate: Tue Nov 26 08:02:11 2024 +0800

    arm64: change name saved_reg to saved_regs
    
    reason:
    saved_regs is more meaningful and used by all other arch
    
    Signed-off-by: hujun5 <huj...@xiaomi.com>
---
 arch/arm64/include/irq.h                        | 2 +-
 arch/arm64/src/common/arm64_schedulesigaction.c | 2 +-
 arch/arm64/src/common/arm64_sigdeliver.c        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/include/irq.h b/arch/arm64/include/irq.h
index 3c67bca579..7e2fe51056 100644
--- a/arch/arm64/include/irq.h
+++ b/arch/arm64/include/irq.h
@@ -270,7 +270,7 @@ struct xcptcontext
 
   /* task context, for signal process */
 
-  uint64_t *saved_reg;
+  uint64_t *saved_regs;
 
 #ifdef CONFIG_ARCH_FPU
   uint64_t *fpu_regs;
diff --git a/arch/arm64/src/common/arm64_schedulesigaction.c 
b/arch/arm64/src/common/arm64_schedulesigaction.c
index 737e0ba1a9..91cad79b51 100644
--- a/arch/arm64/src/common/arm64_schedulesigaction.c
+++ b/arch/arm64/src/common/arm64_schedulesigaction.c
@@ -138,7 +138,7 @@ void up_schedule_sigaction(struct tcb_s *tcb)
        * have been delivered.
        */
 
-      tcb->xcp.saved_reg = tcb->xcp.regs;
+      tcb->xcp.saved_regs = tcb->xcp.regs;
 
       /* create signal process context */
 
diff --git a/arch/arm64/src/common/arm64_sigdeliver.c 
b/arch/arm64/src/common/arm64_sigdeliver.c
index 0994678428..6c283e43b8 100644
--- a/arch/arm64/src/common/arm64_sigdeliver.c
+++ b/arch/arm64/src/common/arm64_sigdeliver.c
@@ -64,7 +64,7 @@ void arm64_sigdeliver(void)
 
   irqstate_t  flags;
   int16_t saved_irqcount;
-  flags = (rtcb->xcp.saved_reg[REG_SPSR] & SPSR_DAIF_MASK);
+  flags = (rtcb->xcp.saved_regs[REG_SPSR] & SPSR_DAIF_MASK);
 #endif
 
   sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
@@ -149,7 +149,7 @@ retry:
    */
 
   rtcb->sigdeliver = NULL;  /* Allows next handler to be scheduled */
-  rtcb->xcp.regs = rtcb->xcp.saved_reg;
+  rtcb->xcp.regs = rtcb->xcp.saved_regs;
 
   /* Then restore the correct state for this thread of execution. */