commit ca69176d52ca1b9c9c7a4229ca46cf858167c5e8
author Richard Henderson <rth@twiddle.net> Tue Jul 18 10:02:29 2017 -1000
committer Aurelien Jarno <aurelien@aurel32.net> Tue Jul 18 23:39:16 2017 +0200
tree b580557a997a82118fb4523c99afb6a68aa1cc45
parent e1933d1435d1d0ace7c93bdc429f7e4f0c499e92

target/sh4: Keep env->flags clean

If we mask off any out-of-band bits before we assign to the
variable, then we don't need to clean it up when reading.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Message-Id: <20170718200255.31647-5-rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

target/sh4/cpu.c

diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
index 9da7e1e..8536f6d 100644
--- a/target/sh4/cpu.c
+++ b/target/sh4/cpu.c
@@ -39,7 +39,7 @@
     SuperHCPU *cpu = SUPERH_CPU(cs);
 
     cpu->env.pc = tb->pc;
-    cpu->env.flags = tb->flags;
+    cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK;
 }
 
 static bool superh_cpu_has_work(CPUState *cs)

target/sh4/cpu.h

diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h
index 4aa92d5..a7a6811 100644
--- a/target/sh4/cpu.h
+++ b/target/sh4/cpu.h
@@ -390,7 +390,7 @@
 {
     *pc = env->pc;
     *cs_base = 0;
-    *flags = (env->flags & TB_FLAG_ENVFLAGS_MASK) /* Bits  0-2 */
+    *flags = env->flags                                        /* Bits  0-2 */
             | (env->fpscr & (FPSCR_FR | FPSCR_SZ | FPSCR_PR))  /* Bits 19-21 */
             | (env->sr & ((1u << SR_MD) | (1u << SR_RB)))      /* Bits 29-30 */
             | (env->sr & (1u << SR_FD))                        /* Bit 15 */