x86_64: we should call x86_64_restorestate/x86_64_savestate

reason: In x86_64, g_current_regs is still used for context switching. This commit fixes the regression from apache#13616 Signed-off-by: hujun5 <[email protected]>
hujun260 · Sep 30, 2024 · 7137384 · 7137384
1 parent 7cf5e7c
commit 7137384
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/arch/x86_64/src/intel64/intel64_cpupause.c b/arch/x86_64/src/intel64/intel64_cpupause.c
@@ -286,9 +286,16 @@ int up_pause_handler(int irq, void *c, void *arg)
 
 int up_pause_async_handler(int irq, void *c, void *arg)
 {
+  struct tcb_s *tcb;
   int cpu = this_cpu();
 
+  tcb = current_task(cpu);
+  nxsched_suspend_scheduler(tcb);
+  x86_64_savestate(tcb->xcp.regs);
   nxsched_process_delivered(cpu);
+  tcb = current_task(cpu);
+  nxsched_resume_scheduler(tcb);
+  x86_64_restorestate(tcb->xcp.regs);
 
   return OK;
 }

diff --git a/boot.iso b/boot.iso