Re: [Qemu-devel] [PATCH v2 20/27] target/sh4: Unify code for CHECK_FPU_ENABLED

[Philippe Mathieu-Daudé]

On 07/06/2017 11:21 PM, Richard Henderson wrote:

We do not need to emit N copies of raising an exception.

Signed-off-by: Richard Henderson <r...@twiddle.net>

Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>

---
  target/sh4/translate.c | 24 ++++++++++++++----------
  1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index dd14b43..a4370c6 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -386,16 +386,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)

@@ -1820,6 +1813,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)