OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sim: remove sim_saveusercontext() return value 

Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2023-02-10 16:12:46 +08:00 committed by Masayuki Ishikawa
parent 7347684e5f
commit 758668d11a
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sim/src/sim/sim_doirq.c
View File

@ -43,12 +43,14 @@ void *sim_doirq(int irq, void *context)
xcpt_reg_t tmp[XCPTCONTEXT_REGS];
void *regs = (void *)tmp;
int ret;
/* CURRENT_REGS non-zero indicates that we are processing an interrupt.
* CURRENT_REGS is also used to manage interrupt level context switches.
*/
if (sim_saveusercontext(regs) == 0)
sim_saveusercontext(regs, ret);
if (ret == 0)
{
CURRENT_REGS = regs;

21
arch/sim/src/sim/sim_internal.h
View File

@ -85,17 +85,20 @@
#define sim_savestate(regs) sim_copyfullstate(regs, (xcpt_reg_t *)CURRENT_REGS)
#define sim_restorestate(regs) (CURRENT_REGS = regs)
#define sim_saveusercontext(saveregs) \
({ \
irqstate_t flags = up_irq_flags(); \
xcpt_reg_t *env = saveregs; \
uint32_t *val = (uint32_t *)&env[JB_FLAG]; \
#define sim_saveusercontext(saveregs, ret) \
do \
{ \
irqstate_t flags = up_irq_flags(); \
xcpt_reg_t *env = saveregs; \
uint32_t *val = (uint32_t *)&env[JB_FLAG]; \
\
val[0] = flags & UINT32_MAX; \
val[1] = (flags >> 32) & UINT32_MAX; \
val[0] = flags & UINT32_MAX; \
val[1] = (flags >> 32) & UINT32_MAX; \
\
setjmp(saveregs); \
})
ret = setjmp(saveregs); \
} \
while (0)
#define sim_fullcontextrestore(restoreregs) \
do \
{ \

6
arch/sim/src/sim/sim_saveusercontext.c
View File

@ -48,5 +48,9 @@
int up_saveusercontext(void *saveregs)
{
return sim_saveusercontext(saveregs);
int ret;
sim_saveusercontext(saveregs, ret);
return ret;
}

7
arch/sim/src/sim/sim_switchcontext.c
View File

@ -53,6 +53,8 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
int ret;
sinfo("Unblocking TCB=%p\n", tcb);
/* Update scheduler parameters */
@ -80,6 +82,8 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
/* Then switch contexts */
sim_restorestate(tcb->xcp.regs);
return;
}
/* Copy the exception context into the TCB of the task that was
@ -87,7 +91,8 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
* then this is really the previously running task restarting!
*/
else if (!sim_saveusercontext(rtcb->xcp.regs))
sim_saveusercontext(rtcb->xcp.regs, ret);
if (ret == 0)
{
sinfo("New Active Task TCB=%p\n", tcb);