[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 31/47] tcg/ppc: Use tcg_tbrel_diff
From: |
Richard Henderson |
Subject: |
[PULL 31/47] tcg/ppc: Use tcg_tbrel_diff |
Date: |
Thu, 7 Jan 2021 10:14:32 -1000 |
Use tcg_tbrel_diff when we need a displacement to a label,
and with a NULL argument when we need the normalizing addend.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/ppc/tcg-target.c.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index 0eb9c4ebe2..ed7a201578 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -837,7 +837,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type,
TCGReg ret,
}
/* Load addresses within the TB with one insn. */
- tb_diff = arg - (intptr_t)s->code_gen_ptr;
+ tb_diff = tcg_tbrel_diff(s, (void *)arg);
if (!in_prologue && USE_REG_TB && tb_diff == (int16_t)tb_diff) {
tcg_out32(s, ADDI | TAI(ret, TCG_REG_TB, tb_diff));
return;
@@ -890,7 +890,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type,
TCGReg ret,
/* Use the constant pool, if possible. */
if (!in_prologue && USE_REG_TB) {
new_pool_label(s, arg, R_PPC_ADDR16, s->code_ptr,
- -(intptr_t)s->code_gen_ptr);
+ tcg_tbrel_diff(s, NULL));
tcg_out32(s, LD | TAI(ret, TCG_REG_TB, 0));
return;
}
@@ -940,7 +940,7 @@ static void tcg_out_dupi_vec(TCGContext *s, TCGType type,
TCGReg ret,
*/
if (USE_REG_TB) {
rel = R_PPC_ADDR16;
- add = -(intptr_t)s->code_gen_ptr;
+ add = tcg_tbrel_diff(s, NULL);
} else {
rel = R_PPC_ADDR32;
add = 0;
--
2.25.1
- [PULL 20/47] tcg: Use Error with alloc_code_gen_buffer, (continued)
- [PULL 20/47] tcg: Use Error with alloc_code_gen_buffer, Richard Henderson, 2021/01/07
- [PULL 33/47] tcg/ppc: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 37/47] tcg/s390: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 38/47] tcg/riscv: Fix branch range checks, Richard Henderson, 2021/01/07
- [PULL 34/47] tcg/sparc: Use tcg_tbrel_diff, Richard Henderson, 2021/01/07
- [PULL 45/47] tcg: Remove TCG_TARGET_SUPPORT_MIRROR, Richard Henderson, 2021/01/07
- [PULL 26/47] tcg/aarch64: Use B not BL for tcg_out_goto_long, Richard Henderson, 2021/01/07
- [PULL 41/47] accel/tcg: Add mips support to alloc_code_gen_buffer_splitwx_memfd, Richard Henderson, 2021/01/07
- [PULL 30/47] tcg: Introduce tcg_tbrel_diff, Richard Henderson, 2021/01/07
- [PULL 28/47] disas: Push const down through host disassembly, Richard Henderson, 2021/01/07
- [PULL 31/47] tcg/ppc: Use tcg_tbrel_diff,
Richard Henderson <=
- [PULL 35/47] tcg/sparc: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 42/47] tcg/mips: Do not assert on relocation overflow, Richard Henderson, 2021/01/07
- [PULL 39/47] tcg/riscv: Remove branch-over-branch fallback, Richard Henderson, 2021/01/07
- [PULL 40/47] tcg/riscv: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 47/47] tcg: Constify TCGLabelQemuLdst.raddr, Richard Henderson, 2021/01/07
- [PULL 44/47] tcg/arm: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 43/47] tcg/mips: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 46/47] tcg: Constify tcg_code_gen_epilogue, Richard Henderson, 2021/01/07
- Re: [PULL 00/47] tcg patch queue, no-reply, 2021/01/07
- Re: [PULL 00/47] tcg patch queue, Peter Maydell, 2021/01/08