xtensa: inline up_switch_context

open-vela · Dec 25, 2024 · 63d3786 · 63d3786
1 parent bbcf0dc
commit 63d3786
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 81 deletions.
diff --git a/arch/xtensa/include/irq.h b/arch/xtensa/include/irq.h
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #ifndef __ASSEMBLY__
 #  include <stdbool.h>
+#  include <arch/syscall.h>
 #endif
 
 #include <arch/types.h>
@@ -458,6 +459,15 @@ noinstrument_function static inline_function bool up_interrupt_context(void)
 }
 #endif
 
+#define up_switch_context(tcb, rtcb)                              \
+  do {                                                            \
+    if (!up_interrupt_context())                                  \
+      {                                                           \
+        sys_call2(SYS_switch_context, (uintptr_t)&rtcb->xcp.regs, \
+                  (uintptr_t)tcb->xcp.regs);                      \
+      }                                                           \
+  } while (0)
+
 /****************************************************************************
  * Name: up_getusrpc
  ****************************************************************************/

diff --git a/arch/xtensa/src/common/CMakeLists.txt b/arch/xtensa/src/common/CMakeLists.txt
@@ -69,7 +69,6 @@ list(
   xtensa_releasestack.c
   xtensa_registerdump.c
   xtensa_sigdeliver.c
-  xtensa_switchcontext.c
   xtensa_swint.c
   xtensa_stackframe.c
   xtensa_saveusercontext.c

diff --git a/arch/xtensa/src/common/Make.defs b/arch/xtensa/src/common/Make.defs
@@ -34,7 +34,7 @@ CMN_CSRCS += xtensa_irqdispatch.c xtensa_lowputs.c xtensa_mdelay.c
 CMN_CSRCS += xtensa_modifyreg8.c xtensa_modifyreg16.c xtensa_modifyreg32.c
 CMN_CSRCS += xtensa_mpu.c xtensa_nputs.c xtensa_oneshot.c xtensa_perf.c
 CMN_CSRCS += xtensa_releasestack.c xtensa_registerdump.c xtensa_sigdeliver.c
-CMN_CSRCS += xtensa_switchcontext.c xtensa_swint.c xtensa_stackframe.c
+CMN_CSRCS += xtensa_swint.c xtensa_stackframe.c
 CMN_CSRCS += xtensa_saveusercontext.c xtensa_schedsigaction.c xtensa_udelay.c
 CMN_CSRCS += xtensa_usestack.c xtensa_tcbinfo.c
 

diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h
@@ -108,9 +108,6 @@
 #define xtensa_context_restore(regs)\
   sys_call1(SYS_restore_context, (uintptr_t)regs)
 
-#define xtensa_switchcontext(saveregs, restoreregs)\
-  sys_call2(SYS_switch_context, (uintptr_t)saveregs, (uintptr_t)restoreregs)
-
 /* Interrupt codes from other CPUs: */
 
 #define CPU_INTCODE_NONE  0

diff --git a/arch/xtensa/src/common/xtensa_switchcontext.c b/arch/xtensa/src/common/xtensa_switchcontext.c