| Message ID | 20170506111431.12548-4-aurelien@aurel32.net |
|---|---|
| State | New |
| Headers | show |
On 05/06/2017 08:14 AM, Aurelien Jarno wrote: > DELAY_SLOT_TRUE is used as a dynamic condition for the branch after the > delay slot instruction. It is not used in code generation, so there is > no need to including in the TB state. > > Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > target/sh4/cpu.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h > index 9445cc779f..da8d15f1b9 100644 > --- a/target/sh4/cpu.h > +++ b/target/sh4/cpu.h > @@ -382,8 +382,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 | DELAY_SLOT_CONDITIONAL > - | DELAY_SLOT_TRUE)) /* Bits 0- 2 */ > + *flags = (env->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) /* Bits 0-1 */ > | (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 */ >
On 05/06/2017 04:14 AM, Aurelien Jarno wrote: > DELAY_SLOT_TRUE is used as a dynamic condition for the branch after the > delay slot instruction. It is not used in code generation, so there is > no need to including in the TB state. > > Signed-off-by: Aurelien Jarno<aurelien@aurel32.net> > --- > target/sh4/cpu.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Reviewed-by: Richard Henderson <rth@twiddle.net> r~
diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 9445cc779f..da8d15f1b9 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -382,8 +382,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 | DELAY_SLOT_CONDITIONAL - | DELAY_SLOT_TRUE)) /* Bits 0- 2 */ + *flags = (env->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) /* Bits 0-1 */ | (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 */
DELAY_SLOT_TRUE is used as a dynamic condition for the branch after the delay slot instruction. It is not used in code generation, so there is no need to including in the TB state. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> --- target/sh4/cpu.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)