[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/21] tcg-ppc: fix qemu_ld/qemu_st for AIX ABI
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 02/21] tcg-ppc: fix qemu_ld/qemu_st for AIX ABI |
Date: |
Wed, 25 Sep 2013 09:27:19 -0700 |
From: Paolo Bonzini <address@hidden>
For the AIX ABI, the function pointer and small area pointer need
to be loaded in the trampoline. The trampoline instead is called
with a normal BL instruction.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/ppc/tcg-target.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c
index 2595556..204ffbe 100644
--- a/tcg/ppc/tcg-target.c
+++ b/tcg/ppc/tcg-target.c
@@ -490,7 +490,8 @@ static void tcg_out_b (TCGContext *s, int mask,
tcg_target_long target)
}
}
-static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg)
+static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg,
+ int lk)
{
#ifdef _CALL_AIX
int reg;
@@ -504,14 +505,14 @@ static void tcg_out_call (TCGContext *s, tcg_target_long
arg, int const_arg)
tcg_out32 (s, LWZ | RT (0) | RA (reg));
tcg_out32 (s, MTSPR | RA (0) | CTR);
tcg_out32 (s, LWZ | RT (2) | RA (reg) | 4);
- tcg_out32 (s, BCCTR | BO_ALWAYS | LK);
+ tcg_out32 (s, BCCTR | BO_ALWAYS | lk);
#else
if (const_arg) {
- tcg_out_b (s, LK, arg);
+ tcg_out_b (s, lk, arg);
}
else {
tcg_out32 (s, MTSPR | RS (arg) | LR);
- tcg_out32 (s, BCLR | BO_ALWAYS | LK);
+ tcg_out32 (s, BCLR | BO_ALWAYS | lk);
}
#endif
}
@@ -860,7 +861,7 @@ static void tcg_out_qemu_ld_slow_path (TCGContext *s,
TCGLabelQemuLdst *label)
tcg_out_mov (s, TCG_TYPE_I32, ir++, addr_reg);
#endif
tcg_out_movi (s, TCG_TYPE_I32, ir, mem_index);
- tcg_out_call (s, (tcg_target_long) ld_trampolines[s_bits], 1);
+ tcg_out_b (s, LK, (tcg_target_long) ld_trampolines[s_bits]);
tcg_out32 (s, (tcg_target_long) raddr);
switch (opc) {
case 0|4:
@@ -954,7 +955,7 @@ static void tcg_out_qemu_st_slow_path (TCGContext *s,
TCGLabelQemuLdst *label)
ir++;
tcg_out_movi (s, TCG_TYPE_I32, ir, mem_index);
- tcg_out_call (s, (tcg_target_long) st_trampolines[opc], 1);
+ tcg_out_b (s, LK, (tcg_target_long) st_trampolines[opc]);
tcg_out32 (s, (tcg_target_long) raddr);
tcg_out_b (s, 0, (tcg_target_long) raddr);
}
@@ -984,7 +985,7 @@ static void emit_ldst_trampoline (TCGContext *s, const void
*ptr)
tcg_out32 (s, ADDI | RT (3) | RA (3) | 4);
tcg_out32 (s, MTSPR | RS (3) | LR);
tcg_out_mov (s, TCG_TYPE_I32, 3, TCG_AREG0);
- tcg_out_b (s, 0, (tcg_target_long) ptr);
+ tcg_out_call (s, (tcg_target_long) ptr, 1, 0);
}
#endif
@@ -1493,7 +1494,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
const TCGArg *args,
}
break;
case INDEX_op_call:
- tcg_out_call (s, args[0], const_args[0]);
+ tcg_out_call (s, args[0], const_args[0], LK);
break;
case INDEX_op_movi_i32:
tcg_out_movi(s, TCG_TYPE_I32, args[0], args[1]);
--
1.8.1.4
- [Qemu-devel] [PULL 00/21] TCG ppc and ppc64 updates, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 01/21] configure: Allow command-line configure for ppc32, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 03/21] tcg-ppc: use new return-argument ld/st helpers, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 04/21] tcg-ppc: Avoid code for nop move, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 05/21] tcg-ppc: Cleanup tcg_out_qemu_ld/st_slow_path, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 06/21] tcg-ppc: Use conditional branch and link to slow path, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 02/21] tcg-ppc: fix qemu_ld/qemu_st for AIX ABI,
Richard Henderson <=
- [Qemu-devel] [PULL 07/21] tcg-ppc: Fix and cleanup tcg_out_tlb_check, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 08/21] tcg-ppc64: Reformat tcg-target.c, Richard Henderson, 2013/09/25
- [Qemu-devel] [PULL 09/21] tcg-ppc64: More use of TAI and SAI helper macros, Richard Henderson, 2013/09/25
- [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