From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSkI8-0007cU-7C for qemu-devel@nongnu.org; Wed, 26 Mar 2014 05:38:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSkI3-0007CO-BU for qemu-devel@nongnu.org; Wed, 26 Mar 2014 05:38:36 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:13290) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSkI3-0007CD-46 for qemu-devel@nongnu.org; Wed, 26 Mar 2014 05:38:31 -0400 Message-ID: <5332A003.2010305@huawei.com> Date: Wed, 26 Mar 2014 10:38:11 +0100 From: Claudio Fontana MIME-Version: 1.0 References: <1394851732-25692-1-git-send-email-rth@twiddle.net> <1394851732-25692-18-git-send-email-rth@twiddle.net> In-Reply-To: <1394851732-25692-18-git-send-email-rth@twiddle.net> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 17/26] tcg-aarch64: Use ADR to pass the return address to the ld/st helpers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, claudio.fontana@gmail.com On 15.03.2014 03:48, Richard Henderson wrote: > Signed-off-by: Richard Henderson > --- > tcg/aarch64/tcg-target.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c > index 3b8aa7d..26dc1ab 100644 > --- a/tcg/aarch64/tcg-target.c > +++ b/tcg/aarch64/tcg-target.c > @@ -1061,6 +1061,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; > @@ -1071,7 +1078,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); > @@ -1092,7 +1099,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); > } > Reviewed-by: Claudio Fontana