Skip to content

Commit 2075a1b

Browse files
peter-mitsiscarlescufi
authored andcommitted
arch: xtensa: Use rsr.lowercase over rsr.UPPERCASE
rsr.UPPERCASE can lead to compiler errors when UPPERCASE matches a macro defined in the special register header file. Signed-off-by: Peter Mitsis <[email protected]>
1 parent e721792 commit 2075a1b

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

arch/xtensa/include/xtensa_asm2_s.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,20 +160,20 @@
160160
* Does not populate or modify the PS/PC save locations.
161161
*/
162162
.macro ODD_REG_SAVE
163-
rsr.SAR a0
163+
rsr.sar a0
164164
s32i a0, a1, ___xtensa_irq_bsa_t_sar_OFFSET
165165
#if XCHAL_HAVE_LOOPS
166-
rsr.LBEG a0
166+
rsr.lbeg a0
167167
s32i a0, a1, ___xtensa_irq_bsa_t_lbeg_OFFSET
168-
rsr.LEND a0
168+
rsr.lend a0
169169
s32i a0, a1, ___xtensa_irq_bsa_t_lend_OFFSET
170-
rsr.LCOUNT a0
170+
rsr.lcount a0
171171
s32i a0, a1, ___xtensa_irq_bsa_t_lcount_OFFSET
172172
#endif
173173
rsr.exccause a0
174174
s32i a0, a1, ___xtensa_irq_bsa_t_exccause_OFFSET
175175
#if XCHAL_HAVE_S32C1I
176-
rsr.SCOMPARE1 a0
176+
rsr.scompare1 a0
177177
s32i a0, a1, ___xtensa_irq_bsa_t_scompare1_OFFSET
178178
#endif
179179
#if XCHAL_HAVE_THREADPTR && \
@@ -432,11 +432,11 @@ _xstack_returned_\@:
432432
* argument and expand two versions of this handler. An
433433
* optimization FIXME, I guess.
434434
*/
435-
rsr.PS a0
435+
rsr.ps a0
436436
movi a3, PS_INTLEVEL_MASK
437437
and a0, a0, a3
438438
bnez a0, _not_l1
439-
rsr.PS a0
439+
rsr.ps a0
440440
movi a3, PS_INTLEVEL(1)
441441
or a0, a0, a3
442442
wsr.PS a0
@@ -600,7 +600,7 @@ _Level\LVL\()Vector:
600600
* turned on the EXCM bit and set INTLEVEL.
601601
*/
602602
.if \LVL == 1
603-
rsr.PS a0
603+
rsr.ps a0
604604
#ifdef CONFIG_XTENSA_MMU
605605
/* TLB misses also come through level 1 interrupts.
606606
* We do not want to unconditionally unmask interrupts.
@@ -616,11 +616,11 @@ _Level\LVL\()Vector:
616616
and a0, a0, a2
617617
s32i a0, a1, ___xtensa_irq_bsa_t_ps_OFFSET
618618
.else
619-
rsr.EPS\LVL a0
619+
rsr.eps\LVL a0
620620
s32i a0, a1, ___xtensa_irq_bsa_t_ps_OFFSET
621621
.endif
622622

623-
rsr.EPC\LVL a0
623+
rsr.epc\LVL a0
624624
s32i a0, a1, ___xtensa_irq_bsa_t_pc_OFFSET
625625

626626
/* What's happening with this jump is that the L32R

0 commit comments

Comments
 (0)