From: Richard Henderson <richard.henderson@linaro.org>
Date: Mon, 16 Oct 2023 18:07:31 +0000 (-0700)
Subject: target/sparc: Merge gen_op_next_insn into only caller
X-Git-Tag: v8.2.0-rc0~34^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=444d8b300a7e8eb9b6f8bc52032155cd42df7844;p=thirdparty%2Fqemu.git

target/sparc: Merge gen_op_next_insn into only caller

Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/sparc/translate.c b/target/sparc/translate.c
index 1233911b695..0bbe4cff3be 100644
--- a/target/sparc/translate.c
+++ b/target/sparc/translate.c
@@ -1015,12 +1015,6 @@ static void gen_mov_pc_npc(DisasContext *dc)
     }
 }
 
-static void gen_op_next_insn(void)
-{
-    tcg_gen_mov_tl(cpu_pc, cpu_npc);
-    tcg_gen_addi_tl(cpu_npc, cpu_npc, 4);
-}
-
 static void gen_compare(DisasCompare *cmp, bool xcc, unsigned int cond,
                         DisasContext *dc)
 {
@@ -2346,7 +2340,8 @@ static bool advance_pc(DisasContext *dc)
         case DYNAMIC_PC:
         case DYNAMIC_PC_LOOKUP:
             dc->pc = dc->npc;
-            gen_op_next_insn();
+            tcg_gen_mov_tl(cpu_pc, cpu_npc);
+            tcg_gen_addi_tl(cpu_npc, cpu_npc, 4);
             break;
 
         case JUMP_PC: