Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

xtensa_context.S: No need to save A2 before calling

Browse Source 
_xtensa_save_context.  It uses CALL0, in this case A1 is callee saved
and we can it directly.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche
2022-03-11 18:54:36 +01:00
committed by Xiang Xiao
parent 2dcbf28f15
commit 4786963ee2
4 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/xtensa/src/common/xtensa_context.S
+23 -23
View File
@@ -114,34 +114,34 @@
_xtensa_context_save: _xtensa_context_save:
s32i a4, a2, (4 * REG_A4) s32i a4, sp, (4 * REG_A4)
s32i a5, a2, (4 * REG_A5) s32i a5, sp, (4 * REG_A5)
s32i a6, a2, (4 * REG_A6) s32i a6, sp, (4 * REG_A6)
s32i a7, a2, (4 * REG_A7) s32i a7, sp, (4 * REG_A7)
s32i a8, a2, (4 * REG_A8) s32i a8, sp, (4 * REG_A8)
s32i a9, a2, (4 * REG_A9) s32i a9, sp, (4 * REG_A9)
s32i a10, a2, (4 * REG_A10) s32i a10, sp, (4 * REG_A10)
s32i a11, a2, (4 * REG_A11) s32i a11, sp, (4 * REG_A11)
/* Call0 ABI callee-saved regs a12-15 do not need to be saved here */ /* Call0 ABI callee-saved regs a12-15 do not need to be saved here */
#ifndef __XTENSA_CALL0_ABI__ #ifndef __XTENSA_CALL0_ABI__
s32i a12, a2, (4 * REG_A12) s32i a12, sp, (4 * REG_A12)
s32i a13, a2, (4 * REG_A13) s32i a13, sp, (4 * REG_A13)
s32i a14, a2, (4 * REG_A14) s32i a14, sp, (4 * REG_A14)
s32i a15, a2, (4 * REG_A15) s32i a15, sp, (4 * REG_A15)
#endif #endif
rsr a3, SAR rsr a3, SAR
s32i a3, a2, (4 * REG_SAR) s32i a3, sp, (4 * REG_SAR)
#if XCHAL_HAVE_LOOPS != 0 #if XCHAL_HAVE_LOOPS != 0
rsr a3, LBEG rsr a3, LBEG
s32i a3, a2, (4 * REG_LBEG) s32i a3, sp, (4 * REG_LBEG)
rsr a3, LEND rsr a3, LEND
s32i a3, a2, (4 * REG_LEND) s32i a3, sp, (4 * REG_LEND)
rsr a3, LCOUNT rsr a3, LCOUNT
s32i a3, a2, (4 * REG_LCOUNT) s32i a3, sp, (4 * REG_LCOUNT)
#endif #endif
#ifndef __XTENSA_CALL0_ABI__ #ifndef __XTENSA_CALL0_ABI__
@@ -160,16 +160,16 @@ _xtensa_context_save:
#error Overlay support is not implemented #error Overlay support is not implemented
#endif #endif
s32i a0, a2, (4 * REG_TMP0) /* Save return address */ s32i a0, sp, (4 * REG_TMP0) /* Save return address */
s32i sp, a2, (4 * REG_TMP1) /* Save current stack pointer */ s32i sp, sp, (4 * REG_TMP1) /* Save current stack pointer */
wsr a2, EXCSAVE_1 /* Preserve register save area */ wsr sp, EXCSAVE_1 /* Preserve register save area */
l32i sp, a2, (4 * REG_A1) /* Restore the interruptee's SP */ l32i sp, sp, (4 * REG_A1) /* Restore the interruptee's SP */
call0 _xtensa_window_spill /* Preserves only a4-a5, a8-a9, a12-a13 */ call0 _xtensa_window_spill /* Preserves only a4-a5, a8-a9, a12-a13 */
rsr a2, EXCSAVE_1 /* Save interruptee's a0 */ rsr sp, EXCSAVE_1 /* Save interruptee's a0 */
l32i a0, a2, (4 * REG_TMP0) /* Save return address */ l32i a0, sp, (4 * REG_TMP0) /* Save return address */
l32i sp, a2, (4 * REG_TMP1) /* Save current stack pointer */ l32i sp, sp, (4 * REG_TMP1) /* Save current stack pointer */
#endif #endif
ret ret
arch/xtensa/src/common/xtensa_int_handlers.S
-6
View File
@@ -311,7 +311,6 @@ _xtensa_level1_handler:
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
s32i a2, sp, (4 * REG_A2) s32i a2, sp, (4 * REG_A2)
mov a2, sp /* Address of state save on stack */
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
@@ -415,7 +414,6 @@ _xtensa_level2_handler:
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
s32i a2, sp, (4 * REG_A2) s32i a2, sp, (4 * REG_A2)
mov a2, sp /* Address of state save on stack */
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
@@ -494,7 +492,6 @@ _xtensa_level3_handler:
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
s32i a2, sp, (4 * REG_A2) s32i a2, sp, (4 * REG_A2)
mov a2, sp /* Address of state save on stack */
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
@@ -573,7 +570,6 @@ _xtensa_level4_handler:
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
s32i a2, sp, (4 * REG_A2) s32i a2, sp, (4 * REG_A2)
mov a2, sp /* Address of state save on stack */
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
@@ -652,7 +648,6 @@ _xtensa_level5_handler:
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
s32i a2, sp, (4 * REG_A2) s32i a2, sp, (4 * REG_A2)
mov a2, sp /* Address of state save on stack */
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
@@ -731,7 +726,6 @@ _xtensa_level6_handler:
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
s32i a2, sp, (4 * REG_A2) s32i a2, sp, (4 * REG_A2)
mov a2, sp /* Address of state save on stack */
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
arch/xtensa/src/common/xtensa_panic.S
+1 -1
View File
@@ -126,7 +126,7 @@ _xtensa_panic:
* stack. * stack.
*/ */
mov a2, sp /* Address of state save on stack */ s32i a2, sp, (4 * REG_A2)
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
arch/xtensa/src/common/xtensa_user_handler.S
+2 -7
View File
@@ -229,7 +229,6 @@ _xtensa_user_handler:
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
s32i a2, sp, (4 * REG_A2) s32i a2, sp, (4 * REG_A2)
mov a2, sp /* Address of state save on stack */
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
@@ -343,8 +342,7 @@ _xtensa_syscall_handler:
#if XCHAL_HAVE_LOOPS != 0 #if XCHAL_HAVE_LOOPS != 0
/* Save A2 and A3 now to give us some registers to work with. A0, A2 /* Save A2 and A3 now to give us some registers to work with. A0, A2
* and A3 are now available. NOTE that A3 will get saved again in * and A3 are now available.
* _xtensa_context_save().
*/ */
s32i a2, sp, (4 * REG_A2) /* Save interruptee's A2 */ s32i a2, sp, (4 * REG_A2) /* Save interruptee's A2 */
@@ -381,14 +379,12 @@ _xtensa_syscall_handler:
wsr a0, EPC_1 /* Update PC */ wsr a0, EPC_1 /* Update PC */
s32i a0, sp, (4 * REG_PC) s32i a0, sp, (4 * REG_PC)
/* Save a2 which will hold the argument to _xtensa_context_save*/
s32i a2, sp, (4 * REG_A2) /* Save interruptee's A2 */ s32i a2, sp, (4 * REG_A2) /* Save interruptee's A2 */
s32i a3, sp, (4 * REG_A3) /* Save interruptee's A3 */
#endif #endif
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
mov a2, sp /* Address of state save on stack */
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */
/* Dispatch the sycall as with other interrupts. */ /* Dispatch the sycall as with other interrupts. */
@@ -517,7 +513,6 @@ _xtensa_coproc_handler:
/* Save rest of interrupt context. */ /* Save rest of interrupt context. */
s32i a2, sp, (4 * REG_A2) s32i a2, sp, (4 * REG_A2)
mov a2, sp /* Address of state save on stack */
s32i a3, sp, (4 * REG_A3) s32i a3, sp, (4 * REG_A3)
call0 _xtensa_context_save /* Save full register state */ call0 _xtensa_context_save /* Save full register state */