From patchwork Wed Jun 14 05:23:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9785361 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5200560325 for ; Wed, 14 Jun 2017 05:28:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53BA72834A for ; Wed, 14 Jun 2017 05:28:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 473B728589; Wed, 14 Jun 2017 05:28:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CAD8D2834A for ; Wed, 14 Jun 2017 05:28:31 +0000 (UTC) Received: from localhost ([::1]:46464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL0r0-0006JP-Rq for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Jun 2017 01:28:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL0m3-0001oR-11 for qemu-devel@nongnu.org; Wed, 14 Jun 2017 01:23:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL0m2-0007LF-7t for qemu-devel@nongnu.org; Wed, 14 Jun 2017 01:23:23 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34132) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dL0m2-0007L3-3x for qemu-devel@nongnu.org; Wed, 14 Jun 2017 01:23:22 -0400 Received: by mail-qt0-x243.google.com with SMTP id o21so39043200qtb.1 for ; Tue, 13 Jun 2017 22:23:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=suOvBjYsdyzgDadyYZ3dijcg+kPPRJEFebrn14pDwhU=; b=k+vaFbfCtqU7Ipvg8X+Nco5iUbU0nfssjFiO15Fm/6AGfZHgtZNfqUi/QPBxbYvCNF VUW0JcgRNdF1u8ap0pLIyOg2C+qA5SL/t/Hq7LDWBct/ltTDyfgUlJ2mRWV1neJ+dBrx w7hT7bcPd9t/AP8wwrtwfRbew3v4pBKSs96SEyO5vf3PvBaLP7KDY6t9HetAuGXNSAmQ SoDkKXYyQmqZ2DlQVHqAx2DnVHimXtgfKAcfSayaP2sgdm8U4CzzcIYa2J78gSsSTWVm FJniCqbzcirdzMsTogd+w3EbQHXarARtYslHaL599s2I6RAZwN5cnLOywwb5QYVGJrAT 7bpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=suOvBjYsdyzgDadyYZ3dijcg+kPPRJEFebrn14pDwhU=; b=pLT1WRouoeHcD4d+TavgWwZqSl6gFtDNoF+FBhAgxPSNVZ6ksnuuBoczMzrgC3/tHH 6pG5DsNHVc+u21C2PHlMAA3sIqT5rU03Zs+RhjqfhlaWp4JAzNTdxVX4zkSAJJvNJ9Jn tH2l8oXjuw0vKIHx2IOGTAHsMT4/1WUb+QV6y969EdGz+rJ0pmu7v6/uglf9FzCGirgJ P6bJ3hFhYtc7VejMLFU/3n1byYs165anNpv8TXLMpVddfWO7l+jOpqu9HLXHP96rm/A2 +Nez6vCCLTKlHK+E5jrtKgb2F3oFuUnAx2hY1zMAvqAWpKbxoY8q4HWUE0M3eqVWGLtC yspg== X-Gm-Message-State: AKS2vOy+t5De3N4IsqWXforxtwzOSMkYRQ1BVFef730pOfbeNIjNfKeo qSepsM+5vN8HaI74h90= X-Received: by 10.200.8.169 with SMTP id v38mr4592888qth.213.1497417801391; Tue, 13 Jun 2017 22:23:21 -0700 (PDT) Received: from bigtime.twiddle.net.com (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id 34sm10959480qtp.17.2017.06.13.22.23.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jun 2017 22:23:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 13 Jun 2017 22:23:05 -0700 Message-Id: <20170614052311.13785-5-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170614052311.13785-1-rth@twiddle.net> References: <20170614052311.13785-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PULL 04/10] tcg/aarch64: Use ADR in tcg_out_movi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The new placement of the TB means that we can use one insn to load the return value for exit_tb returning the TB pointer. Tested-by: Emilio G. Cota Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.inc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index 5f18545..1fa3bcc 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -616,7 +616,12 @@ static void tcg_out_movi(TCGContext *s, TCGType type, TCGReg rd, /* Look for host pointer values within 4G of the PC. This happens often when loading pointers to QEMU's own data structures. */ if (type == TCG_TYPE_I64) { - tcg_target_long disp = (value >> 12) - ((intptr_t)s->code_ptr >> 12); + tcg_target_long disp = value - (intptr_t)s->code_ptr; + if (disp == sextract64(disp, 0, 21)) { + tcg_out_insn(s, 3406, ADR, rd, disp); + return; + } + disp = (value >> 12) - ((intptr_t)s->code_ptr >> 12); if (disp == sextract64(disp, 0, 21)) { tcg_out_insn(s, 3406, ADRP, rd, disp); if (value & 0xfff) {