From 847d65258bd74cf0ee1c8d46e28083f233ec3fdc Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@twiddle.net>
Date: Sun, 25 Feb 2018 04:55:12 -0500
Subject: [PATCH] target-sparc: Create gen_exception

This unifies quite a few duplicate code fragments.

Backports commit 4fbe00679000f9fd0c509c2d548d957b08ec6057 from qemu
---
 qemu/target-sparc/translate.c | 72 +++++++++--------------------------
 1 file changed, 19 insertions(+), 53 deletions(-)

diff --git a/qemu/target-sparc/translate.c b/qemu/target-sparc/translate.c
index 1f06d7a0..bf8ac005 100644
--- a/qemu/target-sparc/translate.c
+++ b/qemu/target-sparc/translate.c
@@ -1120,6 +1120,18 @@ static inline void save_state(DisasContext *dc)
     save_npc(dc);
 }
 
+static void gen_exception(DisasContext *dc, int which)
+{
+    TCGv_i32 t;
+    TCGContext *tcg_ctx = dc->uc->tcg_ctx;
+
+    save_state(dc);
+    t = tcg_const_i32(tcg_ctx, which);
+    gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, t);
+    tcg_temp_free_i32(tcg_ctx, t);
+    dc->is_br = 1;
+}
+
 static inline void gen_mov_pc_npc(DisasContext *dc)
 {
     TCGContext *tcg_ctx = dc->uc->tcg_ctx;
@@ -1731,30 +1743,20 @@ static inline void gen_op_fcmpeq(DisasContext *dc, int fccno)
 }
 #endif
 
-static inline void gen_op_fpexception_im(DisasContext *dc, int fsr_flags)
+static void gen_op_fpexception_im(DisasContext *dc, int fsr_flags)
 {
     TCGContext *tcg_ctx = dc->uc->tcg_ctx;
-    TCGv_i32 r_const;
 
     tcg_gen_andi_tl(tcg_ctx, tcg_ctx->cpu_fsr, tcg_ctx->cpu_fsr, FSR_FTT_NMASK);
     tcg_gen_ori_tl(tcg_ctx, tcg_ctx->cpu_fsr, tcg_ctx->cpu_fsr, fsr_flags);
-    r_const = tcg_const_i32(tcg_ctx, TT_FP_EXCP);
-    gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, r_const);
-    tcg_temp_free_i32(tcg_ctx, r_const);
+    gen_exception(dc, TT_FP_EXCP);
 }
 
 static int gen_trap_ifnofpu(DisasContext *dc)
 {
 #if !defined(CONFIG_USER_ONLY)
-    TCGContext *tcg_ctx = dc->uc->tcg_ctx;
     if (!dc->fpu_enabled) {
-        TCGv_i32 r_const;
-
-        save_state(dc);
-        r_const = tcg_const_i32(tcg_ctx, TT_NFPU_INSN);
-        gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, r_const);
-        tcg_temp_free_i32(tcg_ctx, r_const);
-        dc->is_br = 1;
+        gen_exception(dc, TT_NFPU_INSN);
         return 1;
     }
 #endif
@@ -5306,63 +5308,27 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn, bool hook_ins
  jmp_insn:
     goto egress;
  illegal_insn:
-    {
-        TCGv_i32 r_const;
-
-        save_state(dc);
-        r_const = tcg_const_i32(tcg_ctx, TT_ILL_INSN);
-        gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, r_const);
-        tcg_temp_free_i32(tcg_ctx, r_const);
-        dc->is_br = 1;
-    }
+    gen_exception(dc, TT_ILL_INSN);
     goto egress;
  unimp_flush:
-    {
-        TCGv_i32 r_const;
-
-        save_state(dc);
-        r_const = tcg_const_i32(tcg_ctx, TT_UNIMP_FLUSH);
-        gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, r_const);
-        tcg_temp_free_i32(tcg_ctx, r_const);
-        dc->is_br = 1;
-    }
+    gen_exception(dc, TT_UNIMP_FLUSH);
     goto egress;
 #if !defined(CONFIG_USER_ONLY)
  priv_insn:
-    {
-        TCGv_i32 r_const;
-
-        save_state(dc);
-        r_const = tcg_const_i32(tcg_ctx, TT_PRIV_INSN);
-        gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, r_const);
-        tcg_temp_free_i32(tcg_ctx, r_const);
-        dc->is_br = 1;
-    }
+    gen_exception(dc, TT_PRIV_INSN);
     goto egress;
 #endif
  nfpu_insn:
-    save_state(dc);
     gen_op_fpexception_im(dc, FSR_FTT_UNIMPFPOP);
-    dc->is_br = 1;
     goto egress;
 #if !defined(CONFIG_USER_ONLY) && !defined(TARGET_SPARC64)
  nfq_insn:
-    save_state(dc);
     gen_op_fpexception_im(dc, FSR_FTT_SEQ_ERROR);
-    dc->is_br = 1;
     goto egress;
 #endif
 #ifndef TARGET_SPARC64
  ncp_insn:
-    {
-        TCGv r_const;
-
-        save_state(dc);
-        r_const = tcg_const_i32(tcg_ctx, TT_NCP_INSN);
-        gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, r_const);
-        tcg_temp_free(tcg_ctx, r_const);
-        dc->is_br = 1;
-    }
+    gen_exception(dc, TT_NCP_INSN);
     goto egress;
 #endif
  egress: