[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/10] tcg/ppc: Adjust exit_tb for change in prologue
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 01/10] tcg/ppc: Adjust exit_tb for change in prologue placement |
Date: |
Wed, 21 Oct 2015 11:42:50 -1000 |
Changing the prologue to the beginning of the code_gen_buffer
changes the direction of the "return" branch. Need to change
the logic to match.
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/ppc/tcg-target.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c
index 92ef719..fd7a3e0 100644
--- a/tcg/ppc/tcg-target.c
+++ b/tcg/ppc/tcg-target.c
@@ -1855,12 +1855,10 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
const TCGArg *args,
if (USE_REG_RA) {
ptrdiff_t disp = tcg_pcrel_diff(s, tb_ret_addr);
- /* If we can use a direct branch, otherwise use the value in RA.
- Note that the direct branch is always forward. If it's in
- range now, it'll still be in range after the movi. Don't
- bother about the 20 bytes where the test here fails but it
- would succeed below. */
- if (!in_range_b(disp)) {
+ /* Use a direct branch if we can, otherwise use the value in RA.
+ Note that the direct branch is always backward, thus we need
+ to account for the possibility of 5 insns from the movi. */
+ if (!in_range_b(disp - 20)) {
tcg_out32(s, MTSPR | RS(TCG_REG_RA) | CTR);
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R3, args[0]);
tcg_out32(s, BCCTR | BO_ALWAYS);
--
2.4.3
- [Qemu-devel] [PULL 00/10] collected tcg patches, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 01/10] tcg/ppc: Adjust exit_tb for change in prologue placement,
Richard Henderson <=
- [Qemu-devel] [PULL 02/10] tcg/ppc: Revise goto_tb implementation, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 03/10] tcg/ppc: Prefer mask over andi., Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 04/10] tcg-opc.h: Simplify insn_start def, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 05/10] disas/mips: Add R6 jr/jr.hb to disassembler, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 06/10] tcg/mips: Add use_mips32r6_instructions definition, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 07/10] tcg/mips: Support r6 JR encoding, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 09/10] tcg/mips: Support r6 SEL{NE, EQ}Z instead of MOVN/MOVZ, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 08/10] tcg/mips: Support r6 multiply/divide encodings, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 10/10] cpu-exec: Add "nochain" debug flag, Richard Henderson, 2015/10/21