diff options
| author | Richard Henderson | 2017-07-18 22:02:28 +0200 |
|---|---|---|
| committer | Aurelien Jarno | 2017-07-18 23:39:15 +0200 |
| commit | e1933d1435d1d0ace7c93bdc429f7e4f0c499e92 (patch) | |
| tree | 8bdbe20001a8c5fa389d8ad35f83642087b782e9 /target | |
| parent | target/sh4: Consolidate end-of-TB tests (diff) | |
| download | qemu-e1933d1435d1d0ace7c93bdc429f7e4f0c499e92.tar.gz qemu-e1933d1435d1d0ace7c93bdc429f7e4f0c499e92.tar.xz qemu-e1933d1435d1d0ace7c93bdc429f7e4f0c499e92.zip | |
target/sh4: Introduce TB_FLAG_ENVFLAGS_MASK
We'll be putting more things into this bitmask soon.
Let's have a name that covers all possible uses.
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-4-rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'target')
| -rw-r--r-- | target/sh4/cpu.h | 4 | ||||
| -rw-r--r-- | target/sh4/translate.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index ffb91687b8..4aa92d5f30 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -96,6 +96,8 @@ #define DELAY_SLOT_CONDITIONAL (1 << 1) #define DELAY_SLOT_RTE (1 << 2) +#define TB_FLAG_ENVFLAGS_MASK DELAY_SLOT_MASK + typedef struct tlb_t { uint32_t vpn; /* virtual page number */ uint32_t ppn; /* physical page number */ @@ -388,7 +390,7 @@ static inline void cpu_get_tb_cpu_state(CPUSH4State *env, target_ulong *pc, { *pc = env->pc; *cs_base = 0; - *flags = (env->flags & DELAY_SLOT_MASK) /* Bits 0- 2 */ + *flags = (env->flags & TB_FLAG_ENVFLAGS_MASK) /* 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 */ diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 310c52ad2a..d6aa053715 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -220,7 +220,7 @@ static inline void gen_save_cpu_state(DisasContext *ctx, bool save_pc) if (ctx->delayed_pc != (uint32_t) -1) { tcg_gen_movi_i32(cpu_delayed_pc, ctx->delayed_pc); } - if ((ctx->tbflags & DELAY_SLOT_MASK) != ctx->envflags) { + if ((ctx->tbflags & TB_FLAG_ENVFLAGS_MASK) != ctx->envflags) { tcg_gen_movi_i32(cpu_flags, ctx->envflags); } } @@ -1819,7 +1819,7 @@ void gen_intermediate_code(CPUSH4State * env, struct TranslationBlock *tb) pc_start = tb->pc; ctx.pc = pc_start; ctx.tbflags = (uint32_t)tb->flags; - ctx.envflags = tb->flags & DELAY_SLOT_MASK; + ctx.envflags = tb->flags & TB_FLAG_ENVFLAGS_MASK; ctx.bstate = BS_NONE; ctx.memidx = (ctx.tbflags & (1u << SR_MD)) == 0 ? 1 : 0; /* We don't know if the delayed pc came from a dynamic or static branch, |