From: Richard Henderson Date: Tue, 18 Jul 2017 20:02:45 +0000 (-1000) Subject: target/sh4: Unify code for CHECK_FPU_ENABLED X-Git-Tag: v2.10.0-rc0~35^2~7 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dec4f042a16b830c4d4613561f5f29e6a3263c1f;p=users%2Fdwmw2%2Fqemu.git target/sh4: Unify code for CHECK_FPU_ENABLED We do not need to emit N copies of raising an exception. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson Message-Id: <20170718200255.31647-21-rth@twiddle.net> Signed-off-by: Aurelien Jarno --- diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 2476b948b9..b90719717e 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -374,16 +374,9 @@ static inline void gen_store_fpr64(DisasContext *ctx, TCGv_i64 t, int reg) goto do_illegal; \ } -#define CHECK_FPU_ENABLED \ - if (ctx->tbflags & (1u << SR_FD)) { \ - gen_save_cpu_state(ctx, true); \ - if (ctx->envflags & DELAY_SLOT_MASK) { \ - gen_helper_raise_slot_fpu_disable(cpu_env); \ - } else { \ - gen_helper_raise_fpu_disable(cpu_env); \ - } \ - ctx->bstate = BS_EXCP; \ - return; \ +#define CHECK_FPU_ENABLED \ + if (ctx->tbflags & (1u << SR_FD)) { \ + goto do_fpu_disabled; \ } static void _decode_opc(DisasContext * ctx) @@ -1796,6 +1789,17 @@ static void _decode_opc(DisasContext * ctx) gen_helper_raise_illegal_instruction(cpu_env); } ctx->bstate = BS_EXCP; + return; + + do_fpu_disabled: + gen_save_cpu_state(ctx, true); + if (ctx->envflags & DELAY_SLOT_MASK) { + gen_helper_raise_slot_fpu_disable(cpu_env); + } else { + gen_helper_raise_fpu_disable(cpu_env); + } + ctx->bstate = BS_EXCP; + return; } static void decode_opc(DisasContext * ctx)