From patchwork Thu Sep 7 22:40:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111995 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp770798ybm; Thu, 7 Sep 2017 16:00:21 -0700 (PDT) X-Received: by 10.55.121.194 with SMTP id u185mr1330806qkc.101.1504825221590; Thu, 07 Sep 2017 16:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504825221; cv=none; d=google.com; s=arc-20160816; b=AQ8IHYIKjZhW0eXjAaYsPjt+yNiGwICLatt0omdkjvS7lL3kAVPZcMVTrQCfE0Q7CL 1D+zNlS2GJO1iFvDmc13BCGj/Ni5+DMr0mDWlESXoiW00no1UexT3xG24OA2WtOlfc4+ EqIwCJ4tJZG+/IZV3797ek6A0CywvVCb4b65yJ+qfGFLMbGikw8r+z/t4gFCcyNGRqyH YLVzF6Wl10+FSL0Ng7sc8fmkE1dMFFYeOYRMD4jewqlTBsjJZ5iDS9bl2IEndBhK1lew 0FQ9K184n2AIeslTcxHX73Edopi4SpHYA3bbZELLClwWG0WkUp34Vl8Q27s4B+xxH0GB IksA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=/pPbNEjmX+uxRZu6MhUxcaRB0QEpWumd838yfUa4lXE=; b=T3sX6IYLRFWzTWBj6yxkMi9Au9w5DdBEFUTy/We52SMebbCg6yJB9DChkXthCQnTAI pHTU0TINM1KtMZeIF5xPzjGDJ/d1CGNOcEOLLIpjm9boMwe1rPyHvElcEvkteV6bte9n EdzuVQsqaunDt+6lCkIqSKnOwL/kwbdUCyOlct/PUAZ/73e9fnJWzXs1WtC9eP7xMWyF Lur0OCDFeBeYoSeNJalwXQ+Z5kMsUYYjNZAXbOp4eg4K8wbbhdFLon+k8JsaoGpFxNko iEIou/zV1mxrdJiT5GoVp1oiOjiv/DGS+XVsdp466ZRhWSi1L9rHfplbaemJsRLdKlfU o7lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bUH1aWUr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i4si511514qki.35.2017.09.07.16.00.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Sep 2017 16:00:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bUH1aWUr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dq5mV-0002GS-JK for patch@linaro.org; Thu, 07 Sep 2017 19:00:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dq5UG-0003Hb-Gz for qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dq5UB-0008ON-Um for qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:28 -0400 Received: from mail-pf0-x235.google.com ([2607:f8b0:400e:c00::235]:35370) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dq5UB-0008Ng-OX for qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:23 -0400 Received: by mail-pf0-x235.google.com with SMTP id g13so1630129pfm.2 for ; Thu, 07 Sep 2017 15:41:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/pPbNEjmX+uxRZu6MhUxcaRB0QEpWumd838yfUa4lXE=; b=bUH1aWUrjUIkCNtM4t410GExkDd+spICWAcqcZcdZAFt49/ysGYL8DA/gffyS+zNsa 8P46Yb2ZaLFsu2VnuWjeBVyVzZUQWbR+MhYevBFLIkhrZp2EErudBgXeyusVu0dkLMyt 6T+dqm6gL3jxHNJcxZFQTNzwXLMag/+qATGOo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/pPbNEjmX+uxRZu6MhUxcaRB0QEpWumd838yfUa4lXE=; b=lsvdMrSIeK1mNTpdSsB/XVLoJlM5Q/52ju/bn7k4kixshDdYDv8Tsqtu8YZ3ax3rQh 5CGBQwmiqw6shygUBIPVz2bQglUbacW1CdOj1sa9AWbpPw6RB40j+yaqucESrbeZ5LXu /xzAWDcQIOVwl0GFJ90emgWEJ/Y44An/8OpBn89PdNykOVzt1RhYra9BqOHtHirtkTjE CIXZnQSg71jwBevq8IdBEi1FanhXg59bkPs342SXyTW82AELMIuRg5paK7wRESQTcxi5 yUq8vPz7bKKK5yKKGnsABj5yetdIZ3ma2mSKUn5zydZzoEvMLgVKz1OXCXt35qRm3EdY 4rBg== X-Gm-Message-State: AHPjjUgfzgxHx2J58JAlygMdKPSoyZ3c80/KL5frLhLfEZ+WKJ/Kasu3 zYjRJxHTh7jSnQ2TVJ7s9Q== X-Google-Smtp-Source: ADKCNb7znRlPwqJ553KE28/8lfxQLoMYURYl8H8w8rhcV81Ny+PKMNY8+w1FY14P+N0HCK+VU8Bv1w== X-Received: by 10.84.233.67 with SMTP id k3mr1008124plt.416.1504824082509; Thu, 07 Sep 2017 15:41:22 -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 h19sm770678pfh.142.2017.09.07.15.41.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Sep 2017 15:41:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Sep 2017 15:40:48 -0700 Message-Id: <20170907224051.21518-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170907224051.21518-1-richard.henderson@linaro.org> References: <20170907224051.21518-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::235 Subject: [Qemu-devel] [PULL 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: , Cc: peter.maydell@linaro.org, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.13.5 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); } }