[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/21] tcg-ppc64: Add _noaddr functions for emitting
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 20/21] tcg-ppc64: Add _noaddr functions for emitting forward branches |
Date: |
Wed, 25 Sep 2013 09:27:37 -0700 |
... rather than open-coding this stuff through the file.
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/ppc64/tcg-target.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index 2076299..c225c8e 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -204,6 +204,18 @@ static void reloc_pc14(void *pc, tcg_target_long target)
*(uint32_t *)pc = (*(uint32_t *)pc & ~0xfffc) | reloc_pc14_val(pc, target);
}
+static inline void tcg_out_b_noaddr(TCGContext *s, int insn)
+{
+ unsigned retrans = *(uint32_t *)s->code_ptr & 0x3fffffc;
+ tcg_out32(s, insn | retrans);
+}
+
+static inline void tcg_out_bc_noaddr(TCGContext *s, int insn)
+{
+ unsigned retrans = *(uint32_t *)s->code_ptr & 0xfffc;
+ tcg_out32(s, insn | retrans);
+}
+
static void patch_reloc(uint8_t *code_ptr, int type,
intptr_t value, intptr_t addend)
{
@@ -1362,11 +1374,8 @@ static void tcg_out_bc(TCGContext *s, int bc, int
label_index)
if (l->has_value) {
tcg_out32(s, bc | reloc_pc14_val(s->code_ptr, l->u.value));
} else {
- uint16_t val = *(uint16_t *) &s->code_ptr[2];
-
- /* Thanks to Andrzej Zaborowski */
- tcg_out32(s, bc | (val & 0xfffc));
- tcg_out_reloc(s, s->code_ptr - 4, R_PPC_REL14, label_index, 0);
+ tcg_out_reloc(s, s->code_ptr, R_PPC_REL14, label_index, 0);
+ tcg_out_bc_noaddr(s, bc);
}
}
@@ -1466,11 +1475,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
const TCGArg *args,
if (l->has_value) {
tcg_out_b(s, 0, l->u.value);
} else {
- uint32_t val = *(uint32_t *) s->code_ptr;
-
- /* Thanks to Andrzej Zaborowski */
- tcg_out32(s, B | (val & 0x3fffffc));
- tcg_out_reloc(s, s->code_ptr - 4, R_PPC_REL24, args[0], 0);
+ tcg_out_reloc(s, s->code_ptr, R_PPC_REL24, args[0], 0);
+ tcg_out_b_noaddr(s, B);
}
}
break;
--
1.8.1.4
- [Qemu-devel] [PULL 11/21] tcg-ppc64: Use tcg_out64, (continued)
- [Qemu-devel] [PULL 11/21] tcg-ppc64: Use tcg_out64, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 10/21] tcg-ppc64: Use TCG_REG_Rn constants, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 12/21] tcg-ppc64: Avoid code for nop move, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 13/21] tcg-ppc64: Don't load the static chain from TCG, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 14/21] tcg-ppc64: Fold constant call address into descriptor load, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 15/21] tcg-ppc64: Look through a constant function descriptor, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 16/21] tcg-ppc64: Tidy register allocation order, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 17/21] tcg-ppc64: Handle long offsets better, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 18/21] tcg-ppc64: Implement tcg_register_jit, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 19/21] tcg-ppc64: Streamline tcg_out_tlb_read, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 20/21] tcg-ppc64: Add _noaddr functions for emitting forward branches,
Richard Henderson <=
- [Qemu-devel] [PULL 21/21] tcg-ppc64: Implement CONFIG_QEMU_LDST_OPTIMIZATION, Richard Henderson, 2013/09/25