mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-sparc: Tidy gen_branch_a interface

Browse Source 
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>
This commit is contained in:
Richard Henderson 2015-08-31 12:44:16 -07:00
parent bd03c791a6
commit bfa31b7657
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target-sparc/translate.c
View File

@ -955,17 +955,19 @@ static inline void gen_branch2(DisasContext *dc, target_ulong pc1,
gen_goto_tb(dc, 1, pc2, pc2 + 4); gen_goto_tb(dc, 1, pc2, pc2 + 4);
} }
static inline void gen_branch_a(DisasContext *dc, target_ulong pc1, static void gen_branch_a(DisasContext *dc, target_ulong pc1)
target_ulong pc2, TCGv r_cond)
{ {
TCGLabel *l1 = gen_new_label(); 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_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) 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); flush_cond(dc);
gen_cond(cpu_cond, cc, cond, dc); gen_cond(cpu_cond, cc, cond, dc);
if (a) { if (a) {
gen_branch_a(dc, target, dc->npc, cpu_cond); gen_branch_a(dc, target);
dc->is_br = 1;
} else { } else {
dc->pc = dc->npc; dc->pc = dc->npc;
dc->jump_pc[0] = target; 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); flush_cond(dc);
gen_fcond(cpu_cond, cc, cond); gen_fcond(cpu_cond, cc, cond);
if (a) { if (a) {
gen_branch_a(dc, target, dc->npc, cpu_cond); gen_branch_a(dc, target);
dc->is_br = 1;
} else { } else {
dc->pc = dc->npc; dc->pc = dc->npc;
dc->jump_pc[0] = target; 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); flush_cond(dc);
gen_cond_reg(cpu_cond, cond, r_reg); gen_cond_reg(cpu_cond, cond, r_reg);
if (a) { if (a) {
gen_branch_a(dc, target, dc->npc, cpu_cond); gen_branch_a(dc, target);
dc->is_br = 1;
} else { } else {
dc->pc = dc->npc; dc->pc = dc->npc;
dc->jump_pc[0] = target; dc->jump_pc[0] = target;