sambuc/retrobsd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary EHBs in kernel startup code.

Browse Source
This commit is contained in:
Serge Vakulenko
2015-10-30 10:31:24 -07:00
parent ff8e4c81d0
commit 42fd2f99bd
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sys/pic32/startup.S
View File

@@ -91,7 +91,6 @@ _reset_vector_: .globl _reset_vector_
mfc0 $k0, $C0_STATUS mfc0 $k0, $C0_STATUS
ori $k0, $k0, ST_UM | ST_EXL | ST_IE # Set user mode and enable interrupts ori $k0, $k0, ST_UM | ST_EXL | ST_IE # Set user mode and enable interrupts
mtc0 $k0, $C0_STATUS # Put SR back mtc0 $k0, $C0_STATUS # Put SR back
ehb
eret # PC <= EPC; EXL <= 0 eret # PC <= EPC; EXL <= 0
nop # just to be safe nop # just to be safe
@@ -258,7 +257,6 @@ restore_regs:
# Return from exception # Return from exception
bnez $k1, debug_request # single-step request bnez $k1, debug_request # single-step request
ehb
eret # PC <= EPC; EXL <= 0 eret # PC <= EPC; EXL <= 0
debug_request: debug_request:
sdbbp # enter debug mode sdbbp # enter debug mode
@@ -285,9 +283,11 @@ _debug_vector_: .globl _debug_vector_
mfc0 $k0, $C0_STATUS mfc0 $k0, $C0_STATUS
xori $k0, ST_EXL # Clear EXL xori $k0, ST_EXL # Clear EXL
mtc0 $k0, $C0_STATUS mtc0 $k0, $C0_STATUS
ehb
deret # PC <= DEPC; DM <= 0 deret # PC <= DEPC; DM <= 0
# A single instruction of the user program
# is executed here, then jump to _debug_vector_
# with updated DEPC.
# Continue below.
single_step_done: single_step_done:
mtc0 $k0, $C0_EPC # EPC <= DEPC mtc0 $k0, $C0_EPC # EPC <= DEPC
@@ -303,7 +303,6 @@ single_step_done:
mfc0 $k1, $C0_STATUS mfc0 $k1, $C0_STATUS
ori $k1, ST_EXL # Set EXL ori $k1, ST_EXL # Set EXL
mtc0 $k1, $C0_STATUS mtc0 $k1, $C0_STATUS
ehb
deret # PC <= DEPC; DM <= 0 deret # PC <= DEPC; DM <= 0
#--------------------------------------- #---------------------------------------