diff options
| author | dramforever <dramforever@live.com> | 2022-06-09 10:07:30 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2022-06-21 06:01:14 +0300 |
| commit | 187127fb89b99790793d4b2663286371b59021ae (patch) | |
| tree | a11df812442204a2873b7bb9016c0be9d59f6833 | |
| parent | 551c70c0405b98ae75698d1674c9e0e09fdc6e01 (diff) | |
| download | opensbi-187127fb89b99790793d4b2663286371b59021ae.tar.xz | |
lib: sbi: Fixup tinst for exceptions in sbi_misaligned_*()
If there is an exception while emulating a misaligned load/store, fixup
uptrap.tinst before redirecting. Otherwise, HS-mode software may receive
an htinst describing the lbu/sb instruction that faulted during
emulation[1].
[1]: https://github.com/riscv-software-src/opensbi/issues/258
Signed-off-by: dramforever <dramforever@live.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
| -rw-r--r-- | lib/sbi/sbi_misaligned_ldst.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/sbi/sbi_misaligned_ldst.c b/lib/sbi/sbi_misaligned_ldst.c index c879ce7..fd11798 100644 --- a/lib/sbi/sbi_misaligned_ldst.c +++ b/lib/sbi/sbi_misaligned_ldst.c @@ -22,6 +22,18 @@ union reg_data { u64 data_u64; }; +static ulong sbi_misaligned_tinst_fixup(ulong orig_tinst, ulong new_tinst, + ulong addr_offset) +{ + if (new_tinst == INSN_PSEUDO_VS_LOAD || + new_tinst == INSN_PSEUDO_VS_STORE) + return new_tinst; + else if (orig_tinst == 0) + return 0UL; + else + return orig_tinst | (addr_offset << SH_RS1); +} + int sbi_misaligned_load_handler(ulong addr, ulong tval2, ulong tinst, struct sbi_trap_regs *regs) { @@ -126,6 +138,8 @@ int sbi_misaligned_load_handler(ulong addr, ulong tval2, ulong tinst, &uptrap); if (uptrap.cause) { uptrap.epc = regs->mepc; + uptrap.tinst = sbi_misaligned_tinst_fixup( + tinst, uptrap.tinst, i); return sbi_trap_redirect(regs, &uptrap); } } @@ -238,6 +252,8 @@ int sbi_misaligned_store_handler(ulong addr, ulong tval2, ulong tinst, &uptrap); if (uptrap.cause) { uptrap.epc = regs->mepc; + uptrap.tinst = sbi_misaligned_tinst_fixup( + tinst, uptrap.tinst, i); return sbi_trap_redirect(regs, &uptrap); } } |