yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 13:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg/aarch64: Fold away noaddr branch routines

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

Backports commit 733589b3382afcb0ae9f43e72e083a5ddd38abd5 from qemu
This commit is contained in:
Richard Henderson 2018-12-18 05:15:39 -05:00 committed by Lioncash
parent cbe1065e83
commit 0a8bc142d3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
qemu/tcg/aarch64/tcg-target.inc.c
View file

@ -1129,23 +1129,6 @@ static inline void tcg_out_goto_long(TCGContext *s, tcg_insn_unit *target)
} }
} }
static inline void tcg_out_goto_noaddr(TCGContext *s)
{
/* We pay attention here to not modify the branch target by reading from
the buffer. This ensure that caches and memory are kept coherent during
retranslation. Mask away possible garbage in the high bits for the
first translation, while keeping the offset bits for retranslation. */
uint32_t old = tcg_in32(s);
tcg_out_insn(s, 3206, B, old);
}
static inline void tcg_out_goto_cond_noaddr(TCGContext *s, TCGCond c)
{
/* See comments in tcg_out_goto_noaddr. */
uint32_t old = tcg_in32(s) >> 5;
tcg_out_insn(s, 3202, B_C, c, old);
}
static inline void tcg_out_callr(TCGContext *s, TCGReg reg) static inline void tcg_out_callr(TCGContext *s, TCGReg reg)
{ {
tcg_out_insn(s, 3207, BLR, reg); tcg_out_insn(s, 3207, BLR, reg);
@ -1192,7 +1175,7 @@ static inline void tcg_out_goto_label(TCGContext *s, TCGLabel *l)
{ {
if (!l->has_value) { if (!l->has_value) {
tcg_out_reloc(s, s->code_ptr, R_AARCH64_JUMP26, l, 0); tcg_out_reloc(s, s->code_ptr, R_AARCH64_JUMP26, l, 0);
tcg_out_goto_noaddr(s); tcg_out_insn(s, 3206, B, 0);
} else { } else {
tcg_out_goto(s, l->u.value_ptr); tcg_out_goto(s, l->u.value_ptr);
} }
@ -1523,7 +1506,7 @@ static void tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, TCGMemOp opc,
/* If not equal, we jump to the slow path. */ /* If not equal, we jump to the slow path. */
*label_ptr = s->code_ptr; *label_ptr = s->code_ptr;
tcg_out_goto_cond_noaddr(s, TCG_COND_NE); tcg_out_insn(s, 3202, B_C, TCG_COND_NE, 0);
} }
#endif /* CONFIG_SOFTMMU */ #endif /* CONFIG_SOFTMMU */