From patchwork Fri Apr 22 10:04:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 564820 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp367850map; Fri, 22 Apr 2022 04:12:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtUvFp19PnvPU3gwHAc2Pm1LoEXi650dmINryN2FCXhd/LxFbCG5hLpIY12JW28GQ8ygFn X-Received: by 2002:a37:86c2:0:b0:69c:6dd:e4bf with SMTP id i185-20020a3786c2000000b0069c06dde4bfmr2235830qkd.105.1650625963215; Fri, 22 Apr 2022 04:12:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650625963; cv=none; d=google.com; s=arc-20160816; b=jnHeJUIOX2DmV6m6PoUKPT41Wz3UMgUPQezRoTS9mEPDhzioaYX+9w+hhq91Qkq3MN P/klt3XQLfwbj9xGycs01+dOYey3A6Il78k+bjH/KMotnKeQzPZY2gXu4S7VoQcbattC mJZz03uL1EToTYyj0MzWYkIrazg3Cn09rfvErXdjO6ZWNi4pESSfTTRr9WguIwPTPU6p dGzn0rtfpWUcI/Eh9Nc+pUMO8/Buq4+92vGKXaa9Rbo10WPgsiR913tKFqr7yzEw9TvJ VoWWrw2AB8Ur9yx7EJCu+/vBf6BISdAd2PEdvYBEYuYVRo4ltfrJmRbGZog4BLseSewu FMDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Qx1JjAG3lYRZ0uJz1kolQCY/eQ8GjTyEi5vBbytSLK0=; b=k6/sFCb4SBrtqL7PRTG/v45PCmaZplVCqe6ONplXfSJmsynB0m/MzDtJKeZuDJ1gfh h9px5glm7UOkAt5kfNASZiYe6KSBwJRfIligrEizz3rEcBkuWV79q4jtHZ30JAVW2Rvu zs9FvDx2eu7pxC+Co2Q5Rn3Q9x0w4YOwgi4PHT5QOPifOYzv2FBBjVMTPkeUksRtL7YP X00Nn666OMhXVcqJmUGg9n5/VM2QJXA3YRgFkGhsJXdxrGHkxQh2z7x7Dkvol5K6LE+b zpZn1U/lI6Z2qooQMrvqJZxgLKMhtSzpGZAKebgGiswl3NNfMVofrOwsau5Q8/sm5ko+ gpCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iP9ToNzI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 20-20020ac85914000000b002ebf03bd986si2108627qty.312.2022.04.22.04.12.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Apr 2022 04:12:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iP9ToNzI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhrDO-00057a-Pi for patch@linaro.org; Fri, 22 Apr 2022 07:12:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhqAL-0005aO-AJ for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:05:30 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhqAJ-0002wm-NO for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:05:28 -0400 Received: by mail-wr1-x42b.google.com with SMTP id q7so2682417wrm.5 for ; Fri, 22 Apr 2022 03:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Qx1JjAG3lYRZ0uJz1kolQCY/eQ8GjTyEi5vBbytSLK0=; b=iP9ToNzIPeJFtMRcC9Y5TYJ0M08wbS+1GNabsx2ZWrteJ0gwbkYp6VkbPjVjCmcA2N m8QGTMU2CEh7my8VRMKWPd2/geokc69dnMwXRfqHamWMsBHM8VQz48k8PoTjhUKvLJGf OvUmKUuUcN9VJuzdTCgmdDN0a15sRFtt64jYU5qYNIKhg4dfBn0HUf2LRxSsMcfqTcXc JCnizLGCKu3+Fpf5Y9i3YCcBRykaX87Ld4xu20zZRZ83m07ZhKBm80f5F6KmPEvqeQe6 hgZ6z7MdApdBJRBPZHfIcnkh6fIn3z2h3ETgNVLwKPMZDaTD3um/LqUKOSsQd+6SpVJz z3fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qx1JjAG3lYRZ0uJz1kolQCY/eQ8GjTyEi5vBbytSLK0=; b=KJ1dnNG2zaw9ResRBTnu72Uf8ToT+nBHO48KSOL/3VkCujicypxMmS/iv93c6Sf9PV jPQ/k+s0837kMdMMPWAnDqWpXXjZHNqkcBtI01iYS6CzBkEW1MmGEcO6+X1E797GfmQk JsX1amq6B/p0UV8/claofMfxnL59URK0BAbvzsTRIq8RcqpYMS+gOK5M4euuFjanKyrK 1ply+mfGWZA8QlsMRtS9wRHGPq1FuzvWJmu++FeDy5vblQRC6gO2q53JV3d4Xjg2h+ff mQP/gCJyh6b+pOUMlPqnkID04At0nlcbw2HjmkBEURFlnNYTJ2xSHct85NfoKjCCjW// 2qJg== X-Gm-Message-State: AOAM532nhgg7WfBXz7zD3ASWgN5aKv3mxIm23OoxIOzIx4ZAkPKhh5fI yicfPPyKOnPRzZdewSxnBDrbYodQVphfiA== X-Received: by 2002:adf:ed8f:0:b0:207:ac33:801f with SMTP id c15-20020adfed8f000000b00207ac33801fmr2981950wro.453.1650621926405; Fri, 22 Apr 2022 03:05:26 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e16-20020a05600c2dd000b0038ed449cbdbsm4312148wmh.3.2022.04.22.03.05.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 03:05:25 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 55/61] target/arm: Simplify aa32 DISAS_WFI Date: Fri, 22 Apr 2022 11:04:26 +0100 Message-Id: <20220422100432.2288247-56-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220422100432.2288247-1-peter.maydell@linaro.org> References: <20220422100432.2288247-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The length of the previous insn may be computed from the difference of start and end addresses. Use tcg_constant_i32 while we're at it. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 086dc0d3b15..d09692c125b 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9870,18 +9870,14 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) /* nothing more to generate */ break; case DISAS_WFI: - { - TCGv_i32 tmp = tcg_const_i32((dc->thumb && - !(dc->insn & (1U << 31))) ? 2 : 4); - - gen_helper_wfi(cpu_env, tmp); - tcg_temp_free_i32(tmp); - /* The helper doesn't necessarily throw an exception, but we + gen_helper_wfi(cpu_env, + tcg_constant_i32(dc->base.pc_next - dc->pc_curr)); + /* + * The helper doesn't necessarily throw an exception, but we * must go back to the main loop to check for interrupts anyway. */ tcg_gen_exit_tb(NULL, 0); break; - } case DISAS_WFE: gen_helper_wfe(cpu_env); break;