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/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push: new 35449e4 risc-v: Don't use non existent "saved_status" 35449e4 is described below commit 35449e4d14dcffc0790a3e4e5d6a0301a553abc9 Author: YAMAMOTO Takashi <yamam...@midokura.com> AuthorDate: Sun Nov 22 16:53:00 2020 +0900 risc-v: Don't use non existent "saved_status" It seems like a copy-and-paste leftover from mips. Replace them with saved_int_ctx. (Shouldn't these files inherit the copyright notice from mips?) --- arch/risc-v/src/fe310/fe310_schedulesigaction.c | 4 ++-- arch/risc-v/src/gap8/gap8_schedulesigaction.c | 4 ++-- arch/risc-v/src/k210/k210_schedulesigaction.c | 4 ++-- arch/risc-v/src/nr5m100/nr5_schedulesigaction.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/risc-v/src/fe310/fe310_schedulesigaction.c b/arch/risc-v/src/fe310/fe310_schedulesigaction.c index c2a6936..b55ead5 100644 --- a/arch/risc-v/src/fe310/fe310_schedulesigaction.c +++ b/arch/risc-v/src/fe310/fe310_schedulesigaction.c @@ -166,7 +166,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) up_savestate(tcb->xcp.regs); sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", - tcb->xcp.saved_epc, tcb->xcp.saved_status, + tcb->xcp.saved_epc, tcb->xcp.saved_int_ctx, g_current_regs[REG_EPC], g_current_regs[REG_INT_CTX]); } } @@ -200,7 +200,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) tcb->xcp.regs[REG_INT_CTX] = int_ctx; sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", - tcb->xcp.saved_epc, tcb->xcp.saved_status, + tcb->xcp.saved_epc, tcb->xcp.saved_int_ctx, tcb->xcp.regs[REG_EPC], tcb->xcp.regs[REG_INT_CTX]); } } diff --git a/arch/risc-v/src/gap8/gap8_schedulesigaction.c b/arch/risc-v/src/gap8/gap8_schedulesigaction.c index 4c2a7fb..00b0601 100644 --- a/arch/risc-v/src/gap8/gap8_schedulesigaction.c +++ b/arch/risc-v/src/gap8/gap8_schedulesigaction.c @@ -162,7 +162,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) up_savestate(tcb->xcp.regs); sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", - tcb->xcp.saved_epc, tcb->xcp.saved_status, + tcb->xcp.saved_epc, tcb->xcp.saved_int_ctx, g_current_regs[REG_EPC], g_current_regs[REG_STATUS]); } } @@ -190,7 +190,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) tcb->xcp.regs[REG_EPC] = (uint32_t)up_sigdeliver; sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", - tcb->xcp.saved_epc, tcb->xcp.saved_status, + tcb->xcp.saved_epc, tcb->xcp.saved_int_ctx, tcb->xcp.regs[REG_EPC], tcb->xcp.regs[REG_STATUS]); } } diff --git a/arch/risc-v/src/k210/k210_schedulesigaction.c b/arch/risc-v/src/k210/k210_schedulesigaction.c index da87112..9359822 100644 --- a/arch/risc-v/src/k210/k210_schedulesigaction.c +++ b/arch/risc-v/src/k210/k210_schedulesigaction.c @@ -173,7 +173,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) up_savestate(tcb->xcp.regs); sinfo("PC/STATUS Saved: %016x/%016x New: %016x/%016x\n", - tcb->xcp.saved_epc, tcb->xcp.saved_status, + tcb->xcp.saved_epc, tcb->xcp.saved_int_ctx, CURRENT_REGS[REG_EPC], CURRENT_REGS[REG_INT_CTX]); } } @@ -208,7 +208,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) tcb->xcp.regs[REG_INT_CTX] = int_ctx; sinfo("PC/STATUS Saved: %016x/%016x New: %016x/%016x\n", - tcb->xcp.saved_epc, tcb->xcp.saved_status, + tcb->xcp.saved_epc, tcb->xcp.saved_int_ctx, tcb->xcp.regs[REG_EPC], tcb->xcp.regs[REG_INT_CTX]); } } diff --git a/arch/risc-v/src/nr5m100/nr5_schedulesigaction.c b/arch/risc-v/src/nr5m100/nr5_schedulesigaction.c index 8c1af39..0614f72 100644 --- a/arch/risc-v/src/nr5m100/nr5_schedulesigaction.c +++ b/arch/risc-v/src/nr5m100/nr5_schedulesigaction.c @@ -167,7 +167,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) up_savestate(tcb->xcp.regs); sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", - tcb->xcp.saved_epc, tcb->xcp.saved_status, + tcb->xcp.saved_epc, tcb->xcp.saved_int_ctx, g_current_regs[REG_EPC], g_current_regs[REG_STATUS]); } } @@ -200,7 +200,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) tcb->xcp.regs[REG_INT_CTX] = int_ctx; sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", - tcb->xcp.saved_epc, tcb->xcp.saved_status, + tcb->xcp.saved_epc, tcb->xcp.saved_int_ctx, tcb->xcp.regs[REG_EPC], tcb->xcp.regs[REG_STATUS]); } }