From patchwork Fri Apr 22 10:04:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 564822 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp368391map; Fri, 22 Apr 2022 04:13:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAPs+L5SCmM5OhkLeop6khz01NV5x2/+c5ouoOlw/Ivu6npn+ndJ9fueA3LI0P0Jiyo7RM X-Received: by 2002:a05:6214:4103:b0:440:e4d1:a2a0 with SMTP id kc3-20020a056214410300b00440e4d1a2a0mr2863231qvb.42.1650626008475; Fri, 22 Apr 2022 04:13:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650626008; cv=none; d=google.com; s=arc-20160816; b=OO/WMMs1Qv/ibylVSgem7e5RBuirXQNhlnGK/w+oaf9Qajj3EsTkcBrvbDvlitwfHZ dqdspFBwfCSH7UBJKmEzKJsKHyd/gWy0v6sHl+7WJoWuahfGAjOXsbjHfXdpA9KZaKUc DMUiLDm0JSOhKXeH3Wj2QjSOyvHXC3zFd/fI55TedoYyLGz8V0ojJjL/IZxHT8Bm2tKd junqvd3WyApS9GP51fXjTisDge7/A+9DFMX0xhmQGxmeR0qEWim6NK8HCuD18rUX/icX K/kRexXxP8Z4SaX8Hv7oFmOMfrw4iEEHri8AiBs601HgkyBHJ2wqCiSSx37I4oMtCzyM qSJw== 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=eR7NYfDsDp0GzWfno2vjeiAO+oaOfi4kY26EnfhTTNM=; b=Q+UPRM83Tajv8PjLhTd79bYSiwem4G/Vf6D5vbF05EdLIHDEkYStm2q9rfpaTuDI60 gxo5B0Yw3vHL0Af3NyqNPCE3sLhVKlZjOCKfYEml09DFwjaCRpgQwoHZ2K/D8IuvAhfo /c0nmuhnNjWdr67SWadm1NQKB4V/OGxFWxgEOb7JP8FBAWczlThbfB1Wy2efKL1CREgk 2p8nwilCekqRg6gkGaQ/+J0D1qSqnjiXsBjaakX3LntJe/QFz7+wP/FxY8R7aQMzKVZz X0yihzFzjjOOfv++f2Z5jaQ6i0YHScpq3FsR43zzqxJpk/lpvcBSRYhkaiuIOuy0i0Ls hoPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qcUYVdtv; 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 17-20020ac856f1000000b002f205019ae9si1943590qtu.747.2022.04.22.04.13.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Apr 2022 04:13:28 -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=qcUYVdtv; 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]:54176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhrE8-0007tZ-05 for patch@linaro.org; Fri, 22 Apr 2022 07:13:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhqAJ-0005aF-45 for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:05:30 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhqAH-0002ux-5E for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:05:26 -0400 Received: by mail-wr1-x432.google.com with SMTP id b19so10282073wrh.11 for ; Fri, 22 Apr 2022 03:05:24 -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=eR7NYfDsDp0GzWfno2vjeiAO+oaOfi4kY26EnfhTTNM=; b=qcUYVdtvDpexnRzsdu6RSVZCwmGH9zIscqLuCSbFWZ0+ZAtlBfmHMQpASWQ2AqdGIh qpFSrCXhhfTImz/ISjI4dkq6vnGj10JlLRasnVPpjQ00EZqo7X6scssNeGu3TuHYjyqR 7Zzf/gx24CKBKNlmOCoB6iKu2vbYVNy4O+TYLfvQP8+ZsTH6SMkgYdnZgueBrW1l+rvH H1TGzpxN07/xxvyJ1WyLZh8lDJybOuHRcZlPoPvAQ5S3Qo61gCyDk5AS6p3W3sLOaibY CTPtfXG4p6zdhXfZmVPT0R0xSoj2N7Sn34ooMMZQy8+US6JxVYsRfNPXsPPA3EUnRpw9 TgVQ== 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=eR7NYfDsDp0GzWfno2vjeiAO+oaOfi4kY26EnfhTTNM=; b=Iewx36SJbP3gbm0/yNe6dTX1XH4MmDUpG41fd4AP6dAJoNveotppHkjEWqB3MsjbZG f6R307wAa5GN4+RKW6RK3skUGHgoVAKkU8GHbK9fwyi3blhUKDJsqgsqZxGkUgC/K5sp 0NjFg7hjCCRbQ6xxColNcdVDljOA0dDasOB318FUZTFlf0Oxh77L0yLE0BJEg5V41Pfw Jo0KN5SlNzR9Z4RrPUvNbcoS5A6SRrRDHptcNtX1n9TGOaX/pgIuajM6fynQzwE1VFh2 2MaJ/TUfnaZXXU1x7U5DLMNPVNBqFMOXnyFaJsQ0aR2OOT3VHQvEM1bNLMcRVL7xqaRI oJTg== X-Gm-Message-State: AOAM53107g2txLpbWVhSqmW8mCBAbwDU960ljxaRJINRHVnk02WlpM8E 3Ne/yzzeeY/A2tFrk3eCGPBBNb8sXtKkQQ== X-Received: by 2002:adf:fb48:0:b0:203:f986:874a with SMTP id c8-20020adffb48000000b00203f986874amr3092370wrs.614.1650621923733; Fri, 22 Apr 2022 03:05:23 -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.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 03:05:23 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 52/61] target/arm: Split out gen_rebuild_hflags Date: Fri, 22 Apr 2022 11:04:23 +0100 Message-Id: <20220422100432.2288247-53-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::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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 For aa32, the function has a parameter to use the new el. For aa64, that never happens. 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-a64.c | 21 +++++++++----------- target/arm/translate.c | 40 +++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 13a3527345f..adbcd999415 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -341,6 +341,11 @@ static void a64_free_cc(DisasCompare64 *c64) tcg_temp_free_i64(c64->value); } +static void gen_rebuild_hflags(DisasContext *s) +{ + gen_helper_rebuild_hflags_a64(cpu_env, tcg_constant_i32(s->current_el)); +} + static void gen_exception_internal(int excp) { TCGv_i32 tcg_excp = tcg_const_i32(excp); @@ -1667,9 +1672,7 @@ static void handle_msr_i(DisasContext *s, uint32_t insn, } else { clear_pstate_bits(PSTATE_UAO); } - t1 = tcg_const_i32(s->current_el); - gen_helper_rebuild_hflags_a64(cpu_env, t1); - tcg_temp_free_i32(t1); + gen_rebuild_hflags(s); break; case 0x04: /* PAN */ @@ -1681,9 +1684,7 @@ static void handle_msr_i(DisasContext *s, uint32_t insn, } else { clear_pstate_bits(PSTATE_PAN); } - t1 = tcg_const_i32(s->current_el); - gen_helper_rebuild_hflags_a64(cpu_env, t1); - tcg_temp_free_i32(t1); + gen_rebuild_hflags(s); break; case 0x05: /* SPSel */ @@ -1741,9 +1742,7 @@ static void handle_msr_i(DisasContext *s, uint32_t insn, } else { clear_pstate_bits(PSTATE_TCO); } - t1 = tcg_const_i32(s->current_el); - gen_helper_rebuild_hflags_a64(cpu_env, t1); - tcg_temp_free_i32(t1); + gen_rebuild_hflags(s); /* Many factors, including TCO, go into MTE_ACTIVE. */ s->base.is_jmp = DISAS_UPDATE_NOCHAIN; } else if (dc_isar_feature(aa64_mte_insn_reg, s)) { @@ -1990,9 +1989,7 @@ static void handle_sys(DisasContext *s, uint32_t insn, bool isread, * A write to any coprocessor regiser that ends a TB * must rebuild the hflags for the next TB. */ - TCGv_i32 tcg_el = tcg_const_i32(s->current_el); - gen_helper_rebuild_hflags_a64(cpu_env, tcg_el); - tcg_temp_free_i32(tcg_el); + gen_rebuild_hflags(s); /* * We default to ending the TB on a coprocessor register write, * but allow this to be suppressed by the register definition diff --git a/target/arm/translate.c b/target/arm/translate.c index 1314406b193..4d7886fa853 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -351,6 +351,26 @@ void gen_set_cpsr(TCGv_i32 var, uint32_t mask) tcg_temp_free_i32(tmp_mask); } +static void gen_rebuild_hflags(DisasContext *s, bool new_el) +{ + bool m_profile = arm_dc_feature(s, ARM_FEATURE_M); + + if (new_el) { + if (m_profile) { + gen_helper_rebuild_hflags_m32_newel(cpu_env); + } else { + gen_helper_rebuild_hflags_a32_newel(cpu_env); + } + } else { + TCGv_i32 tcg_el = tcg_constant_i32(s->current_el); + if (m_profile) { + gen_helper_rebuild_hflags_m32(cpu_env, tcg_el); + } else { + gen_helper_rebuild_hflags_a32(cpu_env, tcg_el); + } + } +} + static void gen_exception_internal(int excp) { TCGv_i32 tcg_excp = tcg_const_i32(excp); @@ -4885,17 +4905,7 @@ static void do_coproc_insn(DisasContext *s, int cpnum, int is64, * A write to any coprocessor register that ends a TB * must rebuild the hflags for the next TB. */ - TCGv_i32 tcg_el = tcg_const_i32(s->current_el); - if (arm_dc_feature(s, ARM_FEATURE_M)) { - gen_helper_rebuild_hflags_m32(cpu_env, tcg_el); - } else { - if (ri->type & ARM_CP_NEWEL) { - gen_helper_rebuild_hflags_a32_newel(cpu_env); - } else { - gen_helper_rebuild_hflags_a32(cpu_env, tcg_el); - } - } - tcg_temp_free_i32(tcg_el); + gen_rebuild_hflags(s, ri->type & ARM_CP_NEWEL); /* * We default to ending the TB on a coprocessor register write, * but allow this to be suppressed by the register definition @@ -6445,7 +6455,7 @@ static bool trans_MSR_v7m(DisasContext *s, arg_MSR_v7m *a) tcg_temp_free_i32(addr); tcg_temp_free_i32(reg); /* If we wrote to CONTROL, the EL might have changed */ - gen_helper_rebuild_hflags_m32_newel(cpu_env); + gen_rebuild_hflags(s, true); gen_lookup_tb(s); return true; } @@ -8897,7 +8907,7 @@ static bool trans_CPS(DisasContext *s, arg_CPS *a) static bool trans_CPS_v7m(DisasContext *s, arg_CPS_v7m *a) { - TCGv_i32 tmp, addr, el; + TCGv_i32 tmp, addr; if (!arm_dc_feature(s, ARM_FEATURE_M)) { return false; @@ -8920,9 +8930,7 @@ static bool trans_CPS_v7m(DisasContext *s, arg_CPS_v7m *a) gen_helper_v7m_msr(cpu_env, addr, tmp); tcg_temp_free_i32(addr); } - el = tcg_const_i32(s->current_el); - gen_helper_rebuild_hflags_m32(cpu_env, el); - tcg_temp_free_i32(el); + gen_rebuild_hflags(s, false); tcg_temp_free_i32(tmp); gen_lookup_tb(s); return true;