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

arch/xtensa: Move the new saving area directly to A2.

Browse Source 
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche
2022-06-13 23:32:06 +02:00
committed by Petro Karashchenko
parent 5ab888692e
commit fe8fa4ff75
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/xtensa/src/common/xtensa_int_handlers.S
+10 -16
View File
@@ -110,9 +110,9 @@ g_intstacktop:
* a12 - register save area * a12 - register save area
* *
* Exit Conditions: * Exit Conditions:
* This macro will use registers a0 and a2-a5 and a12. * This macro will use registers a0 and a2-a5 and a2.
* a1 - May point to the new thread's SP * a1 - May point to the new thread's SP
* a12 - Points to the register save area (which may not be on the stack). * a2 - Points to the register save area (which may not be on the stack).
* *
****************************************************************************/ ****************************************************************************/
@@ -156,7 +156,7 @@ g_intstacktop:
* a context switch, it will instead refer to the TCB register save area. * a context switch, it will instead refer to the TCB register save area.
*/ */
mov a12, RETVAL /* Switch to the save area of the new thread */ mov a2, RETVAL /* Switch to the save area of the new thread */
#if CONFIG_ARCH_INTERRUPTSTACK < 15 #if CONFIG_ARCH_INTERRUPTSTACK < 15
addi sp, sp, XCPTCONTEXT_SIZE addi sp, sp, XCPTCONTEXT_SIZE
@@ -207,7 +207,7 @@ _xtensa_level1_handler:
/* Decode and dispatch the interrupt. In the event of an interrupt /* Decode and dispatch the interrupt. In the event of an interrupt
* level context dispatch_c_isr() will (1) switch stacks to the new * level context dispatch_c_isr() will (1) switch stacks to the new
* thread's and (2) provide the address of the register state save * thread's and (2) provide the address of the register state save
* area in a12. NOTE that the state save area may or may not lie * area in a2. NOTE that the state save area may or may not lie
* in the new thread's stack. * in the new thread's stack.
*/ */
@@ -215,7 +215,6 @@ _xtensa_level1_handler:
/* Restore registers in preparation to return from interrupt */ /* Restore registers in preparation to return from interrupt */
mov a2, a12 /* a2 = address of new state save area */
call0 _xtensa_context_restore /* (preserves a2) */ call0 _xtensa_context_restore /* (preserves a2) */
/* Restore only level-specific regs (the rest were already restored) */ /* Restore only level-specific regs (the rest were already restored) */
@@ -287,7 +286,7 @@ _xtensa_level2_handler:
/* Decode and dispatch the interrupt. In the event of an interrupt /* Decode and dispatch the interrupt. In the event of an interrupt
* level context dispatch_c_isr() will (1) switch stacks to the new * level context dispatch_c_isr() will (1) switch stacks to the new
* thread's and (2) provide the address of the register state save * thread's and (2) provide the address of the register state save
* area in a12. NOTE that the state save area may or may not lie * area in a2. NOTE that the state save area may or may not lie
* in the new thread's stack. * in the new thread's stack.
*/ */
@@ -295,7 +294,6 @@ _xtensa_level2_handler:
/* Restore registers in preparation to return from interrupt */ /* Restore registers in preparation to return from interrupt */
mov a2, a12 /* a2 = address of new state save area */
call0 _xtensa_context_restore /* (preserves a2) */ call0 _xtensa_context_restore /* (preserves a2) */
/* Restore only level-specific regs (the rest were already restored) */ /* Restore only level-specific regs (the rest were already restored) */
@@ -342,7 +340,7 @@ _xtensa_level3_handler:
/* Decode and dispatch the interrupt. In the event of an interrupt /* Decode and dispatch the interrupt. In the event of an interrupt
* level context dispatch_c_isr() will (1) switch stacks to the new * level context dispatch_c_isr() will (1) switch stacks to the new
* thread's and (2) provide the address of the register state save * thread's and (2) provide the address of the register state save
* area in a12. NOTE that the state save area may or may not lie * area in a2. NOTE that the state save area may or may not lie
* in the new thread's stack. * in the new thread's stack.
*/ */
@@ -350,7 +348,6 @@ _xtensa_level3_handler:
/* Restore registers in preparation to return from interrupt */ /* Restore registers in preparation to return from interrupt */
mov a2, a12 /* a2 = address of new state save area */
call0 _xtensa_context_restore /* (preserves a2) */ call0 _xtensa_context_restore /* (preserves a2) */
/* Restore only level-specific regs (the rest were already restored) */ /* Restore only level-specific regs (the rest were already restored) */
@@ -397,7 +394,7 @@ _xtensa_level4_handler:
/* Decode and dispatch the interrupt. In the event of an interrupt /* Decode and dispatch the interrupt. In the event of an interrupt
* level context dispatch_c_isr() will (1) switch stacks to the new * level context dispatch_c_isr() will (1) switch stacks to the new
* thread's and (2) provide the address of the register state save * thread's and (2) provide the address of the register state save
* area in a12. NOTE that the state save area may or may not lie * area in a2. NOTE that the state save area may or may not lie
* in the new thread's stack. * in the new thread's stack.
*/ */
@@ -405,7 +402,6 @@ _xtensa_level4_handler:
/* Restore registers in preparation to return from interrupt */ /* Restore registers in preparation to return from interrupt */
mov a2, a12 /* a2 = address of new state save area */
call0 _xtensa_context_restore /* (preserves a2) */ call0 _xtensa_context_restore /* (preserves a2) */
/* Restore only level-specific regs (the rest were already restored) */ /* Restore only level-specific regs (the rest were already restored) */
@@ -452,7 +448,7 @@ _xtensa_level5_handler:
/* Decode and dispatch the interrupt. In the event of an interrupt /* Decode and dispatch the interrupt. In the event of an interrupt
* level context dispatch_c_isr() will (1) switch stacks to the new * level context dispatch_c_isr() will (1) switch stacks to the new
* thread's and (2) provide the address of the register state save * thread's and (2) provide the address of the register state save
* area in a12. NOTE that the state save area may or may not lie * area in a2. NOTE that the state save area may or may not lie
* in the new thread's stack. * in the new thread's stack.
*/ */
@@ -460,7 +456,6 @@ _xtensa_level5_handler:
/* Restore registers in preparation to return from interrupt */ /* Restore registers in preparation to return from interrupt */
mov a2, a12 /* a2 = address of new state save area */
call0 _xtensa_context_restore /* (preserves a2) */ call0 _xtensa_context_restore /* (preserves a2) */
/* Restore only level-specific regs (the rest were already restored) */ /* Restore only level-specific regs (the rest were already restored) */
@@ -507,7 +502,7 @@ _xtensa_level6_handler:
/* Decode and dispatch the interrupt. In the event of an interrupt /* Decode and dispatch the interrupt. In the event of an interrupt
* level context dispatch_c_isr() will (1) switch stacks to the new * level context dispatch_c_isr() will (1) switch stacks to the new
* thread's and (2) provide the address of the register state save * thread's and (2) provide the address of the register state save
* area in a12. NOTE that the state save area may or may not lie * area in a2. NOTE that the state save area may or may not lie
* in the new thread's stack. * in the new thread's stack.
*/ */
@@ -515,7 +510,6 @@ _xtensa_level6_handler:
/* Restore registers in preparation to return from interrupt */ /* Restore registers in preparation to return from interrupt */
mov a2, a12 /* a2 = address of new state save area */
call0 _xtensa_context_restore /* (preserves a2) */ call0 _xtensa_context_restore /* (preserves a2) */
/* Restore only level-specific regs (the rest were already restored) */ /* Restore only level-specific regs (the rest were already restored) */
arch/xtensa/src/common/xtensa_user_handler.S
+2 -1
View File
@@ -191,9 +191,10 @@ _xtensa_user_handler:
mov ARG2, a12 /* Argument 2 = pointer to register save area */ mov ARG2, a12 /* Argument 2 = pointer to register save area */
CALL xtensa_user /* Call xtensa_user */ CALL xtensa_user /* Call xtensa_user */
mov a2, RETVAL /* a2 = address of new state save area */
/* Restore registers in preparation to return from interrupt */ /* Restore registers in preparation to return from interrupt */
mov a2, a12 /* a2 = address of new state save area */
call0 _xtensa_context_restore /* (Preserves a2) */ call0 _xtensa_context_restore /* (Preserves a2) */
/* Restore only level-specific regs (the rest were already restored) */ /* Restore only level-specific regs (the rest were already restored) */