From patchwork Fri Aug 4 05:44:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9880609 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 DA90F6031B for ; Fri, 4 Aug 2017 06:02:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFAA92898E for ; Fri, 4 Aug 2017 06:02:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2FD8289AA; Fri, 4 Aug 2017 06:02:27 +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 58D022898E for ; Fri, 4 Aug 2017 06:02:27 +0000 (UTC) Received: from localhost ([::1]:37146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVgo-0003Bb-9P for patchwork-qemu-devel@patchwork.kernel.org; Fri, 04 Aug 2017 02:02:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVPm-00047g-O0 for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddVPl-0003lj-Ii for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:50 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:34756) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddVPl-0003k2-DJ for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:49 -0400 Received: by mail-pf0-x242.google.com with SMTP id t86so870351pfe.1 for ; Thu, 03 Aug 2017 22:44:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Rd7IomQ0EbtfbSw4jt0TViOgH3Mjh2xbG5tbtxZaARg=; b=Ep2hcP5uysFbt3/hu4uGx6XiZ0SwCaPatBJGy6wY7ua55PWNQIfEKorRaTFprlwdgf KxZqndeyjFCJhauCDmPULb9CguXMrdQgk4nBfMat428AR2+v2/fDnTL9ad9IoPYwKZvl ZYQ8LGRDtUhr8NLEwOv5ZTllI2M1f7EtHr0ED3XmMHbSsEly7XdgnTd3gJZQgLrNgKb/ iDtDga5jyWs5pfPR5YV52V8evD72to8HBbisNFPM5vT/03leUd/ZkzYjj5pULZPOoIKl MYd9+BaEf9AnYxf0o80vINRxbnYkwJ+cJjIGl31wds0yTJHU/AbTLW1swqUUUVJg6+mm CXMQ== 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:subject:date:message-id :in-reply-to:references; bh=Rd7IomQ0EbtfbSw4jt0TViOgH3Mjh2xbG5tbtxZaARg=; b=dr4frKlU55TPW8mW2v1eIQBIXmioHmWXaw5jmSr6+RZZ7wRXN2hPw6idwEEG6579xK zXSAeebzA+AN41oFgITHPQ6WBEMbybSC+BteXe2DftLrhN/XihgK6OcTencqDv6YM9ap DUi4ijwFL+J7g/cznwCghIWtt33j0CLDgaIUCovX+PetLFA0xAaEsTQWGovvypEik+oU NFHvV7trFDqdShhtI6SIokwRcSPUzS8T2eWoUpJ0gV9JtRBHLHd5L1ldniMZz6ksbPxH t4NP/C+CUYC5be+E1sLhdzEoKQACR4T9qI0ppssi8WKJNbGkuaDxGjpZUzPVBFCh/mZG O3/Q== X-Gm-Message-State: AHYfb5ghmM7I6HRSVuO/5gFuIUMLLQim4v66zK7qnlv24MZVGx/8y3wJ zP6iizhxzcyodPrPcT8= X-Received: by 10.84.238.140 with SMTP id v12mr878774plk.159.1501825488307; Thu, 03 Aug 2017 22:44:48 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net. [97.126.108.236]) by smtp.gmail.com with ESMTPSA id o14sm1061063pfi.158.2017.08.03.22.44.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 22:44:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 Aug 2017 22:44:23 -0700 Message-Id: <20170804054426.10590-21-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170804054426.10590-1-rth@twiddle.net> References: <20170804054426.10590-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH for-2.11 20/23] tcg/arm: Use constant pool for call 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index 2736022d5a..db46aea38c 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -1054,10 +1054,7 @@ static void tcg_out_goto(TCGContext *s, int cond, tcg_insn_unit *addr) tcg_out_b(s, cond, disp); return; } - - assert(use_armv5t_instructions || (addri & 1) == 0); - tcg_out_movi32(s, cond, TCG_REG_TMP, addri); - tcg_out_bx(s, cond, TCG_REG_TMP); + tcg_out_movi_pool(s, cond, TCG_REG_PC, addri); } /* The call case is mostly used for helpers - so it's not unreasonable @@ -1081,9 +1078,9 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *addr) tcg_out_movi32(s, COND_AL, TCG_REG_TMP, addri); tcg_out_blx(s, COND_AL, TCG_REG_TMP); } else { + /* ??? Know that movi_pool emits exactly 2 insns. */ tcg_out_dat_imm(s, COND_AL, ARITH_ADD, TCG_REG_R14, TCG_REG_PC, 4); - tcg_out_ld32_12(s, COND_AL, TCG_REG_PC, TCG_REG_PC, -4); - tcg_out32(s, addri); + tcg_out_movi_pool(s, COND_AL, TCG_REG_PC, addri); } }