You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2022/05/24 05:12:04 UTC
[incubator-nuttx] branch master updated: xtensa: coproc: modify coproc_save/restore to macro
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 0e478e559f xtensa: coproc: modify coproc_save/restore to macro
0e478e559f is described below
commit 0e478e559f087eb34cbc7411a471d946742142c8
Author: zhuyanlin <zh...@xiaomi.com>
AuthorDate: Fri May 20 09:14:50 2022 +0800
xtensa: coproc: modify coproc_save/restore to macro
As coproc_save/restore only used in context_restore/save.
Use macro instead of function.
Some register use optimize.
Unify with arm/riscv.
Signed-off-by: zhuyanlin <zh...@xiaomi.com>
---
arch/xtensa/src/common/xtensa_context.S | 14 ++-----
arch/xtensa/src/common/xtensa_coproc.S | 68 +++++++++------------------------
2 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/arch/xtensa/src/common/xtensa_context.S b/arch/xtensa/src/common/xtensa_context.S
index 7e74408907..99b4bd7cfb 100644
--- a/arch/xtensa/src/common/xtensa_context.S
+++ b/arch/xtensa/src/common/xtensa_context.S
@@ -68,6 +68,7 @@
#include "syscall.h"
#include "xtensa_asm_utils.h"
+#include "xtensa_coproc.S"
/****************************************************************************
* Public Functions
@@ -201,12 +202,7 @@ _xtensa_context_save:
#endif
#if XCHAL_CP_NUM > 0
- s32i a0, sp, (4 * REG_TMP0) /* Save return address */
-
- mov a2, sp
- call0 _xtensa_coproc_savestate
-
- l32i a0, sp, (4 * REG_TMP0) /* Restore return address */
+ xtensa_coproc_savestate
#endif
ret
@@ -249,11 +245,7 @@ _xtensa_context_save:
_xtensa_context_restore:
#if XCHAL_CP_NUM > 0
- s32i a0, a2, (4 * REG_TMP0) /* Save return address */
-
- call0 _xtensa_coproc_restorestate
-
- l32i a0, a2, (4 * REG_TMP0) /* Restore return address */
+ xtensa_coproc_restorestate
#endif
#if XCHAL_HAVE_LOOPS != 0
diff --git a/arch/xtensa/src/common/xtensa_coproc.S b/arch/xtensa/src/common/xtensa_coproc.S
index cd475146f0..74cf1e152d 100644
--- a/arch/xtensa/src/common/xtensa_coproc.S
+++ b/arch/xtensa/src/common/xtensa_coproc.S
@@ -48,8 +48,6 @@
#include <arch/chip/tie.h>
#include <arch/chip/tie-asm.h>
-#if XCHAL_CP_NUM > 0
-
/****************************************************************************
* Public Data
****************************************************************************/
@@ -70,13 +68,11 @@ _xtensa_coproc_saoffsets:
.size _xtensa_coproc_saoffsets, . - _xtensa_coproc_saoffsets
/****************************************************************************
- * Public Functions
+ * Pre-processor Definitions
****************************************************************************/
- .text
-
/****************************************************************************
- * Name: _xtensa_coproc_savestate
+ * Macro: xtensa_coproc_savestate
*
* Description:
* If there is a current thread and it has a coprocessor state save area,
@@ -89,31 +85,17 @@ _xtensa_coproc_saoffsets:
* around the assembly language call to _xtensa_coproc_savestate.
*
* Entry Conditions:
- * - A2 holds the address of current interrupt stack pointer.
* - Registers have been saved/spilled already.
*
* Exit conditions:
* - All necessary CP callee-saved state has been saved.
- * - Registers a2-a7, a13-a15 have been trashed.
- *
- * Must be called from assembly code only, using CALL0.
+ * - Registers a2-a7, a13-a14 have been trashed.
*
****************************************************************************/
- .global _xtensa_coproc_savestate
- .type _xtensa_coproc_savestate, @function
-
- .align 4
- .literal_position
- .align 4
-
-_xtensa_coproc_savestate:
-
- /* Move the address of the thread state save area to R15 */
+ .macro xtensa_coproc_savestate
- mov a3, a2 /* A3 is now the address of the save area */
-
- /* The stack when interrupt happened (the register a2)
+ /* The stack when interrupt happened
* ----------------------------------------------------
* | Reserve area (0x20) |
* ----------------------------------------------------
@@ -123,12 +105,12 @@ _xtensa_coproc_savestate:
* ---------------------------------------------------| <- SP
*/
- addi a3, a3, (4 * XCPTCONTEXT_REGS)
+ addi a3, sp, (4 * XCPTCONTEXT_REGS)
/* CPENABLE should show which CPs are enabled. */
rsr a2, CPENABLE /* a2 = which CPs are enabled */
- beqz a2, .Ldone1 /* Quick exit if none */
+ beqz a2, Ldone1 /* Quick exit if none */
movi a13, _xtensa_coproc_saoffsets /* Array of CP save offsets */
@@ -196,13 +178,12 @@ _xtensa_coproc_savestate:
2:
#endif
-.Ldone1:
- ret
+Ldone1:
- .size _xtensa_coproc_savestate, . - _xtensa_coproc_savestate
+.endm
/****************************************************************************
- * Name: _xtensa_coproc_restorestate
+ * Macro: xtensa_coproc_restorestate
*
* Description:
* Restore any callee-saved coprocessor state for the incoming thread.
@@ -216,28 +197,14 @@ _xtensa_coproc_savestate:
* around the assembly language call to _xtensa_coproc_restorestate.
*
* Entry Conditions:
- * - A2 holds the address of the current interrupt stack pointer.
*
* Exit conditions:
* - All necessary CP callee-saved state has been restored.
- * - Registers a2-a7, a13-a15 have been trashed.
- *
- * Must be called from assembly code only, using CALL0.
+ * - Registers a3-a8, a13-a14 have been trashed.
*
****************************************************************************/
- .global _xtensa_coproc_restorestate
- .type _xtensa_coproc_restorestate, @function
-
- .align 4
- .literal_position
- .align 4
-
-_xtensa_coproc_restorestate:
-
- /* Move the address of the thread state save area to R15 */
-
- mov a3, a2 /* A3 is now the address of the save area */
+ .macro xtensa_coproc_restorestate
/* The stack when interrupt happened (the register A2)
* ----------------------------------------------------
@@ -249,10 +216,10 @@ _xtensa_coproc_restorestate:
* ---------------------------------------------------| <- SP
*/
- addi a3, a3, (4 * XCPTCONTEXT_REGS)
+ addi a3, a2, (4 * XCPTCONTEXT_REGS)
- rsr a8, CPENABLE /* Set CPENABLE correctly for this thread */
- beqz a8, .Ldone1 /* Quick exit if none */
+ rsr a8, CPENABLE /* a8 = which CPs are enabled */
+ beqz a8, Ldone2 /* Quick exit if none */
movi a13, _xtensa_coproc_saoffsets /* Array of CP save offsets */
@@ -322,8 +289,7 @@ _xtensa_coproc_restorestate:
/* Ensure wsr.CPENABLE has completed. */
rsync
- ret
- .size _xtensa_coproc_restorestate, . - _xtensa_coproc_restorestate
+Ldone2:
-#endif /* XCHAL_CP_NUM > 0 */
+.endm