From: Richard Henderson <richard.henderson@linaro.org>
Date: Mon, 24 Oct 2022 12:54:15 +0000 (+1000)
Subject: target/openrisc: Always exit after mtspr npc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5813c5c74a755fd0c1b10be38c6fdf5c54c468e4;p=qemu.git

target/openrisc: Always exit after mtspr npc

We have called cpu_restore_state asserting will_exit.
Do not go back on that promise.  This affects icount.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c
index 09b3c97d7c..a3508e421d 100644
--- a/target/openrisc/sys_helper.c
+++ b/target/openrisc/sys_helper.c
@@ -51,8 +51,8 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb)
         if (env->pc != rb) {
             env->pc = rb;
             env->dflag = 0;
-            cpu_loop_exit(cs);
         }
+        cpu_loop_exit(cs);
         break;
 
     case TO_SPR(0, 17): /* SR */