diff options
| author | Richard Henderson <rth@twiddle.net> | 2015-08-31 12:44:16 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2015-10-07 20:36:48 +1100 |
| commit | bfa31b765798139804ce9e5e35c7e142d233df31 (patch) | |
| tree | 8bfcb735062c84fdf833e3cf38405336228f0cc8 /target-sparc | |
| parent | bd03c791a6ed1bb7aec17df15cfeea649362e8fd (diff) | |
| download | qemu-bfa31b765798139804ce9e5e35c7e142d233df31.zip qemu-bfa31b765798139804ce9e5e35c7e142d233df31.tar.gz qemu-bfa31b765798139804ce9e5e35c7e142d233df31.tar.bz2 | |
target-sparc: Tidy gen_branch_a interface
We always pass pc2 == dc->npc and r_cond == cpu_cond,
and always set is_br afterward. Infer all of that.
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target-sparc')
| -rw-r--r-- | target-sparc/translate.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/target-sparc/translate.c b/target-sparc/translate.c index f359ac9..cbc90d8 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -955,17 +955,19 @@ static inline void gen_branch2(DisasContext *dc, target_ulong pc1, gen_goto_tb(dc, 1, pc2, pc2 + 4); } -static inline void gen_branch_a(DisasContext *dc, target_ulong pc1, - target_ulong pc2, TCGv r_cond) +static void gen_branch_a(DisasContext *dc, target_ulong pc1) { TCGLabel *l1 = gen_new_label(); + target_ulong npc = dc->npc; - tcg_gen_brcondi_tl(TCG_COND_EQ, r_cond, 0, l1); + tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_cond, 0, l1); - gen_goto_tb(dc, 0, pc2, pc1); + gen_goto_tb(dc, 0, npc, pc1); gen_set_label(l1); - gen_goto_tb(dc, 1, pc2 + 4, pc2 + 8); + gen_goto_tb(dc, 1, npc + 4, npc + 8); + + dc->is_br = 1; } static inline void gen_generic_branch(DisasContext *dc) @@ -1398,8 +1400,7 @@ static void do_branch(DisasContext *dc, int32_t offset, uint32_t insn, int cc) flush_cond(dc); gen_cond(cpu_cond, cc, cond, dc); if (a) { - gen_branch_a(dc, target, dc->npc, cpu_cond); - dc->is_br = 1; + gen_branch_a(dc, target); } else { dc->pc = dc->npc; dc->jump_pc[0] = target; @@ -1447,8 +1448,7 @@ static void do_fbranch(DisasContext *dc, int32_t offset, uint32_t insn, int cc) flush_cond(dc); gen_fcond(cpu_cond, cc, cond); if (a) { - gen_branch_a(dc, target, dc->npc, cpu_cond); - dc->is_br = 1; + gen_branch_a(dc, target); } else { dc->pc = dc->npc; dc->jump_pc[0] = target; @@ -1476,8 +1476,7 @@ static void do_branch_reg(DisasContext *dc, int32_t offset, uint32_t insn, flush_cond(dc); gen_cond_reg(cpu_cond, cond, r_reg); if (a) { - gen_branch_a(dc, target, dc->npc, cpu_cond); - dc->is_br = 1; + gen_branch_a(dc, target); } else { dc->pc = dc->npc; dc->jump_pc[0] = target; |