OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/sparc: Pass DisasCompare to advance_jump_cond

Browse Source 
Fold the condition into the branch or movcond when possible.

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>
This commit is contained in:
Richard Henderson 2023-10-04 13:38:18 -07:00
parent 6b3e4cc685
commit 9d4e2bc761
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
target/sparc/translate.c
View File

@ -2899,14 +2899,15 @@ static bool advance_jump_uncond_always(DisasContext *dc, bool annul,
return true;
}
static bool advance_jump_cond(DisasContext *dc, bool annul, target_ulong dest)
static bool advance_jump_cond(DisasContext *dc, DisasCompare *cmp,
bool annul, target_ulong dest)
{
target_ulong npc = dc->npc;
if (annul) {
TCGLabel *l1 = gen_new_label();
tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_cond, 0, l1);
tcg_gen_brcond_tl(tcg_invert_cond(cmp->cond), cmp->c1, cmp->c2, l1);
gen_goto_tb(dc, 0, npc, dest);
gen_set_label(l1);
gen_goto_tb(dc, 1, npc + 4, npc + 8);
@ -2919,8 +2920,8 @@ static bool advance_jump_cond(DisasContext *dc, bool annul, target_ulong dest)
case DYNAMIC_PC_LOOKUP:
tcg_gen_mov_tl(cpu_pc, cpu_npc);
tcg_gen_addi_tl(cpu_npc, cpu_npc, 4);
tcg_gen_movcond_tl(TCG_COND_NE, cpu_npc,
cpu_cond, tcg_constant_tl(0),
tcg_gen_movcond_tl(cmp->cond, cpu_npc,
cmp->c1, cmp->c2,
tcg_constant_tl(dest), cpu_npc);
dc->pc = npc;
break;
@ -2932,6 +2933,11 @@ static bool advance_jump_cond(DisasContext *dc, bool annul, target_ulong dest)
dc->jump_pc[0] = dest;
dc->jump_pc[1] = npc + 4;
dc->npc = JUMP_PC;
if (cmp->is_bool) {
tcg_gen_mov_tl(cpu_cond, cmp->c1);
} else {
tcg_gen_setcond_tl(cmp->cond, cpu_cond, cmp->c1, cmp->c2);
}
}
}
return true;
@ -2951,12 +2957,7 @@ static bool do_bpcc(DisasContext *dc, arg_bcc *a)
flush_cond(dc);
gen_compare(&cmp, a->cc, a->cond, dc);
if (cmp.is_bool) {
tcg_gen_mov_tl(cpu_cond, cmp.c1);
} else {
tcg_gen_setcond_tl(cmp.cond, cpu_cond, cmp.c1, cmp.c2);
}
return advance_jump_cond(dc, a->a, target);
return advance_jump_cond(dc, &cmp, a->a, target);
}
}
@ -2980,12 +2981,7 @@ static bool do_fbpfcc(DisasContext *dc, arg_bcc *a)
flush_cond(dc);
gen_fcompare(&cmp, a->cc, a->cond);
if (cmp.is_bool) {
tcg_gen_mov_tl(cpu_cond, cmp.c1);
} else {
tcg_gen_setcond_tl(cmp.cond, cpu_cond, cmp.c1, cmp.c2);
}
return advance_jump_cond(dc, a->a, target);
return advance_jump_cond(dc, &cmp, a->a, target);
}
}
@ -3006,8 +3002,7 @@ static bool trans_BPr(DisasContext *dc, arg_BPr *a)
flush_cond(dc);
gen_compare_reg(&cmp, a->cond, gen_load_gpr(dc, a->rs1));
tcg_gen_setcond_tl(cmp.cond, cpu_cond, cmp.c1, cmp.c2);
return advance_jump_cond(dc, a->a, target);
return advance_jump_cond(dc, &cmp, a->a, target);
}
static bool trans_CALL(DisasContext *dc, arg_CALL *a)