j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Exception handlers: remove unused NMIHandlerAddress

Browse source
This commit is contained in:
Angus Gratton 2015-09-14 17:22:50 +10:00
parent 0432ae3745
commit 9c15b757d3
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/exception_vectors.S
View file

@ -76,15 +76,10 @@ DoubleExceptionVector:
.section .bss .section .bss
NMIHandlerStack: /* stack space for NMI handler */ NMIHandlerStack: /* stack space for NMI handler */
.skip 4*0x100 .skip 4*0x100
.LNMIHandlerStackTop:
NMIRegisterSaved: /* register space for saving NMI registers */ NMIRegisterSaved: /* register space for saving NMI registers */
.skip 4*(0x16 + 6) .skip 4*(0x16 + 6)
/* this symbol is _Pri_3_HandlerAddress in the RTOS SDK, appears totally
unused (stays zero at all times) */
.global NMIHandlerAddress
NMIHandlerAddress:
.long 0
/* Save register relative to a0 */ /* Save register relative to a0 */
.macro SAVE_REG register, regnum .macro SAVE_REG register, regnum
s32i \register, a0, (0x20 + 4 * \regnum) s32i \register, a0, (0x20 + 4 * \regnum)
@ -112,11 +107,9 @@ call_user_start:
CallNMIExceptionHandler: CallNMIExceptionHandler:
movi a0, NMIRegisterSaved movi a0, NMIRegisterSaved
SAVE_REG a2, 2 SAVE_REG a2, 2
movi a2, NMIHandlerAddress
l32i a2, a2, 0
SAVE_REG sp, 1 SAVE_REG sp, 1
SAVE_REG a3, 3 SAVE_REG a3, 3
xsr.excsave3 a2 /* excsave3 is now NMIHandlerAddress, a2 is former a0 */ rsr.excsave3 a2 /* a2 is now former a0 */
SAVE_REG a4, 4 SAVE_REG a4, 4
SAVE_REG a2, 0 SAVE_REG a2, 0
rsr.epc1 a3 rsr.epc1 a3
@ -138,7 +131,7 @@ CallNMIExceptionHandler:
SAVE_REG a13, 13 SAVE_REG a13, 13
SAVE_REG a14, 14 SAVE_REG a14, 14
SAVE_REG a15, 15 SAVE_REG a15, 15
movi sp, NMIRegisterSaved /* also top of NMIHandlerStack */ movi sp, .LNMIHandlerStackTop
movi a0, 0 movi a0, 0
movi a2, 0x23 /* argument for handler */ movi a2, 0x23 /* argument for handler */
wsr.ps a2 wsr.ps a2