[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/32] tcg/ppc: Fold away "noaddr" branch routines
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 07/32] tcg/ppc: Fold away "noaddr" branch routines |
Date: |
Thu, 13 Dec 2018 21:18:58 -0600 |
There is no longer a need for preserving branch offset operands,
as we no longer re-translate.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/ppc/tcg-target.inc.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c
index c2f729ee8f..2e2a22f579 100644
--- a/tcg/ppc/tcg-target.inc.c
+++ b/tcg/ppc/tcg-target.inc.c
@@ -210,18 +210,6 @@ static void reloc_pc14(tcg_insn_unit *pc, tcg_insn_unit
*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 */
static const char *target_parse_constraint(TCGArgConstraint *ct,
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)
{
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 {
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,
@@ -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. */
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;
#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. */
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;
#else /* !CONFIG_SOFTMMU */
@@ -2044,13 +2032,14 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
const TCGArg *args,
case INDEX_op_br:
{
TCGLabel *l = arg_label(args[0]);
+ uint32_t insn = B;
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 {
tcg_out_reloc(s, s->code_ptr, R_PPC_REL24, l, 0);
- tcg_out_b_noaddr(s, B);
}
+ tcg_out32(s, insn);
}
break;
case INDEX_op_ld8u_i32:
--
2.17.2
- [Qemu-devel] [PULL 00/32] tcg patch queue, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 02/32] tcg/i386: Move TCG_REG_CALL_STACK from define to enum, Richard Henderson, 2018/12/13
- [Qemu-devel] [PATCH] fixup! target/arm: Move id_aa64mmfr* to ARMISARegisters, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 01/32] tcg/i386: Always use %ebp for TCG_AREG0, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 03/32] tcg/aarch64: Remove reloc_pc26_atomic, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 05/32] tcg/arm: Remove reloc_pc24_atomic, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 04/32] tcg/aarch64: Fold away "noaddr" branch routines, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 06/32] tcg/arm: Fold away "noaddr" branch routines, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 07/32] tcg/ppc: Fold away "noaddr" branch routines,
Richard Henderson <=
- [Qemu-devel] [PULL 08/32] tcg/s390: Remove retranslation code, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 10/32] tcg/mips: Remove retranslation code, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 09/32] tcg/sparc: Remove retranslation code, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 12/32] tcg/i386: Return false on failure from patch_reloc, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 11/32] tcg: Return success from patch_reloc, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 14/32] tcg/arm: Return false on failure from patch_reloc, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 13/32] tcg/aarch64: Return false on failure from patch_reloc, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 15/32] tcg/ppc: Return false on failure from patch_reloc, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 17/32] tcg/i386: Propagate is64 to tcg_out_qemu_ld_direct, Richard Henderson, 2018/12/13
- [Qemu-devel] [PULL 16/32] tcg/s390x: Return false on failure from patch_reloc, Richard Henderson, 2018/12/13