diff options
| author | Richard Henderson <rth@twiddle.net> | 2013-08-12 06:32:52 -1000 |
|---|---|---|
| committer | Richard Henderson <rth@redhat.com> | 2014-04-16 12:13:00 -0400 |
| commit | dc0c8aaf2cf4fe4668aba53ed2e3ecbd16206b73 (patch) | |
| tree | 2b51c0793858018d0316cba857604bb68cb4dc07 | |
| parent | ae7ab46aa891c12efee621dcd9cc753aa65f4a94 (diff) | |
| download | qemu-dc0c8aaf2cf4fe4668aba53ed2e3ecbd16206b73.zip qemu-dc0c8aaf2cf4fe4668aba53ed2e3ecbd16206b73.tar.gz qemu-dc0c8aaf2cf4fe4668aba53ed2e3ecbd16206b73.tar.bz2 | |
tcg-aarch64: Use ADR to pass the return address to the ld/st helpers
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | tcg/aarch64/tcg-target.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c index 4729d11..5d19e27 100644 --- a/tcg/aarch64/tcg-target.c +++ b/tcg/aarch64/tcg-target.c @@ -1070,6 +1070,13 @@ static const void * const qemu_st_helpers[4] = { helper_ret_stq_mmu, }; +static inline void tcg_out_adr(TCGContext *s, TCGReg rd, uintptr_t addr) +{ + addr -= (uintptr_t)s->code_ptr; + assert(addr == sextract64(addr, 0, 21)); + tcg_out_insn(s, 3406, ADR, rd, addr); +} + static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) { TCGMemOp opc = lb->opc; @@ -1080,7 +1087,7 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) tcg_out_movr(s, TCG_TYPE_I64, TCG_REG_X0, TCG_AREG0); tcg_out_movr(s, TARGET_LONG_BITS == 64, TCG_REG_X1, lb->addrlo_reg); tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_X2, lb->mem_index); - tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_X3, (intptr_t)lb->raddr); + tcg_out_adr(s, TCG_REG_X3, (intptr_t)lb->raddr); tcg_out_call(s, (intptr_t)qemu_ld_helpers[size]); if (opc & MO_SIGN) { tcg_out_sxt(s, TCG_TYPE_I64, size, lb->datalo_reg, TCG_REG_X0); @@ -1101,7 +1108,7 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) tcg_out_movr(s, TARGET_LONG_BITS == 64, TCG_REG_X1, lb->addrlo_reg); tcg_out_movr(s, size == MO_64, TCG_REG_X2, lb->datalo_reg); tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_X3, lb->mem_index); - tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_X4, (intptr_t)lb->raddr); + tcg_out_adr(s, TCG_REG_X4, (intptr_t)lb->raddr); tcg_out_call(s, (intptr_t)qemu_st_helpers[size]); tcg_out_goto(s, (intptr_t)lb->raddr); } |