luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86_64: fix regression https://github.com/apache/nuttx/pull/15651

Browse source 
reason:
In x86_64, tcb->xcp.regs is always valid, and we obtain the location
where the context is saved through irq_xcp_regs every time an interrupt occurs.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5 2025-01-23 20:55:38 +08:00 • committed by Xiang Xiao
parent b0af946b7a
commit aa9f366eec
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/x86_64/src/intel64/intel64_handlers.c
View file

@ -67,8 +67,6 @@ static uint64_t *common_handler(int irq, uint64_t *regs)
struct tcb_s **running_task = &g_running_tasks[this_cpu()];
struct tcb_s *tcb;
(*running_task)->xcp.regs = regs;
/* Current regs non-zero indicates that we are processing an interrupt;
* g_current_regs is also used to manage interrupt level context switches.
*
@ -126,14 +124,8 @@ static uint64_t *common_handler(int irq, uint64_t *regs)
/* Clear irq flag */
up_set_interrupt_context(false);
regs = tcb->xcp.regs;
/* (*running_task)->xcp.regs is about to become invalid
* and will be marked as NULL to avoid misusage.
*/
(*running_task)->xcp.regs = NULL;
return regs;
return tcb->xcp.regs;
}
#endif