From patchwork Sun Apr 17 17:43:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 562828 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp1858049map; Sun, 17 Apr 2022 11:00:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxn+jjlQBiJ0CuHtZ6QhQVY9S1JN2QcMc3WKOj3ZEe7eDeBbA62aalqW1/VJUNPjrymX4Yh X-Received: by 2002:a05:622a:3ce:b0:2f1:fd16:751b with SMTP id k14-20020a05622a03ce00b002f1fd16751bmr1368844qtx.197.1650218453966; Sun, 17 Apr 2022 11:00:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650218453; cv=none; d=google.com; s=arc-20160816; b=APEkKbBJRvVa9JOC5vKLxk+O0wC3HMvX0FaSBABDf0K6pZZsAg4sicZu9sb507qgyz rvTT66MT+QV9yoSO6RULGEinJAV82c29UrNYSI/cVWKSQCl92pus8/AozbMfOJUN1id/ hjFzNy3WelK0IC/DOTNIbpQT/4siYtFdSdmA76Z7R0a5ggr3UkZROts6xaMLpuzYacRu dOp2ID9MLuueexP3Kz9LHHkyidzdg6ZavJwis5CllDDFulGkdSTRdbSsmW9XwXTam0cC RzPBFt0ShoYRAFeNKs5nawrXJ7F7xfCN9zkZO6xXRMpMcKC2pUBS2I7AuIRGRvID3yLU GCTg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MiWeWkecp06NuqnvJcQe+4MeVb3lXXDHi5qwkM/XVaM=; b=Fc4uDmpuvCJ/02pmCDjrmtekUB7z8NmhenwqSt0D7kCg31qZDaaDqTJfMjeWiCCPTN Mq5LWTO3jx17LwRQgnVe2ZUr0bnunCXIsXGtERGuxv9iaGSzC4KTEQ1ovhiHtveP2S+4 qFFCEiB6L4KZM0GQY8dUar5vp9dZNKh+IoxDkzP37B8qx/Pd7t7fg5ZjUs/jWs3wIZWM 48vq551j15UJzitSTkozvKOFq6mDujGbBhV1yQ6Li8U4caDpHX1CDBC8dQkgEbCCu1oB 2XW0QZqtEuQWvEInwK4O5AEyejFZn3VSCa2Dgk7EB8u/Q39og3EiiJqFLzTR6xi19xNG 2Lkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B20sxyvp; 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 t3-20020a375f03000000b0069bdffcd7ccsi2449027qkb.668.2022.04.17.11.00.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Apr 2022 11:00:53 -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=B20sxyvp; 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]:57248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ng9Cf-0004gU-Hu for patch@linaro.org; Sun, 17 Apr 2022 14:00:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng8x0-0000fY-4I for qemu-devel@nongnu.org; Sun, 17 Apr 2022 13:44:43 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:33603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng8wy-0003Hx-D6 for qemu-devel@nongnu.org; Sun, 17 Apr 2022 13:44:41 -0400 Received: by mail-pg1-x536.google.com with SMTP id k14so14986518pga.0 for ; Sun, 17 Apr 2022 10:44:40 -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 :mime-version:content-transfer-encoding; bh=MiWeWkecp06NuqnvJcQe+4MeVb3lXXDHi5qwkM/XVaM=; b=B20sxyvpNez0Dj4y1gXoZcPlKJOklmmL98rVxx52/lIffU2syKDPNWTYTn1V5eNvoI 1BvR+zNmREQIXGN8NHFFPGhVSMW9A22KtqBcbPWvJtM6O2KqhgBTNwEFXQEDDlKbzQu0 3YmA8XB6I1Oxydq4f7zBJynmBUyCu1QIT+nh2eAyLuwBGPiL+GDuqljuYrjfruf6AbIO NQovIcO7noSyD6t61CDTie0lWOogauqxNaNJgFjBWUn1u1tD3hiuQsSYVEePLU9OZOVs sXgnKnK9J29WNXVaoLU7vwsMxF7WfFuqO/e6mwIP+DoHdpM5q6l269EUXgaEtlYNrhnO baBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MiWeWkecp06NuqnvJcQe+4MeVb3lXXDHi5qwkM/XVaM=; b=SSzQKzkAQGaHwo1GL/JO+xKx6EEPOx09FfD5CpoxlrFmac/r0sri62+fj5bGEZAyAK 6JiTKT6w1BNfVBanDXBanORowHzyQnURPDJbFpU3TklVbSTai38NpATTpd6a5mRoOLwU yLudje99QCe1nitEYoaMaC7xWF6+VV/CTt6niJJR9zdo/sBoIaV3qQLYtP+yPl/1hFMp T4bM30V1Vala9pzivmtdzsUYm7rpsOqwItQwthH+JKmGO7L1CQpxy5nwM2T7C/HFtFR9 qfb99MWjdv/FU2AN7vbwrCla54eOk/NJ8FRw8Cfl0NaHrR3L5yLZhooNqE/xxnu2UMfC pwFw== X-Gm-Message-State: AOAM531RxCK955e5NFsDepswrixNeLtAqyazTH6Ndy9pKuYkM1XFJ1ua JmHnNHvEi214iy0NvMCOowZ2aOGsAcl5ow== X-Received: by 2002:aa7:9ad8:0:b0:50a:49e1:164c with SMTP id x24-20020aa79ad8000000b0050a49e1164cmr8354515pfp.8.1650217479056; Sun, 17 Apr 2022 10:44:39 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id i2-20020a17090a138200b001cb6512b579sm10372119pja.44.2022.04.17.10.44.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:44:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 11/60] target/arm: Split out set_btype_raw Date: Sun, 17 Apr 2022 10:43:37 -0700 Message-Id: <20220417174426.711829-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220417174426.711829-1-richard.henderson@linaro.org> References: <20220417174426.711829-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.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: , Cc: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Common code for reset_btype and set_btype. Use tcg_constant_i32. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/translate-a64.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index be7283b966..a85ca380a9 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -128,29 +128,28 @@ static int get_a64_user_mem_index(DisasContext *s) return arm_to_core_mmu_idx(useridx); } -static void reset_btype(DisasContext *s) +static void set_btype_raw(int val) { - if (s->btype != 0) { - TCGv_i32 zero = tcg_const_i32(0); - tcg_gen_st_i32(zero, cpu_env, offsetof(CPUARMState, btype)); - tcg_temp_free_i32(zero); - s->btype = 0; - } + tcg_gen_st_i32(tcg_constant_i32(val), cpu_env, + offsetof(CPUARMState, btype)); } static void set_btype(DisasContext *s, int val) { - TCGv_i32 tcg_val; - /* BTYPE is a 2-bit field, and 0 should be done with reset_btype. */ tcg_debug_assert(val >= 1 && val <= 3); - - tcg_val = tcg_const_i32(val); - tcg_gen_st_i32(tcg_val, cpu_env, offsetof(CPUARMState, btype)); - tcg_temp_free_i32(tcg_val); + set_btype_raw(val); s->btype = -1; } +static void reset_btype(DisasContext *s) +{ + if (s->btype != 0) { + set_btype_raw(0); + s->btype = 0; + } +} + void gen_a64_set_pc_im(uint64_t val) { tcg_gen_movi_i64(cpu_pc, val);