diff options
author | Andrew Waterman <andrew@sifive.com> | 2019-07-17 17:08:17 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-17 17:08:17 -0700 |
commit | 0694b85892b49a80eedbe5ac0b558f5a463058a5 (patch) | |
tree | 337da391ee1cfce345a34f7df0d16decb521bad6 | |
parent | d5909ee6f6c41ac0c539b687fb6e849401b0aecc (diff) | |
parent | 31878c5e2f7a989977ef3f64da48e14387bbe0a2 (diff) | |
download | pk-0694b85892b49a80eedbe5ac0b558f5a463058a5.zip pk-0694b85892b49a80eedbe5ac0b558f5a463058a5.tar.gz pk-0694b85892b49a80eedbe5ac0b558f5a463058a5.tar.bz2 |
Merge pull request #168 from riscv/fix-code-above-4g
Fix bbl/pk living above 4 GiB
-rw-r--r-- | machine/emulation.c | 86 | ||||
-rw-r--r-- | machine/fp_emulation.c | 68 | ||||
-rw-r--r-- | machine/mentry.S | 38 |
3 files changed, 96 insertions, 96 deletions
diff --git a/machine/emulation.c b/machine/emulation.c index 132e977..c077a53 100644 --- a/machine/emulation.c +++ b/machine/emulation.c @@ -72,62 +72,62 @@ void illegal_insn_trap(uintptr_t* regs, uintptr_t mcause, uintptr_t mepc) { asm (".pushsection .rodata\n" "illegal_insn_trap_table:\n" - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #if !defined(__riscv_flen) && defined(PK_ENABLE_FP_EMULATION) - " .word emulate_float_load\n" + " .word emulate_float_load - illegal_insn_trap_table\n" #else - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #endif - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #if !defined(__riscv_flen) && defined(PK_ENABLE_FP_EMULATION) - " .word emulate_float_store\n" + " .word emulate_float_store - illegal_insn_trap_table\n" #else - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #endif - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #if !defined(__riscv_muldiv) - " .word emulate_mul_div\n" + " .word emulate_mul_div - illegal_insn_trap_table\n" #else - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #endif - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #if !defined(__riscv_muldiv) && __riscv_xlen >= 64 - " .word emulate_mul_div32\n" + " .word emulate_mul_div32 - illegal_insn_trap_table\n" #else - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #endif - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #ifdef PK_ENABLE_FP_EMULATION - " .word emulate_fmadd\n" - " .word emulate_fmadd\n" - " .word emulate_fmadd\n" - " .word emulate_fmadd\n" - " .word emulate_fp\n" + " .word emulate_fmadd - illegal_insn_trap_table\n" + " .word emulate_fmadd - illegal_insn_trap_table\n" + " .word emulate_fmadd - illegal_insn_trap_table\n" + " .word emulate_fmadd - illegal_insn_trap_table\n" + " .word emulate_fp - illegal_insn_trap_table\n" #else - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" #endif - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word emulate_system_opcode\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word emulate_system_opcode - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" + " .word truly_illegal_insn - illegal_insn_trap_table\n" " .popsection"); uintptr_t mstatus = read_csr(mstatus); @@ -143,8 +143,8 @@ void illegal_insn_trap(uintptr_t* regs, uintptr_t mcause, uintptr_t mepc) write_csr(mepc, mepc + 4); extern uint32_t illegal_insn_trap_table[]; - uint32_t* pf = (void*)illegal_insn_trap_table + (insn & 0x7c); - emulation_func f = (emulation_func)(uintptr_t)*pf; + int32_t* pf = (void*)illegal_insn_trap_table + (insn & 0x7c); + emulation_func f = (emulation_func)((void*)illegal_insn_trap_table + *pf); f(regs, mcause, mepc, mstatus, insn); } diff --git a/machine/fp_emulation.c b/machine/fp_emulation.c index 8c40f61..c16aff9 100644 --- a/machine/fp_emulation.c +++ b/machine/fp_emulation.c @@ -10,38 +10,38 @@ DECLARE_EMULATION_FUNC(emulate_fp) { asm (".pushsection .rodata\n" "fp_emulation_table:\n" - " .word emulate_fadd\n" - " .word emulate_fsub\n" - " .word emulate_fmul\n" - " .word emulate_fdiv\n" - " .word emulate_fsgnj\n" - " .word emulate_fmin\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word emulate_fcvt_ff\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word emulate_fsqrt\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word emulate_fcmp\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word truly_illegal_insn\n" - " .word emulate_fcvt_if\n" - " .word truly_illegal_insn\n" - " .word emulate_fcvt_fi\n" - " .word truly_illegal_insn\n" - " .word emulate_fmv_if\n" - " .word truly_illegal_insn\n" - " .word emulate_fmv_fi\n" - " .word truly_illegal_insn\n" + " .word emulate_fadd - fp_emulation_table\n" + " .word emulate_fsub - fp_emulation_table\n" + " .word emulate_fmul - fp_emulation_table\n" + " .word emulate_fdiv - fp_emulation_table\n" + " .word emulate_fsgnj - fp_emulation_table\n" + " .word emulate_fmin - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word emulate_fcvt_ff - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word emulate_fsqrt - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word emulate_fcmp - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word emulate_fcvt_if - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word emulate_fcvt_fi - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word emulate_fmv_if - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" + " .word emulate_fmv_fi - fp_emulation_table\n" + " .word truly_illegal_insn - fp_emulation_table\n" " .popsection"); // if FPU is disabled, punt back to the OS @@ -49,8 +49,8 @@ DECLARE_EMULATION_FUNC(emulate_fp) return truly_illegal_insn(regs, mcause, mepc, mstatus, insn); extern uint32_t fp_emulation_table[]; - uint32_t* pf = (void*)fp_emulation_table + ((insn >> 25) & 0x7c); - emulation_func f = (emulation_func)(uintptr_t)*pf; + int32_t* pf = (void*)fp_emulation_table + ((insn >> 25) & 0x7c); + emulation_func f = (emulation_func)((void*)fp_emulation_table + *pf); SETUP_STATIC_ROUNDING(insn); return f(regs, mcause, mepc, mstatus, insn); diff --git a/machine/mentry.S b/machine/mentry.S index 99e1b72..84bd3c1 100644 --- a/machine/mentry.S +++ b/machine/mentry.S @@ -8,27 +8,27 @@ .align 6 trap_table: #define BAD_TRAP_VECTOR 0 - .word bad_trap - .word pmp_trap - .word illegal_insn_trap - .word bad_trap - .word misaligned_load_trap - .word pmp_trap - .word misaligned_store_trap - .word pmp_trap - .word bad_trap - .word mcall_trap - .word bad_trap + .dc.a bad_trap + .dc.a pmp_trap + .dc.a illegal_insn_trap + .dc.a bad_trap + .dc.a misaligned_load_trap + .dc.a pmp_trap + .dc.a misaligned_store_trap + .dc.a pmp_trap + .dc.a bad_trap + .dc.a mcall_trap + .dc.a bad_trap #ifdef BBL_BOOT_MACHINE - .word mcall_trap + .dc.a mcall_trap #else - .word bad_trap + .dc.a bad_trap #endif /* BBL_BOOT_MACHINE */ - .word bad_trap + .dc.a bad_trap #define TRAP_FROM_MACHINE_MODE_VECTOR 13 - .word __trap_from_machine_mode - .word bad_trap - .word bad_trap + .dc.a __trap_from_machine_mode + .dc.a bad_trap + .dc.a bad_trap .option norvc .section .text.init,"ax",@progbits @@ -112,11 +112,11 @@ trap_vector: STORE t0, 5*REGBYTES(sp) 1:auipc t0, %pcrel_hi(trap_table) # t0 <- %hi(trap_table) STORE t1, 6*REGBYTES(sp) - sll t1, a1, 2 # t1 <- mcause << 2 + sll t1, a1, LOG_REGBYTES # t1 <- mcause * ptr size STORE t2, 7*REGBYTES(sp) add t1, t0, t1 # t1 <- %hi(trap_table)[mcause] STORE s0, 8*REGBYTES(sp) - LWU t1, %pcrel_lo(1b)(t1) # t1 <- trap_table[mcause] + LOAD t1, %pcrel_lo(1b)(t1) # t1 <- trap_table[mcause] STORE s1, 9*REGBYTES(sp) mv a0, sp # a0 <- regs STORE a2,12*REGBYTES(sp) |