gustavonihei commented on code in PR #6302:
URL: https://github.com/apache/incubator-nuttx/pull/6302#discussion_r878196367
##########
arch/xtensa/src/common/xtensa_coproc.S:
##########
@@ -123,86 +106,85 @@ _xtensa_coproc_savestate:
* ---------------------------------------------------| <- SP
*/
- addi a3, a3, (4 * XCPTCONTEXT_REGS)
+ addi \in, \in, (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 */
+ rsr a3, CPENABLE /* a3 = which
CPs are enabled */
+ beqz a3, Ldone1 /* Quick exit
if none */
movi a13, _xtensa_coproc_saoffsets /* Array of CP
save offsets */
#if XCHAL_CP0_SA_SIZE > 0
- bbci.l a2, 0, 2f /* CP 0 not
enabled */
+ bbci.l a3, 0, 2f /* CP 0 not
enabled */
l32i a14, a13, 0 /* a14 =
_xtensa_coproc_saoffsets[0] */
- add a3, a14, a3 /* a3 = save
area for CP 0 */
- xchal_cp0_store a3, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
+ add \in, a14, \in /* \in = save
area for CP 0 */
+ xchal_cp0_store \in, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
2:
#endif
#if XCHAL_CP1_SA_SIZE > 0
- bbci.l a2, 1, 2f /* CP 1 not
enabled */
+ bbci.l a3, 1, 2f /* CP 1 not
enabled */
l32i a14, a13, 4 /* a14 =
_xtensa_coproc_saoffsets[1] */
- add a3, a14, a3 /* a3 = save
area for CP 1 */
- xchal_cp1_store a3, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
+ add \in, a14, \in /* \in = save
area for CP 1 */
+ xchal_cp1_store \in, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
2:
#endif
#if XCHAL_CP2_SA_SIZE > 0
- bbci.l a2, 2, 2f
+ bbci.l a3, 2, 2f
l32i a14, a13, 8
- add a3, a14, a3
- xchal_cp2_store a3, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
+ add \in, a14, \in
+ xchal_cp2_store \in, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
2:
#endif
#if XCHAL_CP3_SA_SIZE > 0
- bbci.l a2, 3, 2f
+ bbci.l a3, 3, 2f
l32i a14, a13, 12
- add a3, a14, a3
- xchal_cp3_store a3, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
+ add \in, a14, \in
+ xchal_cp3_store \in, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
2:
#endif
#if XCHAL_CP4_SA_SIZE > 0
- bbci.l a2, 4, 2f
+ bbci.l a3, 4, 2f
l32i a14, a13, 16
- add a3, a14, a3
- xchal_cp4_store a3, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
+ add \in, a14, \in
+ xchal_cp4_store \in, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
2:
#endif
#if XCHAL_CP5_SA_SIZE > 0
- bbci.l a2, 5, 2f
+ bbci.l a3, 5, 2f
l32i a14, a13, 20
- add a3, a14, a3
- xchal_cp5_store a3, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
+ add \in, a14, \in
+ xchal_cp5_store \in, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
2:
#endif
#if XCHAL_CP6_SA_SIZE > 0
- bbci.l a2, 6, 2f
+ bbci.l a3, 6, 2f
l32i a14, a13, 24
- add a3, a14, a3
- xchal_cp6_store a3, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
+ add \in, a14, \in
+ xchal_cp6_store \in, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
2:
#endif
#if XCHAL_CP7_SA_SIZE > 0
- bbci.l a2, 7, 2f
+ bbci.l a3, 7, 2f
l32i a14, a13, 28
- add a3, a14, a3
- xchal_cp7_store a3, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
+ add \in, a14, \in
+ xchal_cp7_store \in, a4, a5, a6, a7 continue=0 ofs=-1
select=XTHAL_SAS_TIE|XTHAL_SAS_NOCC|XTHAL_SAS_CALE alloc=XTHAL_SAS_ALL
2:
#endif
-.Ldone1:
- ret
+Ldone1:
- .size _xtensa_coproc_savestate, . - _xtensa_coproc_savestate
+.endm
/****************************************************************************
- * Name: _xtensa_coproc_restorestate
+ * Marco: xtensa_coproc_restorestate
Review Comment:
```suggestion
* Macro: xtensa_coproc_restorestate
```
nit: Small typo
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
