yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-11 06:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg/ppc: Fold away noaddr branch routines

Browse source 
There is no longer a need for preserving branch offset operands,
as we no longer re-translate.

Backports commit f9c7246faa279237200a2a53beacaa8100ea1900 from qemu
This commit is contained in:
Richard Henderson 2018-12-18 05:18:57 -05:00 committed by Lioncash
parent b49a353adb
commit 85485dc20e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
qemu/tcg/ppc/tcg-target.inc.c
View file

@ -210,18 +210,6 @@ static void reloc_pc14(tcg_insn_unit *pc, tcg_insn_unit *target)
*pc = (*pc & ~0xfffc) | reloc_pc14_val(pc, target); *pc = (*pc & ~0xfffc) | reloc_pc14_val(pc, target);
} }
static inline void tcg_out_b_noaddr(TCGContext *s, int insn)
{
unsigned retrans = *s->code_ptr & 0x3fffffc;
tcg_out32(s, insn | retrans);
}
static inline void tcg_out_bc_noaddr(TCGContext *s, int insn)
{
unsigned retrans = *s->code_ptr & 0xfffc;
tcg_out32(s, insn | retrans);
}
/* parse target specific constraints */ /* parse target specific constraints */
static const char *target_parse_constraint(TCGArgConstraint *ct, static const char *target_parse_constraint(TCGArgConstraint *ct,
const char *ct_str, TCGType type) const char *ct_str, TCGType type)
@ -1179,11 +1167,11 @@ static void tcg_out_setcond(TCGContext *s, TCGType type, TCGCond cond,
static void tcg_out_bc(TCGContext *s, int bc, TCGLabel *l) static void tcg_out_bc(TCGContext *s, int bc, TCGLabel *l)
{ {
if (l->has_value) { if (l->has_value) {
tcg_out32(s, bc | reloc_pc14_val(s->code_ptr, l->u.value_ptr)); bc |= reloc_pc14_val(s->code_ptr, l->u.value_ptr);
} else { } else {
tcg_out_reloc(s, s->code_ptr, R_PPC_REL14, l, 0); tcg_out_reloc(s, s->code_ptr, R_PPC_REL14, l, 0);
tcg_out_bc_noaddr(s, bc);
} }
tcg_out32(s, bc);
} }
static void tcg_out_brcond(TCGContext *s, TCGCond cond, static void tcg_out_brcond(TCGContext *s, TCGCond cond,
@ -1771,7 +1759,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64)
/* Load a pointer into the current opcode w/conditional branch-link. */ /* Load a pointer into the current opcode w/conditional branch-link. */
label_ptr = s->code_ptr; label_ptr = s->code_ptr;
tcg_out_bc_noaddr(s, BC | BI(7, CR_EQ) | BO_COND_FALSE | LK); tcg_out32(s, BC | BI(7, CR_EQ) | BO_COND_FALSE | LK);
rbase = TCG_REG_R3; rbase = TCG_REG_R3;
#else /* !CONFIG_SOFTMMU */ #else /* !CONFIG_SOFTMMU */
@ -1846,7 +1834,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64)
/* Load a pointer into the current opcode w/conditional branch-link. */ /* Load a pointer into the current opcode w/conditional branch-link. */
label_ptr = s->code_ptr; label_ptr = s->code_ptr;
tcg_out_bc_noaddr(s, BC | BI(7, CR_EQ) | BO_COND_FALSE | LK); tcg_out32(s, BC | BI(7, CR_EQ) | BO_COND_FALSE | LK);
rbase = TCG_REG_R3; rbase = TCG_REG_R3;
#else /* !CONFIG_SOFTMMU */ #else /* !CONFIG_SOFTMMU */
@ -2044,13 +2032,14 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
case INDEX_op_br: case INDEX_op_br:
{ {
TCGLabel *l = arg_label(args[0]); TCGLabel *l = arg_label(args[0]);
uint32_t insn = B;
if (l->has_value) { if (l->has_value) {
tcg_out_b(s, 0, l->u.value_ptr); insn |= reloc_pc24_val(s->code_ptr, l->u.value_ptr);
} else { } else {
tcg_out_reloc(s, s->code_ptr, R_PPC_REL24, l, 0); tcg_out_reloc(s, s->code_ptr, R_PPC_REL24, l, 0);
tcg_out_b_noaddr(s, B);
} }
tcg_out32(s, insn);
} }
break; break;
case INDEX_op_ld8u_i32: case INDEX_op_ld8u_i32: