diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-03-14 17:47:25 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-03-14 17:47:25 -0700 |
| commit | 35c6ac438af5086510fe120b575090cf8e9b917b (patch) | |
| tree | 98ca945ba56dafb329224f88d7376a3860cb5ce5 /benchmarks/common/crt.S | |
| parent | 79e7914a4f33997b110c4a9dfe844561d927b9c0 (diff) | |
| download | riscv-tests-35c6ac438af5086510fe120b575090cf8e9b917b.zip riscv-tests-35c6ac438af5086510fe120b575090cf8e9b917b.tar.gz riscv-tests-35c6ac438af5086510fe120b575090cf8e9b917b.tar.bz2 | |
Rework benchmarks to run in M-mode
This broadens their utility and lets them use the M-mode counters directly.
Diffstat (limited to 'benchmarks/common/crt.S')
| -rw-r--r-- | benchmarks/common/crt.S | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/benchmarks/common/crt.S b/benchmarks/common/crt.S index 29c1d4d..919461b 100644 --- a/benchmarks/common/crt.S +++ b/benchmarks/common/crt.S @@ -13,25 +13,17 @@ #endif .text - .align 6 -user_trap_entry: - j trap_entry - - .align 6 -supervisor_trap_entry: - j supervisor_trap_entry + .globl _start +_start: + j handle_reset - .align 6 -hypervisor_trap_entry: - j hypervisor_trap_entry +nmi_vector: + j nmi_vector - .align 6 -machine_trap_entry: +trap_vector: j trap_entry - .align 6 - .globl _start -_start: +handle_reset: li x1, 0 li x2, 0 li x3, 0 @@ -64,8 +56,6 @@ _start: li x30,0 li x31,0 - li t0, MSTATUS_MPP; csrc mstatus, t0 # run tests in user mode - li t0, MSTATUS_MPIE; csrs mstatus, t0 # enable interrupts in user mode li t0, MSTATUS_FS; csrs mstatus, t0 # enable FPU li t0, MSTATUS_XS; csrs mstatus, t0 # enable accelerator @@ -146,9 +136,7 @@ _start: sll sp, sp, STKSHIFT add sp, sp, tp - la t0, _init - csrw mepc, t0 - eret + j _init trap_entry: addi sp, sp, -272 @@ -191,6 +179,10 @@ trap_entry: jal handle_trap csrw mepc, a0 + # Remain in M-mode after eret + li t0, MSTATUS_MPP + csrs mstatus, t0 + LREG x1, 1*REGBYTES(sp) LREG x2, 2*REGBYTES(sp) LREG x3, 3*REGBYTES(sp) |