From: Alistair Francis <alistair.francis@wdc.com>
Date: Tue, 21 Jan 2020 05:36:57 +0000 (-0800)
Subject: target/riscv: Correctly implement TSR trap
X-Git-Tag: v5.0.0-rc0~33^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed5abf46b3c414ef58e647145f19b3966700b206;p=thirdparty%2Fqemu.git

target/riscv: Correctly implement TSR trap

As reported in: https://bugs.launchpad.net/qemu/+bug/1851939 we weren't
correctly handling illegal instructions based on the value of MSTATUS_TSR
and the current privledge level.

This patch fixes the issue raised in the bug by raising an illegal
instruction if TSR is set and we are in S-Mode.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Jonathan Behrens <jonathan@fintelia.io
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---

diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c
index 8736f689c26..c6412f680c7 100644
--- a/target/riscv/op_helper.c
+++ b/target/riscv/op_helper.c
@@ -85,7 +85,7 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb)
     }
 
     if (env->priv_ver >= PRIV_VERSION_1_10_0 &&
-        get_field(env->mstatus, MSTATUS_TSR)) {
+        get_field(env->mstatus, MSTATUS_TSR) && !(env->priv >= PRV_M)) {
         riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC());
     }