From nobody Sun Sep 28 16:32:27 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1758896044; cv=none; d=zohomail.com; s=zohoarc; b=U7fX8iTg+XrPjG9DKMJ5iXH7lDDN1nVE4i1Ai5E8gVk/dXs9p51kosuuLUM2bIxZZ2EBF7aO7YIUHFOSvpTOvUHfFLOuk6u4fedw0nt68ICjTNztL4nQuL6eZ9CrwQNqYTVghuzwsoYY+3cqV6udisYzbHVpLZa4fsA2vTmyGSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758896044; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=0qm1lRq8C6le9ftLJGpNis68tJFVXuU6K3wCRCZ8GAo=; b=TfIxVJALexvzrxLIubno1lBq5SfHLTynlE7kyd7WlnnlHAarkVh/bjNjfaeNqowbxAt9h0U2vR7Xleb7pqw8gdqvmU+UA9u8Tr/x1NKf9aABKlkkmPkf2p0O3Wv4n0p0cqTN1yiS1HQQiTQIUyd6r4ggzGjhxDolaFzd4FrLaek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758896044611775.0671586835693; Fri, 26 Sep 2025 07:14:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v299r-0000XZ-UB; Fri, 26 Sep 2025 10:10:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v2996-0008Kp-5B for qemu-devel@nongnu.org; Fri, 26 Sep 2025 10:10:00 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v298V-0005jG-Hq for qemu-devel@nongnu.org; Fri, 26 Sep 2025 10:09:54 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3f99ac9acc4so1875021f8f.3 for ; Fri, 26 Sep 2025 07:09:15 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-410f2007372sm6338315f8f.16.2025.09.26.07.09.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Sep 2025 07:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758895753; x=1759500553; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0qm1lRq8C6le9ftLJGpNis68tJFVXuU6K3wCRCZ8GAo=; b=pOaALlX3AKtewy3Ee98ZUsWYZNbcfpj8Vu7NB56QFMlvlLgkj9n+QkDT/V1dGl9tnl Om1yHBTdPn5Ll2/XKn9pfMCqKSn1JnzjPyAfeb1RqkS1lF1fIqgzs2cP0zGge1oGzsOF xNKI3RtqSA+0OluzfQUKxC8d3oC3u4/hvKZY6yGDmOIhkqHxJYHQUcRwq3lfqq8RrnwG Kh3GiF9n7y8EqBNxl73PN6VsTQqQT2i80Hrtz/2jJLq8cqC6bii8A/zUbI4P0IA99qst WCbQIq4dT0cpW69z43mWQQj4356+GUgUHI/kIEaPyoKKsqswHKzRQwyIBnJ9UNACbbuI XKkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758895753; x=1759500553; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0qm1lRq8C6le9ftLJGpNis68tJFVXuU6K3wCRCZ8GAo=; b=A/yYx0khWOxBnB+hoSyTQ+Q7+fky02GwxfMnmEWdH4w/WmUCFHU01KSBXkq9TshpNM ze6vNc0x4RUVB5JocrNfDCxwvL4qs6LI4Af1n+ok/KHdjMrvVNdXLJmk3OHgtZGHZMUU TO0mL6Kb0+9U71vcmeIy6fbqWeYniRy3k+PMRWbadVQBEMgectvz8K8saLxXbYjH0pcO ETYudq2VmKGnaE8H7vI84Tt/Vt03NnBZxmKyHw/4V4Gr48aMqUnm8EJs7h1XesEJcMr0 eexXNrR/CKwNW/bJWGCgRuKp4tMakB+6hTOqvaiF69HPx7FWwT2x4Fsdjp23UTuAhbqZ DHqg== X-Gm-Message-State: AOJu0YyE/DbbCQJio0XpOLsyzqMIJgNbcnLXebodP2Y/I7ut4WXXMdCK dYI/0VVuuqh6SiUgsh/8cNSre19mZJPO7uDLZDMLvzko+rzcLYHYle4KpOmmqgzUI8bWuZbr/Yx bBMOe X-Gm-Gg: ASbGncsktSG9daJtA2sf/hG/2CMgrgW3JXTV6yXrQZyu8aKRTZg2GNBnLGMwVd9RSh3 9T/eDPCplGD1NPrpj6gqClhCYteAqX12ZTAsZ43qnrKnPj6Ya6qeyA0rk8xIGGH5gAITql7UlOb HJaielcMyyiJ1xFOm8V0cpAtZPhGcGMEPBk6/yu6MdpElFQd3XoNevvf2XqPLUitaD6+TDGoWe2 i5reVH6+n+42VDX77evzeu/1sKXalpZnUC6+AqxmTW9NhjcjUcDbvI+0fV2qdA38g5v4peYnZfu M6M67oN9Jk8474daj0jLEXI6soHnhLclvbU1bNeELw6pfV7ZE57OW+NNNbvpVYRWX01oa/nWBkE 773Lc2RYslPWibEWbi3sMUp+A7CUinJ9q6DuZGtQ= X-Google-Smtp-Source: AGHT+IFOWZoLmMkZ/PDS+xbf471Dgo2Gcg2rMKFF7zXkDndm/o2H5h28qLoY7lh/wW+wiSTOBC2MyQ== X-Received: by 2002:a05:6000:1862:b0:3e1:2d70:673e with SMTP id ffacd0b85a97d-40e4886e028mr6571662f8f.37.1758895753403; Fri, 26 Sep 2025 07:09:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 26/44] target/arm: Add key parameter to add_cpreg_to_hashtable Date: Fri, 26 Sep 2025 15:08:26 +0100 Message-ID: <20250926140844.1493020-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250926140844.1493020-1-peter.maydell@linaro.org> References: <20250926140844.1493020-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1758896045780116600 From: Richard Henderson Hoist the computation of key into the caller, where state is a known constant. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 [PMM: added comment about CRN key field increment] Signed-off-by: Peter Maydell --- target/arm/helper.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index ade16138e75..8a8fa8c40e9 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7369,26 +7369,13 @@ void register_cp_regs_for_features(ARMCPU *cpu) static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, CPState state, CPSecureState secstate, int cp, int crm, int opc1, int opc2, - const char *name) + const char *name, uint32_t key) { CPUARMState *env =3D &cpu->env; - uint32_t key; ARMCPRegInfo *r2; - bool is64 =3D r->type & ARM_CP_64BIT; bool ns =3D secstate & ARM_CP_SECSTATE_NS; size_t name_len; =20 - switch (state) { - case ARM_CP_STATE_AA32: - key =3D ENCODE_CP_REG(cp, is64, ns, r->crn, crm, opc1, opc2); - break; - case ARM_CP_STATE_AA64: - key =3D ENCODE_AA64_CP_REG(r->opc0, opc1, r->crn, crm, opc2); - break; - default: - g_assert_not_reached(); - } - /* Overriding of an existing definition must be explicitly requested. = */ if (!(r->type & ARM_CP_OVERRIDE)) { const ARMCPRegInfo *oldreg =3D get_arm_cp_reginfo(cpu->cp_regs, ke= y); @@ -7493,22 +7480,28 @@ static void add_cpreg_to_hashtable_aa32(ARMCPU *cpu= , const ARMCPRegInfo *r, * (same for secure and non-secure world) or banked. */ char *name; + bool is64 =3D r->type & ARM_CP_64BIT; + uint32_t key =3D ENCODE_CP_REG(cp, is64, 0, r->crn, crm, opc1, opc2); =20 assert(!(r->type & ARM_CP_ADD_TLBI_NXS)); /* aa64 only */ =20 switch (r->secure) { - case ARM_CP_SECSTATE_S: case ARM_CP_SECSTATE_NS: + key |=3D CP_REG_AA32_NS_MASK; + /* fall through */ + case ARM_CP_SECSTATE_S: add_cpreg_to_hashtable(cpu, r, ARM_CP_STATE_AA32, r->secure, - cp, crm, opc1, opc2, r->name); + cp, crm, opc1, opc2, r->name, key); break; case ARM_CP_SECSTATE_BOTH: name =3D g_strdup_printf("%s_S", r->name); add_cpreg_to_hashtable(cpu, r, ARM_CP_STATE_AA32, ARM_CP_SECSTATE_= S, - cp, crm, opc1, opc2, name); + cp, crm, opc1, opc2, name, key); g_free(name); + + key |=3D CP_REG_AA32_NS_MASK; add_cpreg_to_hashtable(cpu, r, ARM_CP_STATE_AA32, ARM_CP_SECSTATE_= NS, - cp, crm, opc1, opc2, r->name); + cp, crm, opc1, opc2, r->name, key); break; default: g_assert_not_reached(); @@ -7518,6 +7511,8 @@ static void add_cpreg_to_hashtable_aa32(ARMCPU *cpu, = const ARMCPRegInfo *r, static void add_cpreg_to_hashtable_aa64(ARMCPU *cpu, const ARMCPRegInfo *r, int crm, int opc1, int opc2) { + uint32_t key =3D ENCODE_AA64_CP_REG(r->opc0, opc1, r->crn, crm, opc2); + if ((r->type & ARM_CP_ADD_TLBI_NXS) && cpu_isar_feature(aa64_xs, cpu)) { /* @@ -7532,18 +7527,23 @@ static void add_cpreg_to_hashtable_aa64(ARMCPU *cpu= , const ARMCPRegInfo *r, */ ARMCPRegInfo nxs_ri =3D *r; g_autofree char *name =3D g_strdup_printf("%sNXS", r->name); + uint32_t nxs_key; =20 assert(nxs_ri.crn < 0xf); nxs_ri.crn++; + /* Also increment the CRN field inside the key value */ + nxs_key =3D key + (1 << CP_REG_ARM64_SYSREG_CRN_SHIFT); if (nxs_ri.fgt) { nxs_ri.fgt |=3D R_FGT_NXS_MASK; } + add_cpreg_to_hashtable(cpu, &nxs_ri, ARM_CP_STATE_AA64, - ARM_CP_SECSTATE_NS, 0, crm, opc1, opc2, nam= e); + ARM_CP_SECSTATE_NS, 0, crm, opc1, opc2, + name, nxs_key); } =20 add_cpreg_to_hashtable(cpu, r, ARM_CP_STATE_AA64, ARM_CP_SECSTATE_NS, - 0, crm, opc1, opc2, r->name); + 0, crm, opc1, opc2, r->name, key); } =20 void define_one_arm_cp_reg(ARMCPU *cpu, const ARMCPRegInfo *r) --=20 2.43.0