From nobody Sun Sep 28 17:07:43 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=1758032785; cv=none; d=zohomail.com; s=zohoarc; b=J3kti0QNU4DnOMmjBNuUQ5ZvDnzBSFimyr/mOfvxIsTBsnu6UXk7ZV2qhnj1lc/9EH9RwTT0JWQbZ0X8QRF/0sUwMiOTQ8a2+OYw/dn0yZrheM16osmYpUATkIhqVwk8cDj3F7DvKqS9mVHHWgVoBE0HWjK3jbIuiU1dnzMv7B0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758032785; 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=ZSIAGhmwh8mZ4wBWdZ4ZwC8IrpicHIIk/ZQHhSqFh34=; b=Jjja2pWuyigQi8jBfqhdF421SZ3JiN5kbLCYHqPQttsw/onLHxfDXFBAoMDUInjSRgj/GPlJZoCT7StiBpZn6EX+hxikcgPPAp/YAIwr2qHQaFv3AWVn0KPZ/cTMBTFdhjB4If3tD1CQ9Mmz7ynYKCEKIro33c3fCa2MhaTMMBA= 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 1758032785136677.2072393618521; Tue, 16 Sep 2025 07:26:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyWcm-0008BT-1x; Tue, 16 Sep 2025 10:25:40 -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 1uyWae-00062R-Ke for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:28 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uyWaT-0008LA-Q8 for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:28 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-7704f3c46ceso4858873b3a.2 for ; Tue, 16 Sep 2025 07:22:56 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2651d2df15esm73459905ad.45.2025.09.16.07.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 07:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758032575; x=1758637375; 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=ZSIAGhmwh8mZ4wBWdZ4ZwC8IrpicHIIk/ZQHhSqFh34=; b=l2tN+n/U5zVOe7rIHWNnZt+WAjC4RKfUMQoN01Uf8Q5BQJ4WW7f9yKBw6R/k3DbIjc p0sugoGXJOjiQ9yNqH9m+hmnSUR92bca0YzOsgNUUQR1PY1z8IhyMVsspeGdj7kR3Ko5 BJtuXjwsi6PKpbvjlYKJyZ4Vqsfy5yQOJLPPtR3p1DjjDn2edBbIHkCCYac9Y3aZa9Ok AO4RdYbVwx523grZ0lUEZQWAb605JVJJfW16KjfguaL+RcB1O71ZmEnaKix4NvnEkDoP 5JORahLokGJqdTx+V+qC+YNvTdtzFU/mahWyspSLuOYAaw21I0CMBgcgB2VamRiBS/yb HLAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758032575; x=1758637375; 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=ZSIAGhmwh8mZ4wBWdZ4ZwC8IrpicHIIk/ZQHhSqFh34=; b=u3ceUT4VWiemE9u/O/OIE+5TwmCzHUBM6/Jn9hBzuFql4K/Bt9o9PERnSfH2oppWyl a7r2schCrgBB3xNpY8370nXY8LI29wAobkVLq8ikLkhJcTz8qXS1dv2Udrup3KB2lJC8 X2PNARjKnqrm8Io59TH6q/bcdks3fYubPMrGpSnbbFTLNg8N7kU3OSsV4Q9dHTrzMJh3 +0CeBtFcjv3NJ8lDeYYrcf6ETEfRyownjbacw+nCLaxJFgA2WAIHMWEF+dUyy0SwtK1s SvSTdu9UgWyfhZk8Nt1R0NF0fkQhH46zVswcYALcUWbEqpSwgZ+t/GVTy7+MJaNd9YPn 9WZw== X-Gm-Message-State: AOJu0YwI5rXF2iu/HCO3ELh0xGD+NOYx0w4fWUCFgqCEFge8pTBFoCZD yWM+tgDzygLft/2+e/Gxb06QvtCEZhvDCOs+YwViAnDLLM12KJgZi38kAX9Rqf7y4f/qjoQCU1C x125I X-Gm-Gg: ASbGnct4FrCyQdJrzWVR7OHlcbdL9rDvszKfhzbQz9G39eaJTzucR+ES2UBR7gHYndg ez1M6HLPJVaQu20O7sGYK/3dKsdUBUMQbcshI5SbItxRY0Gt0h1bYzZwIAmRx/5EQD0d16NWr6W v+Vx3q/cPUknuc/SdRJynueVehwtuuB2Fpu85OPnpSwdjeYugU0oFLtnZncdX1WabfK8S7JWz6H 45csbo3Oc/M/fddnWI9yqyCPDlsGBC/vbIX5xC02PFuwgJ4H74w+dztMJDGgbvf6tGuGV86uBjC Q9OYGhSYo/DV6xVvKSp339/PzYDz1Sta2x3N3+D8JcxwDcPGFsAmK6Scy0GnE5TMPM+RF1Ji8Io rq4CWWIHxrUqSmF/pPcHb9wS/65KM X-Google-Smtp-Source: AGHT+IEaTBui/B91+WuP7qzd0c/v5oaVCMAIgu//8CktMGyP697FmZZgXaXtjUwiQNvnERoSdLxpFw== X-Received: by 2002:a17:902:cec6:b0:266:88ae:be6d with SMTP id d9443c01a7336-26688aec242mr94412115ad.6.1758032574645; Tue, 16 Sep 2025 07:22:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org, Manos Pitsidianakis Subject: [PATCH v2 19/36] target/arm: Reorder ENCODE_AA64_CP_REG arguments Date: Tue, 16 Sep 2025 07:22:20 -0700 Message-ID: <20250916142238.664316-20-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::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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=unavailable 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: 1758032785582116600 Content-Type: text/plain; charset="utf-8" The order of the parameters in the Arm ARM is op0, op1, crn, crm, op2 Reorder the arguments of ENCODE_AA64_CP_REG to match. Reviewed-by: Manos Pitsidianakis Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpregs.h | 2 +- target/arm/helper.c | 4 ++-- target/arm/hvf/hvf.c | 6 +++--- target/arm/tcg/translate-a64.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index 95b0b9c78e..7bdf6cf847 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -187,7 +187,7 @@ enum { ((is64) << CP_REG_AA32_64BIT_SHIFT) | \ ((cp) << 16) | ((crn) << 11) | ((crm) << 7) | ((opc1) << 3) | (opc2)) =20 -#define ENCODE_AA64_CP_REG(crn, crm, op0, op1, op2) \ +#define ENCODE_AA64_CP_REG(op0, op1, crn, crm, op2) \ (CP_REG_AA64_MASK | CP_REG_ARM64_SYSREG | \ ((op0) << CP_REG_ARM64_SYSREG_OP0_SHIFT) | \ ((op1) << CP_REG_ARM64_SYSREG_OP1_SHIFT) | \ diff --git a/target/arm/helper.c b/target/arm/helper.c index 7094b63f82..8b63eacb91 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4542,7 +4542,7 @@ static void define_arm_vh_e2h_redirects_aliases(ARMCP= U *cpu) }; =20 #define K(op0, op1, crn, crm, op2) \ - ENCODE_AA64_CP_REG(crn, crm, op0, op1, op2) + ENCODE_AA64_CP_REG(op0, op1, crn, crm, op2) =20 static const struct E2HAlias aliases[] =3D { { K(3, 0, 1, 0, 0), K(3, 4, 1, 0, 0), K(3, 5, 1, 0, 0), @@ -7453,7 +7453,7 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const= ARMCPRegInfo *r, */ assert(cp =3D=3D 0 || r->state =3D=3D ARM_CP_STATE_BOTH); cp =3D 0; - key =3D ENCODE_AA64_CP_REG(r->crn, crm, r->opc0, opc1, opc2); + key =3D ENCODE_AA64_CP_REG(r->opc0, opc1, r->crn, crm, opc2); break; default: g_assert_not_reached(); diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 6e67d89163..8b467b3663 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1124,10 +1124,10 @@ static bool is_id_sysreg(uint32_t reg) =20 static uint32_t hvf_reg2cp_reg(uint32_t reg) { - return ENCODE_AA64_CP_REG((reg >> SYSREG_CRN_SHIFT) & SYSREG_CRN_MASK, - (reg >> SYSREG_CRM_SHIFT) & SYSREG_CRM_MASK, - (reg >> SYSREG_OP0_SHIFT) & SYSREG_OP0_MASK, + return ENCODE_AA64_CP_REG((reg >> SYSREG_OP0_SHIFT) & SYSREG_OP0_MASK, (reg >> SYSREG_OP1_SHIFT) & SYSREG_OP1_MASK, + (reg >> SYSREG_CRN_SHIFT) & SYSREG_CRN_MASK, + (reg >> SYSREG_CRM_SHIFT) & SYSREG_CRM_MASK, (reg >> SYSREG_OP2_SHIFT) & SYSREG_OP2_MASK); } =20 diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index a560ef0f42..0ec309f1ea 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2466,7 +2466,7 @@ static void handle_sys(DisasContext *s, bool isread, unsigned int op0, unsigned int op1, unsigned int op= 2, unsigned int crn, unsigned int crm, unsigned int rt) { - uint32_t key =3D ENCODE_AA64_CP_REG(crn, crm, op0, op1, op2); + uint32_t key =3D ENCODE_AA64_CP_REG(op0, op1, crn, crm, op2); const ARMCPRegInfo *ri =3D get_arm_cp_reginfo(s->cp_regs, key); bool need_exit_tb =3D false; bool nv_trap_to_el2 =3D false; @@ -2602,7 +2602,7 @@ static void handle_sys(DisasContext *s, bool isread, * We don't use the EL1 register's access function, and * fine-grained-traps on EL1 also do not apply here. */ - key =3D ENCODE_AA64_CP_REG(crn, crm, op0, 0, op2); + key =3D ENCODE_AA64_CP_REG(op0, 0, crn, crm, op2); ri =3D get_arm_cp_reginfo(s->cp_regs, key); assert(ri); assert(cp_access_ok(s->current_el, ri, isread)); --=20 2.43.0