Mirrors/opensbi
1
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-24 15:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

firmware: fw_base: Simplified setup trap handler

Browse Source 
The same detection was done twice when setting mtvec and trap_exit.
Merging can reduce code size.

Signed-off-by: Xiang W <wxjstz@126.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Xiang W
2024-03-04 20:15:49 +08:00
committed by Anup Patel
parent fdf5589f04
commit b27b7c6d88
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/fw_base.S
View File

@@ -456,23 +456,15 @@ _start_warm:
srli a5, a5, ('H' - 'A') srli a5, a5, ('H' - 'A')
andi a5, a5, 0x1 andi a5, a5, 0x1
beq a5, zero, _skip_trap_handler_rv32_hyp beq a5, zero, _skip_trap_handler_rv32_hyp
/* Override trap exit for H-extension */
csrr a5, CSR_MSCRATCH
lla a4, _trap_exit_rv32_hyp
REG_S a4, SBI_SCRATCH_TRAP_EXIT_OFFSET(a5)
lla a4, _trap_handler_rv32_hyp lla a4, _trap_handler_rv32_hyp
_skip_trap_handler_rv32_hyp: _skip_trap_handler_rv32_hyp:
#endif #endif
csrw CSR_MTVEC, a4 csrw CSR_MTVEC, a4
#if __riscv_xlen == 32
/* Override trap exit for H-extension */
csrr a5, CSR_MISA
srli a5, a5, ('H' - 'A')
andi a5, a5, 0x1
beq a5, zero, _skip_trap_exit_rv32_hyp
lla a4, _trap_exit_rv32_hyp
csrr a5, CSR_MSCRATCH
REG_S a4, SBI_SCRATCH_TRAP_EXIT_OFFSET(a5)
_skip_trap_exit_rv32_hyp:
#endif
/* Initialize SBI runtime */ /* Initialize SBI runtime */
csrr a0, CSR_MSCRATCH csrr a0, CSR_MSCRATCH
call sbi_init call sbi_init