diff options
| author | Ulrich Weigand <ulrich.weigand@de.ibm.com> | 2014-04-30 14:33:05 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2014-06-23 07:31:46 -0700 |
| commit | 77e58d0d601a2f56e17bd7530c697c55895c579d (patch) | |
| tree | 0cd7d7610fc6ff77eeaaf4383b51f9a29bb84352 /tcg/ppc64 | |
| parent | a2a98f807b0cb8c9688df449ec6a3a98f3b0b9e9 (diff) | |
| download | qemu-77e58d0d601a2f56e17bd7530c697c55895c579d.tar.gz qemu-77e58d0d601a2f56e17bd7530c697c55895c579d.tar.bz2 qemu-77e58d0d601a2f56e17bd7530c697c55895c579d.zip | |
tcg-ppc64: Adjust tcg_out_call for ELFv2
The new ELFv2 ABI, used by default on powerpc64le-linux hosts,
introduced some changes that are incompatible with code currently
generated by the ppc64 TGC target. In particular, we no longer
use function descriptors.
This patch adds support for the ELFv2 ABI in the ppc64 TGC
function call and function prologue sequences.
Tested-by: Tom Musta <tommusta@gmail.com>
Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'tcg/ppc64')
| -rw-r--r-- | tcg/ppc64/tcg-target.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index d3cc237b36..635ff987bb 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -1115,6 +1115,23 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *target) tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_R2, TCG_REG_R2, ofs + SZP); tcg_out32(s, BCCTR | BO_ALWAYS | LK); } +#elif defined(_CALL_ELF) && _CALL_ELF == 2 + intptr_t diff; + + /* In the ELFv2 ABI, we have to set up r12 to contain the destination + address, which the callee uses to compute its TOC address. */ + /* FIXME: when the branch is in range, we could avoid r12 load if we + knew that the destination uses the same TOC, and what its local + entry point offset is. */ + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R12, (intptr_t)target); + + diff = tcg_pcrel_diff(s, target); + if (in_range_b(diff)) { + tcg_out_b(s, LK, target); + } else { + tcg_out32(s, MTSPR | RS(TCG_REG_R12) | CTR); + tcg_out32(s, BCCTR | BO_ALWAYS | LK); + } #else tcg_out_b(s, LK, target); #endif |