From patchwork Wed Apr 16 16:17:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 339649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 00982140093 for ; Thu, 17 Apr 2014 02:28:34 +1000 (EST) Received: from localhost ([::1]:55556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WaShL-0000DQ-SU for incoming@patchwork.ozlabs.org; Wed, 16 Apr 2014 12:28:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WaSYN-0002x6-3y for qemu-devel@nongnu.org; Wed, 16 Apr 2014 12:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WaSYI-0005HK-5s for qemu-devel@nongnu.org; Wed, 16 Apr 2014 12:19:15 -0400 Received: from mail-qg0-x236.google.com ([2607:f8b0:400d:c04::236]:48491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WaSYI-0005HG-2S for qemu-devel@nongnu.org; Wed, 16 Apr 2014 12:19:10 -0400 Received: by mail-qg0-f54.google.com with SMTP id z60so2289645qgd.27 for ; Wed, 16 Apr 2014 09:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=YVBbB4g+MI6djubcfzM/X9po69gfE0pm761Ynex2WL8=; b=PUvfp++mT0odzOhhH4JTVJzqJzb07HRUe+bvcT0dvoE2bEEkRNfSd2zSs/XzqCYcya BfAznZwBgwSzSvPqh/dep8/9tk40zY2EKTCrgpIDBMB/ZxsGtGo1hmn1+ovJBOwH+y3F w5GuAsg/swEC1w5WVd9LhBtcA88m6Q0MvgW+s8ixJA/4Z+sOz0M77+PffaKO9b7K2Roa lYNM/q2LwhTI5Snbr8CekxRbW9C2wTr9A/8+guhWYp6iLT1rIe0GEG4btbTy7lCi7qpS Lk5HTHrlBQgtuCuQBecngYk9CIjv6sYpkzwSMY1IqKIKNBFpfe0lgoJ+xWfD23AdPSHy Mf7A== X-Received: by 10.224.166.210 with SMTP id n18mr6271806qay.6.1397665149818; Wed, 16 Apr 2014 09:19:09 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id s13sm44249775qag.19.2014.04.16.09.19.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Apr 2014 09:19:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 16 Apr 2014 09:17:59 -0700 Message-Id: <1397665088-14039-17-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1397665088-14039-1-git-send-email-rth@twiddle.net> References: <1397665088-14039-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::236 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL for-2.1 16/25] tcg-aarch64: Use ADR to pass the return address to the ld/st helpers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reviewed-by: Claudio Fontana 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 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); }