From nobody Sun Sep 28 17:08:42 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=1758033002; cv=none; d=zohomail.com; s=zohoarc; b=F0Ss6Pf7pvbmMvUqMhShIJJbLjzQWPGmVxTXkjs7C+nS4W4tJVrgDJTFhid2ZYncSjf+zFvi/ee0LrUfeBCfcM2Qz0HLZIQffD3ybD3K19KkLGBFogepqoDjoiLumliqFUdY/nOfanoeA51lnOg/H6gaGB8LS6I9FpnV7Qqu0uI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758033002; h=Content-Transfer-Encoding:Cc:Cc: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; bh=aYtAYFlCCwkQWVKst4EMyP1kPI4iTxoV2MGMTex6t8A=; b=fUkXQbUEVrrOv0Au0At8eTsQAUK2apUN7/g/swSJXkIIOEF1nFdcJDvoch6kRySUmzQKwDteFc40P9nIvqwhYCLeFD5Vq0nqOj6CAvXJXodBqJnVBv3RszNhfw17DQ4TAbtxcxncgq/q4pTQJ/+ZVmtT5mltkf2i3xmF3vvJdAU= 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 1758033002626470.51040208447057; Tue, 16 Sep 2025 07:30:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyWar-0006Lp-AK; Tue, 16 Sep 2025 10:23:41 -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 1uyWaX-0005v3-Aj for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:21 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uyWaT-0008MI-Aw for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:20 -0400 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-b54acc8c96eso3821362a12.0 for ; Tue, 16 Sep 2025 07:22:59 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2651d2df15esm73459905ad.45.2025.09.16.07.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 07:22:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758032578; x=1758637378; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aYtAYFlCCwkQWVKst4EMyP1kPI4iTxoV2MGMTex6t8A=; b=OCJli5m6ZJpnvIB20IaJoar56913aQ3arlkjGOU2YjgQg5WYxTX7sN0k2eNXxe2zeO fpAvrI1KRn31mVOavrVb1VpZUMR8sBaLeMKHTODxHVQBGXGq0ULFNOMPXjjLosSJa+F5 cHsTFID6yDUWS3TgUjZcZXxy70thDGAB/iwlpFgOFps7Rdep/9DsfoOWBoHOa8hRQAZc rfDnYXsjhbP8sGlflFRp0YSiVNKArqKD6hFSCegQIqKo+d8IASHhTIfUShYZrrz3B01c k6fVg+H0lY2CiLzCa7+dxxee5C3kMAkuebW6PPrIiWYZrGWoBFQeFtK3YDJVPjaeCiW3 gS2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758032578; x=1758637378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aYtAYFlCCwkQWVKst4EMyP1kPI4iTxoV2MGMTex6t8A=; b=t5E2AH+oucTr5jF434gAuK5/S0sYWK4xhwy49lPFuWAcyqkVDK/TVrdd0+fubPyXPU bSYhIhy4PDQt5E0CMp6BokG/fLSVrScShc0iN+bo22QWsDUCIGxHdouXopCOW+qV4Eob xXBnFAM+eUd9boz19hJK/hEj7WJ7nKA5Z4kpmdY/QtPgzO/EaC2OvTJwIhI+0Axdj5zT AGjyf6AvzvKehrdJSJ4RGXdG9NOVSQTgPbeWYJHUM0Gd2vrwPnMXU5lA5bf7ggVCz9gZ hzgo8MLRjWT8dAYYMg+CKbpS5xhGm3FvTwag3zdJOX+QHezqeRBwT9CV77vzKC4LfhWd duhg== X-Gm-Message-State: AOJu0YzSDZll26gwLYMwOpdOt0jke3dhR9/bzBKrRLZAEgjbMtXtSwXl wCZjcaUIFvnq2KCc5eX4CYRZStNLSqsDVkAOVhcxSuEjBxGIrWusO4iTc5AFdNUWhWpqi7Dpk5v fTskk X-Gm-Gg: ASbGncuIykFabjWcPZFFUcpm6lXSR/OCrq9nsbiS1eE0uHMnkqYzhu8YrGb79x2mJx4 Q/s3XaqM7j6zXbejoRYsrtjkoMGPyuifUiBwLZDoASHDkNmmzMKebM7VDcRzbWVqztNf1zjbGE8 /YQYRe7joUNE7IK7ra8YOG62aJCFa3aVkvQQo064wKAw1vv6Yt2+Qfd3WdSdmmLNXqBAjoZoyqY jNzgtgP6ZvcU92ljzQDX7CWXyPm0ecYgyuJs8SaXbfKykW/5rg77uKxq9w9cEZL4ADiJMcMMBKf 9feRi0MwitghaChhFxpa+MUABh2dBl3DpyGiYPGW9mGrG36dkkdkurpHYGnOwXtBjEZNJDwJ/9m RlOuZ+MtkiKpu4Krrt0iLQozTCBv0 X-Google-Smtp-Source: AGHT+IEe8VFXmDlrf0Bdw8LTQ6PJcAQOvBC1c9hgeyEvWIIicLDlzk8jSEXAjRxHu1ng6X/z3TbURA== X-Received: by 2002:a17:903:1904:b0:246:4077:455b with SMTP id d9443c01a7336-25d2675f896mr186980815ad.36.1758032578111; Tue, 16 Sep 2025 07:22:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org Subject: [PATCH v2 24/36] target/arm: Add key parameter to add_cpreg_to_hashtable Date: Tue, 16 Sep 2025 07:22:25 -0700 Message-ID: <20250916142238.664316-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250916142238.664316-1-richard.henderson@linaro.org> References: <20250916142238.664316-1-richard.henderson@linaro.org> MIME-Version: 1.0 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=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 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: 1758033004856116600 Content-Type: text/plain; charset="utf-8" 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 --- target/arm/helper.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 4a109a113d..a5195e296d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7424,26 +7424,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); @@ -7548,22 +7535,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(); @@ -7573,6 +7566,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)) { /* @@ -7587,18 +7582,22 @@ 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++; + 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