From patchwork Fri Jun 9 05:37:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9777251 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 B791C60318 for ; Fri, 9 Jun 2017 05:48:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAAE62856C for ; Fri, 9 Jun 2017 05:48:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F972285CD; Fri, 9 Jun 2017 05:48:04 +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 3C7F72856C for ; Fri, 9 Jun 2017 05:48:04 +0000 (UTC) Received: from localhost ([::1]:52778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJCmB-0006fC-9J for patchwork-qemu-devel@patchwork.kernel.org; Fri, 09 Jun 2017 01:48:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJCc3-0006GU-Gw for qemu-devel@nongnu.org; Fri, 09 Jun 2017 01:37:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJCc0-0001eW-Ln for qemu-devel@nongnu.org; Fri, 09 Jun 2017 01:37:35 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34729) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJCc0-0001eP-HL for qemu-devel@nongnu.org; Fri, 09 Jun 2017 01:37:32 -0400 Received: by mail-qt0-x243.google.com with SMTP id o21so13030893qtb.1 for ; Thu, 08 Jun 2017 22:37:32 -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=CZuOQA8z7S/McZqGqhuzohMvsuyDE6ISLie/MXe2Pzg=; b=E34kaEzxUFVGtdSXijEJH4p71NY0O7Vu6KYG3v0DdoeaqYtYqPvsFtyRtOscHCa0WD NyhGUrWPg3zgsVqIFZCHSqMGjqR/FpjxGHUJY8JJzmW4yBuRaMVzlcRF0Wtw9Rf6EoRh bGKkoI15CGpNucp3BL+hv+2MRCPV7uv13NBDNQ7v5/xV10wp2zgTbF2w05yPsePoh+j3 1P+DKs4bHmvsN3X+jh5QdQg7cpXW27gTgortXfTLTjPbNED2n/5pEyDSE81bXFSX3kCZ FyCVJ4mi41/Yfmda1YX67PM9jRu4RZbRwOGhXYRjtM+uq/9EuSFr+69pCtGZfM6Bq4Bw Z6hQ== 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=CZuOQA8z7S/McZqGqhuzohMvsuyDE6ISLie/MXe2Pzg=; b=FkzBTwBt4eCZfJSXEHY1S5gah5RXE/RPgsmj6PkRFk5UOJC39sby7XOgVtcie2XkDu 21baR6aGKPcvPhHG3q3Zz4zKWs6SGmv+AGZkUDSUJhPECXT870ZH6BLxn1Smk0aD0vS0 xJTJZ9FpJ4jQsUZtmtSXT5ydQ84vPJs4Z7UMj3cLExIacSrzf4MZt3+851UZ68MMNR1G XDzBg6HFnZ+qXfrILvuCh/FoOLMZbTC9l7DTPfmOlzv7kBjk/H4CdDY4OALr5jc5+c7f Tg3S/dV/cwPtdxr82mRJu8Faxr6MxlPvMyCy3T06IlKovGRZ3l7CQR5v3AJ1ufIgYwSM wigQ== X-Gm-Message-State: AKS2vOxBWfpDpeKuv9BNiLWOESIEU0MN4w/kWl7QJjy98XqpdwK/3Taw EmAoI7iPbfk26T9boH8= X-Received: by 10.200.57.60 with SMTP id s57mr6350841qtb.141.1496986651869; Thu, 08 Jun 2017 22:37:31 -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 q41sm61161qtc.8.2017.06.08.22.37.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jun 2017 22:37:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 8 Jun 2017 22:37:19 -0700 Message-Id: <20170609053719.26251-8-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170609053719.26251-1-rth@twiddle.net> References: <20170609053719.26251-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] [PATCH v5 7/7] tcg/arm: Use ldr (literal) for goto_tb 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: cota@braap.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 goto_tb destination directly from the TB. Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index 18708b1..b640fb9 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -1669,14 +1669,27 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, } break; case INDEX_op_goto_tb: - tcg_debug_assert(s->tb_jmp_insn_offset == 0); { /* Indirect jump method */ - intptr_t ptr = (intptr_t)(s->tb_jmp_target_addr + args[0]); - tcg_out_movi32(s, COND_AL, TCG_REG_R0, ptr & ~0xfff); - tcg_out_ld32_12(s, COND_AL, TCG_REG_PC, TCG_REG_R0, ptr & 0xfff); + intptr_t ptr, dif, dil; + TCGReg base = TCG_REG_PC; + + tcg_debug_assert(s->tb_jmp_insn_offset == 0); + ptr = (intptr_t)(s->tb_jmp_target_addr + args[0]); + dif = ptr - ((intptr_t)s->code_ptr + 8); + dil = sextract32(dif, 0, 12); + if (dif != dil) { + /* The TB is close, but outside the 12 bits addressable by + the load. We can extend this to 20 bits with a sub of a + shifted immediate from pc. In the vastly unlikely event + the code requires more than 1MB, we'll use 2 insns and + be no worse off. */ + base = TCG_REG_R0; + tcg_out_movi32(s, COND_AL, base, ptr - dil); + } + tcg_out_ld32_12(s, COND_AL, TCG_REG_PC, base, dil); + s->tb_jmp_reset_offset[args[0]] = tcg_current_code_size(s); } - s->tb_jmp_reset_offset[args[0]] = tcg_current_code_size(s); break; case INDEX_op_goto_ptr: tcg_out_bx(s, COND_AL, args[0]);