From nobody Sat Sep 26 19:16:13 2026 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=1790373057; cv=none; d=zohomail.com; s=zohoarc; b=VhHOKkynCWN1lCgCCV1m5Snv6R3wmkwldbTJt5ucT9bhkfq+L/Bq6r3gd27ZfG+15+ke6StUDGROcUbK0I2TWtnTDDSQrVZ7Q5lXLWyrCo0Lyjl+Tr3wVYUbshnc0hSWses0u0uTofVrZpxDQ0E1MkDV0VyLFmI+3yjEKzFG85w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373057; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3uToE5TQtUeu04oq/KPmYzTSFGfvjSl8xGGZIFShgp0=; b=E3zVDJMstD/x4ByEH4mAM51YBJsq7ESE9IV+tBK0lSDebdPnphZsjwHHy+HcH/u7OXJw2dU5Ky1/EBL9ARoE42hN/3yaN5J95+Ml5BInQ4Mn7YzB5utplkwczNp+tIiI8dHetJgsrIxiBz6pvYVDCpK+N1/COOwyLUXJWcgCAyc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373057785836.4319034714523; Fri, 25 Sep 2026 14:50:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADoX-0007y7-OD; Fri, 25 Sep 2026 17:50:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADo3-0007l0-LU for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:14 -0400 Received: from mail-pz2-x10.google.com ([2607:f8b0:4864:3b::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo0-0007Zy-R1 for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:11 -0400 Received: by mail-pz2-x10.google.com with SMTP id 41be03b00d2f7-cc1cea4bfd1so570270a12.0 for ; Fri, 25 Sep 2026 14:50:08 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373007; x=1790977807; 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:content-type; bh=3uToE5TQtUeu04oq/KPmYzTSFGfvjSl8xGGZIFShgp0=; b=g8cUFVJvk1i1cHzjULDBmxe1MuUWTTZ2EZR772TFL1ZseYKvASt/E4p1M9fkPoUZfG K2nh0O/TNg4eoCuusSuVJCIC4ZFJpoU1yNxdk0J5Sr5+w/mjBSY0O7bdCj9wAGbkN7xe ve+nbW49rG/G8NpgDzDbK+S4/rskBDeoBdvpSSBLJLFK5fgcoy55In8MSxkwQSK2a2Ut 2KUwxLesf4f+fQEdaMghjSZJ8WzITfNyjl/aywJrjWdmXwXqslPiHDfOPeXVvadwouyS 0jDwKOfggeCaKkWos2UFkV9dLWPzTMqGn87MY1Ce2O3v00dIveklfi6+NxwMir0FEMBF ld6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373007; x=1790977807; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=3uToE5TQtUeu04oq/KPmYzTSFGfvjSl8xGGZIFShgp0=; b=TSiRAhlCjQfEgaRk8uQrz9rzZWZja4Jpj17SSf7iLqrN5icIsz+DTkWUMDlVtem/CB ZJY+A/QPKh0yNCsfFmRYttw4Ul9MCtorU7ieO2aF7zkq71YC+MZWNBfmXJWIO7yROcPY QzeRZelhJ5K4j5kmgG1pnqSgyMXDSQYZvLvu+96xtglgvpAZN3Au8MHUFqzxnJEE5zYU BstatQG0AdSUDNmHOnTj6By6tW05ydXvwRaiCOZxhfPa4gVKGVdGjMDi0cAvQ9wfu9hP 3fQXgq0x5rvc957uXjS0F+gB8fjVEusRtng4Ib1vhNTy3vuv2NvkOEM9MjAiaXKdm5lb nuZg== X-Gm-Message-State: AFuF++k7h9+zLMvt51AeeeH8F6RdZMlT2+Pre7wRgZ29JZKNatYpTfGd QMuTbvfi90UFNcq4RDFy+QaxKeRKeWUANWC/u1fMk+y14MQz1DSxHniZXJvbO2aY+YQ8fpuYIWR Pd/1s X-Gm-Gg: AYBFou3piv3kRgTckRer4HkuvrXQNnpirehFu9+PbInDd+IG40uq80ymGeG7hSL+Fbt R2RmriDk+ONaPa4y64NS3l2iSk4JAFKni7kKE2PfjAcuUyH3dufE3I13+BOB7/hjrlyYbtCgSwI oCrntjsAdnNk2w99T/W94qWHS0Qc0zgcBvGhgFQFdu8k4wamB8osBd9oscAexuThIGd2m/H4Coj Wkv1eXzgSQQf7Je0Hcfg7guAx3D+3P2l1idH7DxsA+I3Kdap6kY4o8CLOHumJoS950xE+1Z9bEu WUjKisfYKQ6/l7YMPVHOMoHnrcaAHB6sG9QjN7Ok3+vCsZ4YIfYqU3ochXAzH2IAyUGnPwC9OwT +TZeNuL6WqUe2iGbPdi9oUfFBuUa/RZypIBoGrRuYgTvtb58ZzC2QPT0vjk/IGhanSZ5qj5NMMH rXJYfQfCVkiFwtJnv3dNCFp1tYUKN9llpJcXc6lubgoEdC7/GTx0dtX+7FYHvC7BO70cw/o2jDG N+J/qMDjOo75GrRk12t+Z1rq9GI/OvWPjzc21V3 X-Received: by 2002:a05:6a20:d090:b0:3dd:a196:309f with SMTP id adf61e73a8af0-3de0e9901bdmr6090359637.79.1790373006784; Fri, 25 Sep 2026 14:50:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 01/14] target/arm: Parenthesize tbflags arguments in TBFLAG macros Date: Fri, 25 Sep 2026 14:49:51 -0700 Message-ID: <20260925215004.456336-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::10; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x10.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, UPPERCASE_50_75=0.008 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1790373059199158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- target/arm/cpu.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index e3f931dba26..8c50e91004d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2583,21 +2583,21 @@ FIELD(TBFLAG_A64, MTX, 49, 2) * word either is or might be 32 bits only. */ #define DP_TBFLAG_ANY(DST, WHICH, VAL) \ - (DST.flags =3D FIELD_DP32(DST.flags, TBFLAG_ANY, WHICH, VAL)) + ((DST).flags =3D FIELD_DP32((DST).flags, TBFLAG_ANY, WHICH, VAL)) #define DP_TBFLAG_A64(DST, WHICH, VAL) \ - (DST.flags2 =3D FIELD_DP64(DST.flags2, TBFLAG_A64, WHICH, VAL)) + ((DST).flags2 =3D FIELD_DP64((DST).flags2, TBFLAG_A64, WHICH, VAL)) #define DP_TBFLAG_A32(DST, WHICH, VAL) \ - (DST.flags2 =3D FIELD_DP32(DST.flags2, TBFLAG_A32, WHICH, VAL)) + ((DST).flags2 =3D FIELD_DP32((DST).flags2, TBFLAG_A32, WHICH, VAL)) #define DP_TBFLAG_M32(DST, WHICH, VAL) \ - (DST.flags2 =3D FIELD_DP32(DST.flags2, TBFLAG_M32, WHICH, VAL)) + ((DST).flags2 =3D FIELD_DP32((DST).flags2, TBFLAG_M32, WHICH, VAL)) #define DP_TBFLAG_AM32(DST, WHICH, VAL) \ - (DST.flags2 =3D FIELD_DP32(DST.flags2, TBFLAG_AM32, WHICH, VAL)) + ((DST).flags2 =3D FIELD_DP32((DST).flags2, TBFLAG_AM32, WHICH, VAL)) =20 -#define EX_TBFLAG_ANY(IN, WHICH) FIELD_EX32(IN.flags, TBFLAG_ANY, WHICH) -#define EX_TBFLAG_A64(IN, WHICH) FIELD_EX64(IN.flags2, TBFLAG_A64, WHICH) -#define EX_TBFLAG_A32(IN, WHICH) FIELD_EX32(IN.flags2, TBFLAG_A32, WHICH) -#define EX_TBFLAG_M32(IN, WHICH) FIELD_EX32(IN.flags2, TBFLAG_M32, WHICH) -#define EX_TBFLAG_AM32(IN, WHICH) FIELD_EX32(IN.flags2, TBFLAG_AM32, WHIC= H) +#define EX_TBFLAG_ANY(IN, WHICH) FIELD_EX32((IN).flags, TBFLAG_ANY, WHIC= H) +#define EX_TBFLAG_A64(IN, WHICH) FIELD_EX64((IN).flags2, TBFLAG_A64, WHI= CH) +#define EX_TBFLAG_A32(IN, WHICH) FIELD_EX32((IN).flags2, TBFLAG_A32, WHI= CH) +#define EX_TBFLAG_M32(IN, WHICH) FIELD_EX32((IN).flags2, TBFLAG_M32, WHI= CH) +#define EX_TBFLAG_AM32(IN, WHICH) FIELD_EX32((IN).flags2, TBFLAG_AM32, WH= ICH) =20 /** * sve_vq --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373088; cv=none; d=zohomail.com; s=zohoarc; b=RDdjnpQanf/RuJWmn8N0ylhu4/lU3DP3Z1XYeaBCcVmnIkPRWybeMkQRyL6uIbDNEoCzzxpsBJsIH9FX+XK3n5+EClO01vdJw8U748DjjH8kayUIZbhQvA+L2R/mID/zz5gpIu50GKsbAAMuGBGf8JEWu1uB4LiAkcrqmDkhTYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373088; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qQqLleq9jFwQAu2DlMr3Yg7KtY0N4jXoARR7q/EhAVQ=; b=UeUv86GPraOH9WThzG8bdq7alI9z3K8+KZ5fKqdK1TbK4PbjAXwc1G5diyCZz/I4B2fWNOx3wPmILRWySjwsdvYqKbR5CLoTEqYoJC19oNCKx0DOIqO7+WpQwOYITxcwIQrGcMnMl5Dx24M5iZWjBhhptaiRPw2crqK3d+XVkto= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373088163503.24174741416664; Fri, 25 Sep 2026 14:51:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADok-0007zz-Ub; Fri, 25 Sep 2026 17:50:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoA-0007lW-Pz for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:26 -0400 Received: from mail-pz2-x0d.google.com ([2607:f8b0:4864:3b::d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo6-0007lO-O6 for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:18 -0400 Received: by mail-pz2-x0d.google.com with SMTP id d2e1a72fcca58-86efece610cso742202b3a.0 for ; Fri, 25 Sep 2026 14:50:11 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373010; x=1790977810; 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:content-type; bh=qQqLleq9jFwQAu2DlMr3Yg7KtY0N4jXoARR7q/EhAVQ=; b=B86r2nny4NPFGJHUz7FBMiswKMAfytCjAEIT+VMGbOfnNJDh9afkushUsB8CPqVQ2b g4JtkULiBM45uwVklpHHB9AXK9F/iv2kLElSyWzwmSNMNFr2Epo2bRzU4vsnQybfkqe/ +FqJ40n0tu0a0xNmcvHi/DNbvjix0TSQXIOJE4GUN/OWjy+mdm+93tM/HrwQuHxtZ8Dv MPl/ynKdExyZ4wv1lNPqNVzYTAaTHeJh2TJqia73h5AxY/FdfNu7aPVMcknCwwv5ASDU HVNPkPIbN9kw+MtqUy5kGlWO/gjI2B+jYKnq4N7p6a/QPIaWet5aRLl0NpGjU1bjmJSo oxug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373010; x=1790977810; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=qQqLleq9jFwQAu2DlMr3Yg7KtY0N4jXoARR7q/EhAVQ=; b=qgVMUOTzjCKibMgOJc9VuGn/yAvDv9OhboiUIrvSRkjbrJoJC1ksA5AMYtZ94AYx/2 bHQDwI1iFmehPtgpQgV5cj6jzfRer8bAZArKJC67j5yp5Uu52FWGsFvqRz3/w/i4sZFz 703VQf+v62YELyNDr1kDatPRGDgnMl4lbRmOqwvvhvrM1UD/tQNOVtJnaJVL6XYJXr0L 8nfpVEG7bPNADBf6Qy2SR64g4woebFw4wQY+bCPqGPUXF7SetTgEVrnBd5qRSDHEBV4H VLWjb47q1+asHQA5Txwg7e6E+l2uLvMOCieh6f9RBSt7dv4wnHnJRe9SAzG6dnNJ6V/S bvCg== X-Gm-Message-State: AFuF++lBRQAJ2QsqfRKc2wUVmWDGNvnFIiMT5/m6oAURYnnlOzIK+VoQ LzgkKCgSLCYWt/ldkzfI7RzaSzL5JAKPzDD7Yeg7pGaMaA7jFmg2p0imrB/DECsnx2RCr1sd9u4 zUPg5 X-Gm-Gg: AYBFou2pKIWN0z7xfqc1KrHkOfMdgtccUs0O4REvVBwCnkPqB7pVfRbBEeEZMvJi3zQ wro9/HVhkpQz6sRuoYQltIl0aQJAiJQnfizUvJZCFjXd259UpigtaRclvE78VS0iFq73BsKNuuA v7NTzvCzkkdw2g6LMHj5rIk5swPoG6ctDIBBaTqUMB53GXjODyggjnP8SKRkELpRJbe1u++LQlJ HbzmUTMBXL1XxPqSJ3xqMZ9xGsylruBZJUFPNRLTJX3c9O4hV8a9sP3IXzRNCu+NV/hhpP8fbTB pJIqExb/u2BIfDHZhZh88p59skHmIAimFm2ekeInSdX235jGQRurFW/vWK0LsDCzh7zjBIORB3X b03UEmPEDZEo7FM4Elo1PYa6u2atIKQ6wLFBqoJd6uLMd7/IesXGNTbqUTo44+cn6+sUlQIymSu Hz9YjRQ6Y6ROOWFh7LkqxJdjSRgCbvwWQ2lbVzYtj9DHuCB60s7jBu00UVsXPTIHgOI0hfnpbUT 0+X6Aem5YWarSoqq/JbzogKZIQO9A== X-Received: by 2002:a05:6a00:761b:b0:880:d865:dbb8 with SMTP id d2e1a72fcca58-880d865e130mr1304507b3a.7.1790373008178; Fri, 25 Sep 2026 14:50:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 02/14] target/arm: Reorg rebuild_hflags_common* Date: Fri, 25 Sep 2026 14:49:52 -0700 Message-ID: <20260925215004.456336-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::d; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x0d.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, 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: qemu development 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: 1790373088782158500 Content-Type: text/plain; charset="utf-8" Invert the call ordering of rebuild_hflags_common_32 and rebuild_hflags_common vs the rest of the flags setting. Signed-off-by: Richard Henderson --- target/arm/tcg/hflags.c | 44 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index c7739fc61b2..eb1aff91d5f 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -87,9 +87,10 @@ bool access_secure_reg(CPUARMState *env) } =20 static CPUARMTBFlags rebuild_hflags_common(CPUARMState *env, int fp_el, - ARMMMUIdx mmu_idx, - CPUARMTBFlags flags) + ARMMMUIdx mmu_idx) { + CPUARMTBFlags flags =3D {}; + DP_TBFLAG_ANY(flags, FPEXC_EL, fp_el); DP_TBFLAG_ANY(flags, MMUIDX, arm_to_core_mmu_idx(mmu_idx)); =20 @@ -100,28 +101,27 @@ static CPUARMTBFlags rebuild_hflags_common(CPUARMStat= e *env, int fp_el, return flags; } =20 -static CPUARMTBFlags rebuild_hflags_common_32(CPUARMState *env, int fp_el, - ARMMMUIdx mmu_idx, - CPUARMTBFlags flags) +static void rebuild_hflags_common_32(CPUARMTBFlags *flags, CPUARMState *en= v) { bool sctlr_b =3D arm_sctlr_b(env); =20 if (sctlr_b) { - DP_TBFLAG_A32(flags, SCTLR__B, 1); + DP_TBFLAG_A32(*flags, SCTLR__B, 1); } if (arm_cpu_data_is_big_endian_a32(env, sctlr_b)) { - DP_TBFLAG_ANY(flags, BE_DATA, 1); + DP_TBFLAG_ANY(*flags, BE_DATA, 1); } - DP_TBFLAG_A32(flags, NS, !access_secure_reg(env)); - - return rebuild_hflags_common(env, fp_el, mmu_idx, flags); + DP_TBFLAG_A32(*flags, NS, !access_secure_reg(env)); } =20 static CPUARMTBFlags rebuild_hflags_m32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx) { - CPUARMTBFlags flags =3D {}; - uint32_t ccr =3D env->v7m.ccr[env->v7m.secure]; + CPUARMTBFlags flags =3D rebuild_hflags_common(env, fp_el, mmu_idx); + uint32_t ccr; + + rebuild_hflags_common_32(&flags, env); + ccr =3D env->v7m.ccr[env->v7m.secure]; =20 /* Without HaveMainExt, CCR.UNALIGN_TRP is RES1. */ if (ccr & R_V7M_CCR_UNALIGN_TRP_MASK) { @@ -146,8 +146,7 @@ static CPUARMTBFlags rebuild_hflags_m32(CPUARMState *en= v, int fp_el, if (arm_feature(env, ARM_FEATURE_M_SECURITY) && env->v7m.secure) { DP_TBFLAG_M32(flags, SECURE, 1); } - - return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); + return flags; } =20 /* This corresponds to the ARM pseudocode function IsFullA64Enabled(). */ @@ -277,10 +276,14 @@ static bool arm_d32dis(CPUARMState *env, int cur_el) static CPUARMTBFlags rebuild_hflags_a32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx) { - CPUARMTBFlags flags =3D {}; - int el =3D arm_current_el(env); - uint64_t sctlr =3D arm_sctlr(env, el); + CPUARMTBFlags flags =3D rebuild_hflags_common(env, fp_el, mmu_idx); + int el; + uint64_t sctlr; =20 + rebuild_hflags_common_32(&flags, env); + + el =3D arm_current_el(env); + sctlr =3D arm_sctlr(env, el); if (aprofile_require_alignment(env, el, sctlr)) { DP_TBFLAG_ANY(flags, ALIGN_MEM, 1); } @@ -323,7 +326,7 @@ static CPUARMTBFlags rebuild_hflags_a32(CPUARMState *en= v, int fp_el, =20 DP_TBFLAG_A32(flags, D32DIS, arm_d32dis(env, el)); =20 - return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); + return flags; } =20 /* @@ -392,7 +395,7 @@ static int fpmr_exception_el(CPUARMState *env, int el) static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *env, int el, int fp_e= l, ARMMMUIdx mmu_idx) { - CPUARMTBFlags flags =3D {}; + CPUARMTBFlags flags =3D rebuild_hflags_common(env, fp_el, mmu_idx); ARMMMUIdx stage1 =3D stage_1_mmu_idx(mmu_idx); uint64_t tcr =3D regime_tcr(env, mmu_idx); uint64_t hcr =3D arm_hcr_el2_eff(env); @@ -672,8 +675,7 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *en= v, int el, int fp_el, if (cpu_isar_feature(aa64_fpmr, env_archcpu(env))) { DP_TBFLAG_A64(flags, FPMR_EL, fpmr_exception_el(env, el)); } - - return rebuild_hflags_common(env, fp_el, mmu_idx, flags); + return flags; } =20 static CPUARMTBFlags rebuild_hflags_internal(CPUARMState *env) --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373069; cv=none; d=zohomail.com; s=zohoarc; b=bPnUNF/w6sxJti/DljepWpG3oUrgF3ahR13RHb8owhm6ZG6KhAKWGr2/0kEQZEvJmifmKaGacm06DgybbeeP6q3AqZzy4mKroWuCO4eP9bYs/CQu+qWTY0KqPfoQgu7mGQuHxUlTzgIYwYQf5jrW292KrI8Rr5cfAha7q1Q0g/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373069; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tMmCze3sPkjcYyDerNEGCIJ6B0dT/d1kXK1wyuv2STI=; b=T20dR8VAafi7VhMtBoeri8/sS9IrUB7eo2VN2/7sZXSNy+0uD0Xzvu50LamNPZBWLultc6KEw1i8ID4BusT1Opk1hbXhIWoaFsKxOMAUI0bmDiwTrwNENYlCydnUcJXJK76kpAhoKkwG2jmmDr/0AuCmP4QaSH9Aw5FHJ/LT1NE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373069489654.0385569847153; Fri, 25 Sep 2026 14:51:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADod-0007zg-Qn; Fri, 25 Sep 2026 17:50:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADo8-0007lH-It for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:22 -0400 Received: from mail-pz2-x0c.google.com ([2607:f8b0:4864:3b::c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo2-0007kz-JC for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:12 -0400 Received: by mail-pz2-x0c.google.com with SMTP id d2e1a72fcca58-8804b59404aso532754b3a.3 for ; Fri, 25 Sep 2026 14:50:10 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373009; x=1790977809; 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:content-type; bh=tMmCze3sPkjcYyDerNEGCIJ6B0dT/d1kXK1wyuv2STI=; b=UBaEPMcR6brwWeQ72IchlW1/NeZeEHX9x9X5lB+fSCYFK2poxXC3TuESTTFZh5p4Ti GPtfv/5PbQ4pnCOMzBxJxfbvLO9wlbLhfTn2bFxIjbOjnXhFsIDFLIQQGMvP88Vb/DJd qX3DVz3sdw8KxnWE4ELOY01QI944ilLkESakXdX0SL6LfGwa8yOXXbHfbKPU3sHlbgKZ DAw8dhckubq9AKcl0xOjTGBrk2TrLlhbU6zCOXt+JOBov3NLB8W9NyWmfQt1/zV7OjXz X80UEosLAQg+p9kERFo9V9QplVX2CMd1bgAUVxemd4d2h2gAJe01EE8USh8UU7EkfmAC NQFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373009; x=1790977809; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=tMmCze3sPkjcYyDerNEGCIJ6B0dT/d1kXK1wyuv2STI=; b=x7TyA6Yiyz5Su8/qg72OhGJsHTqE3M0c0MH510k9gcAFetMYnKJzLeo5To8rzVO2z6 l8L15I9FlYyVr2v7+FTZrL3EZK76mJ7qZ+/KWFxjKposz8Sl1BOz5nqcVMcct4pEy08U r/CesKMS34LyDVKnHRk5rfdvRhtOaUxechg7sM+NKxQ+0j6G9VkVRLnTW/9TN8p0Wod5 gbF5OWqYMtgHcBlT66mMzzBorSrFM3pDb6uLhdcVx9s68lLIsvzKneB4Ld9k2LvdxmG/ u2OSgb+MVjLCY0DbhF7UwUHgrYzyTJhnptuNrKhMPcPNoJa3IMnBLZLLlnkBNwLFcNsZ Afjw== X-Gm-Message-State: AFuF++nRz58wIHEQoVI47ZrNh3HTe03NWCQhveYCwLRL6xP7bZkrTu0e tBl9JnQ/fYlTvRtWp13NZy4rQyxv2TkG48eyMaLv1WawFufwoeWIL5T7lWWSB1sX6Sb70Z/in71 Tij7C X-Gm-Gg: AYBFou258FJ2jU8ysrDjd8EuHARB7BxRx3bGvAPODND0ka81dDFQJ0FNY50M30Wobg6 0kO01OZiec9gnvG+pebUr80Q5KfjtqcylLA8PQjS8Dos5ChD77mHNCBk2hwM3l58Tu7TYYTnTzQ vfqePvTTWIdHrBPywnpgBc44Ldg6+MCAqvsljr8d7XbQPsLPcQYP+MqbQdYVtLonCaU+dBZTAEa Uj7ZKGTxWBapNsoSmuyi1Cfjw+WPPen5BkuaAW4ZtTziisGct0UCIMt60tppEyMpUdcJHMIv4BZ TuXvKFWhkDLeyARgz9pPVxumhL6jwWe5u43A0eF5VmU/hcoGGAPPTvFXl2y55eqlPKYHB0pXPIC ++jnc4Qk8AuE0eNmEkv6SJkT7osun+v+Arg5OJR5UOZ2bG0KiLRmoHxAkvl07TfvSwS6p+PGuvi OlNErdLJMrH36vUfOsGiISj4xd6vhXN1W5bFlVgY2Op1uWAtoUVlSMNioVMwdHVt6TQ2INL3EDe fLJ5mctGuKV5undxymu/VlPA+32pro= X-Received: by 2002:aa7:88ce:0:b0:874:32d1:d3d8 with SMTP id d2e1a72fcca58-87e99568188mr5692465b3a.21.1790373009056; Fri, 25 Sep 2026 14:50:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 03/14] target/arm: Split out rebuild_hflags_common_aprofile Date: Fri, 25 Sep 2026 14:49:53 -0700 Message-ID: <20260925215004.456336-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::c; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x0c.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, 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: qemu development 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: 1790373071415158500 Content-Type: text/plain; charset="utf-8" Alignment, FGT, and IL are common to a32 and a64, though the latter comes from different places. Signed-off-by: Richard Henderson --- target/arm/tcg/hflags.c | 65 +++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index eb1aff91d5f..8da02ae1ecf 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -114,6 +114,24 @@ static void rebuild_hflags_common_32(CPUARMTBFlags *fl= ags, CPUARMState *env) DP_TBFLAG_A32(*flags, NS, !access_secure_reg(env)); } =20 +static void rebuild_hflags_common_aprofile(CPUARMTBFlags *flags, + CPUARMState *env, int el, + uint64_t sctlr, bool il) +{ + if (il) { + DP_TBFLAG_ANY(*flags, PSTATE__IL, 1); + } + if (aprofile_require_alignment(env, el, sctlr)) { + DP_TBFLAG_ANY(*flags, ALIGN_MEM, 1); + } + if (arm_fgt_active(env, el)) { + DP_TBFLAG_ANY(*flags, FGT_ACTIVE, 1); + if (fgt_svc(env, el)) { + DP_TBFLAG_ANY(*flags, FGT_SVC, 1); + } + } +} + static CPUARMTBFlags rebuild_hflags_m32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx) { @@ -284,9 +302,8 @@ static CPUARMTBFlags rebuild_hflags_a32(CPUARMState *en= v, int fp_el, =20 el =3D arm_current_el(env); sctlr =3D arm_sctlr(env, el); - if (aprofile_require_alignment(env, el, sctlr)) { - DP_TBFLAG_ANY(flags, ALIGN_MEM, 1); - } + rebuild_hflags_common_aprofile(&flags, env, el, sctlr, + env->uncached_cpsr & CPSR_IL); =20 if (arm_el_is_aa64(env, 1)) { DP_TBFLAG_A32(flags, VFPEN, 1); @@ -297,17 +314,6 @@ static CPUARMTBFlags rebuild_hflags_a32(CPUARMState *e= nv, int fp_el, DP_TBFLAG_A32(flags, HSTR_ACTIVE, 1); } =20 - if (arm_fgt_active(env, el)) { - DP_TBFLAG_ANY(flags, FGT_ACTIVE, 1); - if (fgt_svc(env, el)) { - DP_TBFLAG_ANY(flags, FGT_SVC, 1); - } - } - - if (env->uncached_cpsr & CPSR_IL) { - DP_TBFLAG_ANY(flags, PSTATE__IL, 1); - } - /* * The SME exception we are testing for is raised via * AArch64.CheckFPAdvSIMDEnabled(), as called from @@ -397,14 +403,17 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *= env, int el, int fp_el, { CPUARMTBFlags flags =3D rebuild_hflags_common(env, fp_el, mmu_idx); ARMMMUIdx stage1 =3D stage_1_mmu_idx(mmu_idx); - uint64_t tcr =3D regime_tcr(env, mmu_idx); - uint64_t hcr =3D arm_hcr_el2_eff(env); - uint64_t sctlr; + uint64_t sctlr =3D regime_sctlr(env, stage1); + uint64_t tcr, hcr; int tbii, tbid, mtx; =20 + rebuild_hflags_common_aprofile(&flags, env, el, sctlr, + env->pstate & PSTATE_IL); + DP_TBFLAG_ANY(flags, AARCH64_STATE, 1); =20 /* Get control bits for tagged addresses. */ + tcr =3D regime_tcr(env, mmu_idx); tbid =3D aa64_va_parameter_tbi(tcr, mmu_idx); tbii =3D tbid & ~aa64_va_parameter_tbid(tcr, mmu_idx); mtx =3D cpu_isar_feature(aa64_mte_mtx, env_archcpu(env)) ? @@ -415,6 +424,7 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *en= v, int el, int fp_el, DP_TBFLAG_A64(flags, TBID, tbid); =20 /* E2H is used by both VHE and NV2. */ + hcr =3D arm_hcr_el2_eff(env); if (hcr & HCR_E2H) { DP_TBFLAG_A64(flags, E2H, 1); } @@ -465,12 +475,6 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *e= nv, int el, int fp_el, } } =20 - sctlr =3D regime_sctlr(env, stage1); - - if (aprofile_require_alignment(env, el, sctlr)) { - DP_TBFLAG_ANY(flags, ALIGN_MEM, 1); - } - if (arm_cpu_data_is_big_endian_a64(el, sctlr)) { DP_TBFLAG_ANY(flags, BE_DATA, 1); } @@ -525,18 +529,9 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *e= nv, int el, int fp_el, } } =20 - if (env->pstate & PSTATE_IL) { - DP_TBFLAG_ANY(flags, PSTATE__IL, 1); - } - - if (arm_fgt_active(env, el)) { - DP_TBFLAG_ANY(flags, FGT_ACTIVE, 1); - if (FIELD_EX64(env->cp15.fgt_exec[FGTREG_HFGITR], HFGITR_EL2, ERET= )) { - DP_TBFLAG_A64(flags, TRAP_ERET, 1); - } - if (fgt_svc(env, el)) { - DP_TBFLAG_ANY(flags, FGT_SVC, 1); - } + if (EX_TBFLAG_ANY(flags, FGT_ACTIVE) && + FIELD_EX64(env->cp15.fgt_exec[FGTREG_HFGITR], HFGITR_EL2, ERET)) { + DP_TBFLAG_A64(flags, TRAP_ERET, 1); } =20 /* --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373186; cv=none; d=zohomail.com; s=zohoarc; b=dT3WxBe0aRrHP6QooN0j7mjj5oDHGYLUu9SvouHm/UKvISVdS9j47FdtCZxNXW2hviLIuMOEEWXU/OUZORybMO8oJBRJ8+h4TlxiHPyp8Ro+AfmKwW/3F0ZlY9THF6pSfsfpjmBMJ5hn5aQjnAZw3Ij/pOv4PEuJ4EyJkGbfDcA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373186; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=001YOUzeDy/jRJu+XV/XxZMtl8V6MI8QjkzCy6iHGME=; b=TptkFTXLHstd6lCgT7E7UBrjU4nc7BNKCAnzdKCQQo57jrb6fmyl9PYN8mDTp4vXhzbUsXnzu4iMhvv1vv99qM7RH9PuFsL/SWkZhtyky0Z9d2GjzrwrNLtYikeOzBbToeueHLh2M8pJfZCwYuXvNp0w5qQ5Z2J33M83q7p+BuA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 179037318665485.67852057896005; Fri, 25 Sep 2026 14:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADos-000890-2o; Fri, 25 Sep 2026 17:51:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADo9-0007lN-Kp for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:24 -0400 Received: from mail-pz2-x0c.google.com ([2607:f8b0:4864:3b::c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo3-0007lG-DF for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:17 -0400 Received: by mail-pz2-x0c.google.com with SMTP id d2e1a72fcca58-87fd84c0bfeso450598b3a.3 for ; Fri, 25 Sep 2026 14:50:10 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373010; x=1790977810; 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:content-type; bh=001YOUzeDy/jRJu+XV/XxZMtl8V6MI8QjkzCy6iHGME=; b=htJsajGd7amyCSGnU6uyJWcfKWvvtUYC0IX80n8n3iMgYGxIS/ne2XNp6j80/EXvrJ /DcDMLkkfcrqIvL9iBbcijwGNKqELPKXFP7SAgnFt/ZhN8ArQzsssVsv9m/McMmKHTZX cbFWZWRKsmT+a++qbZkqAE/x/H1q6eZzvXMlVj0vCrvI296LGe5CxPcBma/WHMSBRxDO FW/OW1DQ//cq+cedHbUkAbIGODzJu9YZ927kUjOrThmMkAmZl1ux0EHr/3mQkMMRHuWO STTfTXwH5WdeP9ORDWAj0jol5EU04Wj7mdiXAwsUISzl+utvaMqnWAl8i057MpZawjVA AkFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373010; x=1790977810; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=001YOUzeDy/jRJu+XV/XxZMtl8V6MI8QjkzCy6iHGME=; b=oq84GBINef76W3EiDGRmLadMOxKDbz1qjlajvvnYgTvgodZa+rwq/Fk45F5PaAt315 WAyAuXXeQre9F21SvgoJ+GBkgH08+T1/S0cepo3ksDHuEz+PF3m4v51OR2qKCU2mMvcO QkMn0fmwUg4V7sw08YGTy4B+L7DkKlkpoId8mmsimyxZOzgUMQUdPzmnEjJSlo00WJjx pZHCVGa5UyHT+tTICQuUC/RW50PdqIhXEAvVDHYsueKMAKCwQubUZHVSCmIiJYxpYVpD R1HY0OoG6v0ZBswDWhnGE7V3Wa7iI5ZJSo6ti2qYh/sMnNuSDdV6jfbqrlSrtLVuKHF5 eVOQ== X-Gm-Message-State: AFuF++mMDSygpBC8qnXv6ivonlvXqCYHQep+948ca0/aGrRP+//NAzTt iwT6ZHBol+qFnQJd+IXHzDG8qa+L0NkhRFHecNbVHzBd+s4eNR7knWqh5LW/u0/V+sc2bUIiCkC jIOH7 X-Gm-Gg: AYBFou22qx9LSMJus69saupS2BJkOtErs5FKndiwTbTV9skNHDglkkuITvK3/wB2I1K cBfEbMAi3zEaC28V+LHFyLNHbXGtEcOvPAtGbDaC/1SmDthlGP4qXG7i2Z0vbBJeM3K+t3Kwguy ApQv1MAApEBs9BCX5Pm6FzfODzVNruqihI0dHgSuqkVnmrOjU5INxEBNv26WsuQDwONI92jo4eU BPDGff5sMxfKdQDEIorz9xT1BhYUarJjp3bbnMgMh6wgDTym3CUkv7b2F6hoIfJM9TzD9Tkzaq6 AqnQf51wxSUPyGvE1Y/KqQ3J0cfkCBB0489t9Kzx9b0jHAJ9cTrRsekpCkpWM7mLnrgzmBf4poj zwZl8dOtFHR+qdpmr4UmMb0znmrm7KUsQDNW9Mxs/y6tm+j2hR8xcQestz4+0n/pJ0dThQSSIqv 45Nz+Ha7wODZYwVSLwvAzFZg7R8uO9AwGoS9dnucz8ytJ7d8upa6X/wgNREqRybx3AJG/joJ/Eb beoS7C6Ohs6z69APCixJtPFtouc94bKJ0NIq3+d X-Received: by 2002:a05:6a00:1884:b0:878:3783:8a4c with SMTP id d2e1a72fcca58-87e9be753f1mr6413242b3a.52.1790373009693; Fri, 25 Sep 2026 14:50:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 04/14] target/arm: Sort BE_DATA toward the top of rebuild_hflags_a64 Date: Fri, 25 Sep 2026 14:49:54 -0700 Message-ID: <20260925215004.456336-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::c; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x0c.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, 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: qemu development 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: 1790373187265158500 Content-Type: text/plain; charset="utf-8" This is the last of the "ANY" class of flags. Sort to the top with the other "ANY" flags. Signed-off-by: Richard Henderson --- target/arm/tcg/hflags.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 8da02ae1ecf..cf7d49be908 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -412,6 +412,10 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *e= nv, int el, int fp_el, =20 DP_TBFLAG_ANY(flags, AARCH64_STATE, 1); =20 + if (arm_cpu_data_is_big_endian_a64(el, sctlr)) { + DP_TBFLAG_ANY(flags, BE_DATA, 1); + } + /* Get control bits for tagged addresses. */ tcr =3D regime_tcr(env, mmu_idx); tbid =3D aa64_va_parameter_tbi(tcr, mmu_idx); @@ -475,10 +479,6 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *e= nv, int el, int fp_el, } } =20 - if (arm_cpu_data_is_big_endian_a64(el, sctlr)) { - DP_TBFLAG_ANY(flags, BE_DATA, 1); - } - if (cpu_isar_feature(aa64_pauth, env_archcpu(env))) { /* * In order to save space in flags, we record only whether --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373186; cv=none; d=zohomail.com; s=zohoarc; b=TLIGYs9hv1WmHm5K+fA+cj2e+WgNfoC5sTUX2nLcQ4jY5Sg12o31BSVYkPl44OyJYuiUwF33ElXkPLzL/quVKOhimFoKGcrRpOIrobcS+4Zi9MCqDOrm0Kv3qpJmjT2xAyqZ4fhxtizh44EQKuu5zaUgtqwPzJd4z6CC4TOn4rs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373186; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FSdoU+FSdyC2v2sCymw+VLzuXFDHBTG/nVBUdUuu2oQ=; b=WECUeSYamP97ObDgwJFWGd44Z/uswCnNrfoKylOeRzOawVSjP2RPw2qMKJ/SdM5eaE/VDg1rew9ypG/iIR4pv8fXEID1WYCvySwH8g7FgQVAjnGIQHkbUMmWMjcJDBZBshleih6VJhr7ixEc/ej4iRLINvi2FXsySBDQ8No2MOo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373186457206.27870222033573; Fri, 25 Sep 2026 14:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADos-00088w-26; Fri, 25 Sep 2026 17:51:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoA-0007lX-Uy for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:26 -0400 Received: from mail-pz2-x10.google.com ([2607:f8b0:4864:3b::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo8-0007lY-3L for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:18 -0400 Received: by mail-pz2-x10.google.com with SMTP id d2e1a72fcca58-85469e211a0so785080b3a.1 for ; Fri, 25 Sep 2026 14:50:11 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373010; x=1790977810; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=FSdoU+FSdyC2v2sCymw+VLzuXFDHBTG/nVBUdUuu2oQ=; b=oSUPkG0IbLLFMeCHwKMmHULvNzGxZPEESwFEr2vlDCmmcVHah7zaDRVo5kIX6O8DH8 YmFnbXyVx/Ar/WH32E/kixuf6MAXuPiUFWNW3nacncrdBUaUs6dfUeVNbc8d2UoGeWqm f4mvtwMgyw3bv7w0FZ3MIwLFIDrRdi9AxeEK8mxRRQ33Eciia/tidZsmIIWBvMT4kY9g N/iaKcVFGnFxmA6VxaCPhttIBVMZZV7rzqREQ0d9srA/tCD24TWphw+wGrIw/S7OkBmI +A47GGuYC3i+OXD5RmOBSRW/yQGqjo7jB++SvG+/GeRqIq7G6MlozHuvYvyvVRqZU9xR G5ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373010; x=1790977810; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=FSdoU+FSdyC2v2sCymw+VLzuXFDHBTG/nVBUdUuu2oQ=; b=qb1H12La8ydPQvS2Dh5T8PSX7peme0u7vNSOROYPo+CpBcuRFVoyoCq4tOvhIEAEqi o83G7W1lFCpDgSZ2RW0MJBBq4l89SdM821569TpkZmx+EdvlEcEBbtEmErFquY2hnyYc sE/jqYxN2+8fXNvVqvXBKmhA9zwU+n9iKjlvg7AjnhnaT23d99gvVQIah0Rp6JwYMufQ 24ggtw5yxCSUSr9tM3jRDwdq8cZUBwkAdOyFKwyvHHtA0UZoJrli78U4oWd+oEH99Jws eVj747WaODLBeKgR2+I5NzpcSm3cjbIci2lUmcVWr/jy729LE4poLWfX5B525Ouih8dV nzcA== X-Gm-Message-State: AFuF++kCvc9zkcnduu9s6iplEt+AvwOmLZk5DyixYWB7sH487vVMwsPZ +zwR8TaGlcIAavvJIvSTzxPf86qAHhjDP+lW2N1g6YXgkfsAK+iAL1bH5qozTStx0B8J8veqpQV Jm2jQ X-Gm-Gg: AYBFou396xpRe9FatYbChyXY9B3gF2F0hblzEF9Yb0RRQH7Vj2GctgQSpjrcJZw8vPU Rpw+KdNNGmHmYBdompAurQI7hC+8lAcFhoR9edZSbAx04QH4p0DW2l8IYqJY3ZTP9a3/BMRYnYa VoFSk7KDh4waVGsrP8ELqV7SsOXGkeKKz+ZyjrO0Z3C43fGBXHpofLhE2hPTj2GxuI2kNmHi6jw CbvRDstokZ7X9H47JspN12+wUAgCf1p/tFTP0vaLo6mLnrVjXOmb6g3dsapCo1jUlgLivjTfu4U CdGogEH9hKjmyQFP11BQ/nKHayG2H0EBNN6ORJH0tcEg/fTHaeQn68feriM7ay7kGf56n23CbOK L+d23rB/SwVBo/y05HYYPCgTLXEMNGO00wbpL88dOt/BIvsQ3BTWzNE4snW0UikWj+O7woLpqeJ nqZt+u7wsj/uw8Qf+/3rGcJAHT1PBnbYm0a91Favjw02Ldm71Beb8pBiSb0emVvsY390Vq6HBof wSws29b0AITvHddTogckRhhvl7PAw== X-Received: by 2002:a05:6a00:c30c:10b0:880:7dad:3e5 with SMTP id d2e1a72fcca58-8807dad12a7mr1413681b3a.51.1790373010436; Fri, 25 Sep 2026 14:50:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/14] target/arm: Move ID_AA64PFR2 feature tests together Date: Fri, 25 Sep 2026 14:49:55 -0700 Message-ID: <20260925215004.456336-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-1-richard.henderson@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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::10; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x10.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: qemu development 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: 1790373187237158500 Currently the MTE feature tests are clustered together, but those are spread across two ID registers. Sort the functions by ID reg and bitfield order, like most others. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/arm/cpu-features.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index eecbc3b889e..06318d12f9f 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1207,16 +1207,6 @@ static inline bool isar_feature_aa64_mte3(const ARMI= SARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64PFR1, MTE) >=3D 3; } =20 -static inline bool isar_feature_aa64_mteperm(const ARMISARegisters *id) -{ - return FIELD_EX64_IDREG(id, ID_AA64PFR2, MTEPERM) >=3D 1; -} - -static inline bool isar_feature_aa64_mte_store_only(const ARMISARegisters = *id) -{ - return FIELD_EX64_IDREG(id, ID_AA64PFR2, MTESTOREONLY) =3D=3D 1; -} - static inline bool isar_feature_aa64_mte_mtx(const ARMISARegisters *id) { return FIELD_EX64_IDREG(id, ID_AA64PFR1, MTEX) !=3D 0; @@ -1237,6 +1227,16 @@ static inline bool isar_feature_aa64_gcs(const ARMIS= ARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64PFR1, GCS) !=3D 0; } =20 +static inline bool isar_feature_aa64_mteperm(const ARMISARegisters *id) +{ + return FIELD_EX64_IDREG(id, ID_AA64PFR2, MTEPERM) >=3D 1; +} + +static inline bool isar_feature_aa64_mte_store_only(const ARMISARegisters = *id) +{ + return FIELD_EX64_IDREG(id, ID_AA64PFR2, MTESTOREONLY) =3D=3D 1; +} + static inline bool isar_feature_aa64_gcie(const ARMISARegisters *id) { return FIELD_EX64_IDREG(id, ID_AA64PFR2, GCIE) !=3D 0; --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373201; cv=none; d=zohomail.com; s=zohoarc; b=R0Fr6twss+Xu6dlV1VJkPScszF7ZKqFjAvXa0tJttUuLEVwDt86VrhkJsMdTjDlNqXchVuwnegDdJrFmsHZ3YW8tiGqSL1DHCHRbv1oXSWWgLsCabqT34hhXwpZpWlAXyi909tcWst5F2ZAUdJWorKivSUwIQDB0KHKkv3+qVA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373201; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qf9HpDmhr2X/BPeZxdfFZ3PfLAE7JfKlZsgAf57xaSM=; b=EA7YFOQ5pY8On3dig0r1uYyGnnhEMJxPJvxiOAcfJXMxQgZAQVsIvQEJM1nVHPyL1JCXPGAsZ7S1Eg10P2uL05Eza6tt+ojt5jrpYQzzxvzaS/d363zBBKBhSn1+dIlyeChU7DYjX36gDRBOD7dSvPe1M2avy8NQW5gWMMmGySI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373201176510.39233904465254; Fri, 25 Sep 2026 14:53:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADos-00088h-13; Fri, 25 Sep 2026 17:51:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoA-0007lV-QF for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:26 -0400 Received: from mail-pz2-x0f.google.com ([2607:f8b0:4864:3b::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo8-0007lp-4M for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:18 -0400 Received: by mail-pz2-x0f.google.com with SMTP id d2e1a72fcca58-86212a185dcso1075190b3a.1 for ; Fri, 25 Sep 2026 14:50:12 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373012; x=1790977812; 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:content-type; bh=qf9HpDmhr2X/BPeZxdfFZ3PfLAE7JfKlZsgAf57xaSM=; b=snfWqfk7Xu5HaipT/pz0RSxTc+uTKxKdICXFLYY4+ZU4leG+QNUZE63r3kOLNEuTOL pHcu76vM5JmtswXOvAjgOD2wD+ec6LzcWxXtv+QYucUNX9CVWMD/xGTjBC2ZRyzRXBfj 2MQGJjQzltcl6+nsrVBWlWHoFFp7iN8noVgH/xUtLYWmdP1kMTCmSUd5fulZfeeznvTg tHCaCRD1njYLWQyCRSmMTiXbg4RUumGTy0dccL/xmjXorgKzRRBOyNAllZaK7wliscut UQmZm/12dKjjeIke2JQYfLWJWTKiiWj5u9fgwKYxgRNpMTqClpChY3ECsxtkQFmcqM/v MNyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373012; x=1790977812; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=qf9HpDmhr2X/BPeZxdfFZ3PfLAE7JfKlZsgAf57xaSM=; b=m+vJe+0auUIqUG0rt0l360tBXOv8ZGj0iusZWdueyMEsbPHMkPfFhntKxRw3LlTMe4 oIV3IdIoBEn0S1rwpqK3TZHfVjM0/prQbzSgHs92elm9COKVfeOc5eP/xNsaenNt7cDI v7FDmIwqo2t4Pu1GBOKd2JcSP//+flQ6adKQSJt0YmyAUOVfJi6M16oTYBtDvR9ksWvz UGygK6IBg7Ezg4NYKY18io2SmNx7yX8TNoKuSe84MKt/7W3H/AH1NJL2GsFI7ioZjA2y 7M2GqOUklkOIiCQkt9d5byaYK+FOpkD3ZplN8ZSFqHFxlWqnuwHejCZTZExbcmQ7kDuL XBaA== X-Gm-Message-State: AFuF++mLPRlRtMA3nuq44nFqLS9+HP2cvPDWdpvKt3i23U5I2RbecDhW IhxOOnig5MkDG/toA+qIF7mtCs2n8e6Gl1aDNzswkWLV/5h0/SwGaRyiqV1etG/jX5JXlg6j9ga mSDhS X-Gm-Gg: AYBFou1wTGQtDB3/QCESjAoIxHTfMG+RD/3OQSxu43EJF+oZ1PoDo0EAj/yO9wFPMLA Zcl5DU4f9p/+xmFX2yN0IOJ019IrB1mTd/+qO9fKGvMcvdhF5rGVk8MmR5MloIiVrkUVVLCCwzB /syg/hgRF6QZmrI3oMcBp2cSf6MNiSJKIPLLOlfuUulsF0ObRFfB1S0OnBGE/zahLgRiPwNqB0d ge6hoUi78qH8pbadXr5tR5iQAIWbtlrBXL70SWLn4LIk1tGnQ4g901lUwzCk5Vq7YdjsPKX9/wV Wlp8XRO0k6rlVsbKiXSH5R5fW6Z2QNlEG88HVEA4TwtjbBvPfxvmge0/W8JxdpOYDXZ09qOfKa7 3iTS80knzQ7RPHsm4xTdljr2fl/l9UOBLwEll3V0lxce1Vb0g8bs12ibI0bGvO7aO7Pszx+UWXr SBj6R297/l8R7hprPCUEG1W+SPhD8r0IxICZNP5j+Q9UDJNs8Aale8syQwAmNGEzEYbHK/FFGjZ l33m22yiXD4ggL1cYkDqWMl86yM6A== X-Received: by 2002:a05:6a00:414b:b0:878:34d7:6a30 with SMTP id d2e1a72fcca58-87e9ea6226bmr5185886b3a.36.1790373011756; Fri, 25 Sep 2026 14:50:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 06/14] target/arm: Add isar_feature_aa64_uinj Date: Fri, 25 Sep 2026 14:49:56 -0700 Message-ID: <20260925215004.456336-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::f; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x0f.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, 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: qemu development 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: 1790373203482158500 Content-Type: text/plain; charset="utf-8" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu-features.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 06318d12f9f..a9eebb45564 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -290,6 +290,7 @@ FIELD(ID_AA64PFR2, MTEPERM, 0, 4) FIELD(ID_AA64PFR2, MTESTOREONLY, 4, 4) FIELD(ID_AA64PFR2, MTEFAR, 8, 4) FIELD(ID_AA64PFR2, GCIE, 12, 4) +FIELD(ID_AA64PFR2, UINJ, 16, 4) FIELD(ID_AA64PFR2, FPMR, 32, 4) =20 FIELD(ID_AA64MMFR0, PARANGE, 0, 4) @@ -1242,6 +1243,11 @@ static inline bool isar_feature_aa64_gcie(const ARMI= SARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64PFR2, GCIE) !=3D 0; } =20 +static inline bool isar_feature_aa64_uinj(const ARMISARegisters *id) +{ + return FIELD_EX64_IDREG(id, ID_AA64PFR2, UINJ) !=3D 0; +} + static inline bool isar_feature_aa64_fpmr(const ARMISARegisters *id) { return FIELD_EX64_IDREG(id, ID_AA64PFR2, FPMR) !=3D 0; --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373177; cv=none; d=zohomail.com; s=zohoarc; b=fOA89ICfZ/DEmPNTm7OeSKXwDOluoeE8+GPVZ2M7psIQ/ji4mo4y4lbYOOunZ2h/uqm3YplD7+EAJyi48BqHfOeDLIAnNbm6C0/dvDyxQhi3CAcfXTvi9UVomdSWEeSeRWw+prFe7cy8v30zHfnecbBUD50rzIgjIfJotv720Vo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373177; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KidwwYkf1WwMwb3GYWA2PIDAyv2awOr01ocgLXZNEGU=; b=YOjAT6oD5OapHTFQ+d82IF6dFWtPbef4qYFf4VTS3S3ahqE5inMsGTL2F9KADG6ZKs/XBTBbwhP3jBjkZ+J3++Xy7UXEzbJjqfICJZFgMoRa2POolAVwJzQ9j0ki1deV4V8+gdNq7PTEOBEAG8P5xPH68Rh/EwquTaLee4uChMA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373177693945.0422625954002; Fri, 25 Sep 2026 14:52:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADox-0008NM-9a; Fri, 25 Sep 2026 17:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoE-0007ld-9Z for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:27 -0400 Received: from mail-pz2-x10.google.com ([2607:f8b0:4864:3b::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo8-0007m3-B7 for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:19 -0400 Received: by mail-pz2-x10.google.com with SMTP id d2e1a72fcca58-86b90133ae8so738048b3a.1 for ; Fri, 25 Sep 2026 14:50:13 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373012; x=1790977812; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=KidwwYkf1WwMwb3GYWA2PIDAyv2awOr01ocgLXZNEGU=; b=Dcc+jE4G6nOMk2eYPFmAuXJxjhQRsRhUgXXMakyX001Bg8UnTOnCvyfburkZRhtuMk rFoImd5pqo327wuzGjXHsXFpoTDomtw1MTci32NjNtT+RDGvrhjBHjc/grfe8Hc/ejyv 2QZz5mO8hvjpkqr2hKVBsOdwKASQ95IOK3K2nRt1mCQQmO7ogirifNoF2LwvnJpw79DU 5gEqdee77EpA5lH3bvtFgDILGYCR0y0kz3SCDFh2CsBEziGVGv5bkPBk9PzvcUPjNCwR P67FQ7yjUyOtzwBZy69wpMf9g4WPWZ8aCQag+OVrvzejGOfQsjopF5KADv54aVL6N278 4ZsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373012; x=1790977812; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=KidwwYkf1WwMwb3GYWA2PIDAyv2awOr01ocgLXZNEGU=; b=ZWOprR/t8A1vdCrTJt0LxK6JSFNboQg9cUvRLOplISzNqxmnLvGNndI9ixMzS7iQ+B OpDW8mxKzI/NZRV2HJJD1L0ArWR3BHzJnTRfDko1QM4lhwIZ1ydm47oNzGCqJiA2kl5A QZl271PPt9ZIxK31idGJo6iUdO8y4R6W6BJbNvBVvEshsNLrnU3xlXRBqLA/EGQ66+7C SkFHozvpOlUXP6HmtUS8Df2bIOn2kBv5rnKC0q2TOveghGS4GuUv3j15MqKo5iKIs8qR jaXbTYXLeh6mR67kx1G6FRrSAudQ8Vwq0XO2UtyDA4pH+jPcKHLDJAET8TGDI/Ecbxv8 /MNw== X-Gm-Message-State: AFuF++lZPyMNzgBsKW9GHDot8VVO4VcV6dtb74ZhpgXG9VijoMOCk2Ew TiG4UXPbaoZh1kNCZQAPFgYx2pioXlVlbezSt2aamx4jyqJdbJJIyVzqXW5Kv1qa3kqqZt0iMIK 1ElSo X-Gm-Gg: AYBFou3HInflZU2aDwTVXqcoVD52oE0I63YSjuzv4asndTw7pGTMxmkcKxuBvAMY/Qj 8ZpQbRd6Eva4zSHcIcO7eKNuz1i40FcQejanL+wCv/VkziztGlfvySwUkaoDDc5lfCBrF93Kum4 jbdMN381QdX4c1L2muyaK0kJZKsjdqQIvwLGnrQhXs0FxaSjXV7z/zOslwxgv3Ylf2OcquP0d1w MxLnNHY0LMCxo/UpO48+4iSfz8RqVMFnUu8d1rTMQUS9GJ+icqxh1lCsDl8Affs3RTTzc4X5ZNl MZfH3/c2hQJY+pCQgtZD8VlvrigG/iuWSTskjJdqAzFoGlGbtS7NLSxJq+f8VF8medPeznlDo5Y NMLksAWhNfE5VJ3xgBHAmJbfp2LlzVOWADts6x9iigPjivlv0laKS0hW95fVjUF8D+9cUQcsv9H ocraeSJ3i4+M2z0gf74JeFu+2hU4giSkMDqzj29rJ3PGsayeXM9Ho3IH/q1vrj/Xm02Rgh9dvlK RZVyKF6lafTUje2Wkm/JFhwGIydilzr1ZoQsw7d X-Received: by 2002:a05:6a00:6c88:b0:857:7384:b5f6 with SMTP id d2e1a72fcca58-87e9946e383mr5936783b3a.18.1790373012446; Fri, 25 Sep 2026 14:50:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 07/14] target/arm: Drop U from most PSTATE bits Date: Fri, 25 Sep 2026 14:49:57 -0700 Message-ID: <20260925215004.456336-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-1-richard.henderson@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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::10; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x10.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: qemu development 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: 1790373179114158500 PSTATE is already 64-bit, but many bits are defined such that ~PSTATE_FOO accidentally clears the high bits. Except for PSTATE_N, we can just drop the qualifier. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/arm/cpu.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 8c50e91004d..d36611e04a5 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1558,26 +1558,26 @@ void pmu_init(ARMCPU *cpu); * Only these are valid when in AArch64 mode; in * AArch32 mode SPSRs are basically CPSR-format. */ -#define PSTATE_SP (1U) -#define PSTATE_M (0xFU) -#define PSTATE_nRW (1U << 4) -#define PSTATE_F (1U << 6) -#define PSTATE_I (1U << 7) -#define PSTATE_A (1U << 8) -#define PSTATE_D (1U << 9) -#define PSTATE_BTYPE (3U << 10) -#define PSTATE_SSBS (1U << 12) -#define PSTATE_ALLINT (1U << 13) -#define PSTATE_IL (1U << 20) -#define PSTATE_SS (1U << 21) -#define PSTATE_PAN (1U << 22) -#define PSTATE_UAO (1U << 23) -#define PSTATE_DIT (1U << 24) -#define PSTATE_TCO (1U << 25) -#define PSTATE_V (1U << 28) -#define PSTATE_C (1U << 29) -#define PSTATE_Z (1U << 30) -#define PSTATE_N (1U << 31) +#define PSTATE_SP (1) +#define PSTATE_M (0xF) +#define PSTATE_nRW (1 << 4) +#define PSTATE_F (1 << 6) +#define PSTATE_I (1 << 7) +#define PSTATE_A (1 << 8) +#define PSTATE_D (1 << 9) +#define PSTATE_BTYPE (3 << 10) +#define PSTATE_SSBS (1 << 12) +#define PSTATE_ALLINT (1 << 13) +#define PSTATE_IL (1 << 20) +#define PSTATE_SS (1 << 21) +#define PSTATE_PAN (1 << 22) +#define PSTATE_UAO (1 << 23) +#define PSTATE_DIT (1 << 24) +#define PSTATE_TCO (1 << 25) +#define PSTATE_V (1 << 28) +#define PSTATE_C (1 << 29) +#define PSTATE_Z (1 << 30) +#define PSTATE_N (1ULL << 31) #define PSTATE_EXLOCK (1ULL << 34) #define PSTATE_NZCV (PSTATE_N | PSTATE_Z | PSTATE_C | PSTATE_V) #define PSTATE_DAIF (PSTATE_D | PSTATE_A | PSTATE_I | PSTATE_F) --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373093; cv=none; d=zohomail.com; s=zohoarc; b=Z/GtR3qj0f/ge/PJJ4qpzfeWPVRht609GXNom4BLjy+RAEaxDcU6PqmY1mKtKtUOmnL5CucGSg6SnRID3fq6NPrOtkNWRLfNmEyv9c0nqbii67CYJtutVGU2rQWyGbPrtdDGVpA1tCU9JLK8ocqd81LZQzXhl+5NLZHNkWCR9Us= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373093; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HjvMgLvn6RxvJ1HkJmkAi10BB8HJCknUmwx4RHgl8vg=; b=ZQBCy1pv7Xh7fK+YGdt9jCMq7HX6b7jbKD2H7tNC3B0OX2U7XfioeuJaqj8PIgyzv2rwYHSEcTtgyr31HZxNqKAS/iqHMc8T4GpwvfCg3YakipdTPTx+ublsuE5Ir637HYICF6kfm00w8eFBpoxvFlvPLXj0k+iJLAtGF6E1g6w= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 179037309378292.05900013550604; Fri, 25 Sep 2026 14:51:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADot-0008E1-Kw; Fri, 25 Sep 2026 17:51:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoE-0007lq-Mi for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:27 -0400 Received: from mail-pz2-x0e.google.com ([2607:f8b0:4864:3b::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo9-0007md-CQ for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:19 -0400 Received: by mail-pz2-x0e.google.com with SMTP id 41be03b00d2f7-cc797656e69so280463a12.0 for ; Fri, 25 Sep 2026 14:50:16 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373016; x=1790977816; 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:content-type; bh=HjvMgLvn6RxvJ1HkJmkAi10BB8HJCknUmwx4RHgl8vg=; b=fbU0Kuci2iiv9SU6dXBtN26l8xGI0j5+vwwjTvSq9FGE86JiSD9QTcJ2+L9ttkcfsp q8BaZINTHLPjClYewlYXz8LdtYY8tncl5X0ENLTBuUdbFFMo/aqzEl6m4Q8CTZyRTR6n iOYe47VNHvt2w+h8k8OUiD3Vv1F1LBpOf/MtRguxEL6DdlbBCbeb3/k+6X2e7ysqfnDO uobVmL5SXu4YRWobbFqakLQyW230VHdG2pwnF7NFLCENmxWUxoD6pvIxhYQxyQidOQIB JI0IlGZgDdwxK4KdbTH0Natt3grxJ+pQAv59JxUQo17n0LtziWnZ8q2loIdKwBQbPefk +cZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373016; x=1790977816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=HjvMgLvn6RxvJ1HkJmkAi10BB8HJCknUmwx4RHgl8vg=; b=U6y8BKHoKQ2Pm5HkUWz6YxvgRBdkX6tz+VjFEl8/kBEcfJFNn4Vczjrswxmz18BNX9 x24VwJ+r/QLV/XwT1dDdk4xuihpnEcruxPM9XGol32FX174MNtSEul9HE6BqAn4SNTL7 8mcRqrbu0Bc/nFtesSMKAm3C8O6T0pxOU6B3eeNKbdi2vM8+Dox2lTxWeRNtvpPdcgUt cDqLEjg0XEt+XI9yHPzhd0sNavjW2fqRwpMMSSm8dL5SfLeFv+7yz3zsPgcyman4LGhL 9aZyKdZ/QayoX/icmIGWZkxvImgbmPrrS1XR0K/Vto79iE9mjlKmwfXl9ceIaWs4T7dQ NpnQ== X-Gm-Message-State: AFuF++kSXXbONgYjvklGirDrQ2zfpd5Vkl97zR4ddOi3dOK3L+7zz3WP mkOmvTfveIA9W7+ThyCMBcB6K20v6Im9G3Da6A8ARQ4DNd9NTKidRMRVxYggPd6AF0nn8O7tDN9 fTR7k X-Gm-Gg: AYBFou3p/4waEIbSgr2HLTDePR/luMA86/BCNHd7LFGQhFFLz7raeVeRSLjxK8YhLue XrAkF3JnHs8qg1NZDLXfgEARdl++xoUmWmOhcJB+HTgkFy+3hB30h3yCzpmmQi8m0cPwg/GBXQj LLK1JCJtdo5cgTQQ4aki3vU0sL3hc8i4nQ++lpCNNPq7ETkM8xoDIfvOjD/RsBRWGhYFjsrlMJb 9m1BvDVOHJtgQBkqwWPsT7OsWyuPxVGfpiiA9cP6eN9qMYK0UAT89MhdbL/OlYpy3KEVPMrzyjn 8Hzpt2BePjZjsexz3aLDHDpzrIgPkWy8OFdKzFcFbiHo0WcP6lPKX9FWbKd52iecWVwd0g12cTk ujmbPlps8M3sa5xcE7ZlcT/tfwW/UzhJV1yTRKKof1D+cejwEZZbBsgnWkOsfWb50B7BVDYOH7I dGPKhKXOyjYMu2juMVTpYI3ZivLJRs75R7ljSRHfdW0PGV22nOpYGcaty7vZVQ28uVCyR6fcfEA wQPe1jAqrbn5a6pA7+92DDAKwQ8bg== X-Received: by 2002:a05:6300:8053:b0:3de:1b92:a4dd with SMTP id adf61e73a8af0-3de1b92c673mr4038503637.18.1790373013703; Fri, 25 Sep 2026 14:50:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 08/14] target/arm: Clear PSTATE.UINJ when taking exceptions Date: Fri, 25 Sep 2026 14:49:58 -0700 Message-ID: <20260925215004.456336-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::e; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x0e.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, 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: qemu development 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: 1790373094910158500 Content-Type: text/plain; charset="utf-8" Clear UINJ when taking an exception. Clear UINJ when exception return is invalid. In both cases, perform the clear without feature check, since the bit is otherwise RES0. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu.h | 1 + target/arm/helper.c | 9 +++++++++ target/arm/tcg/helper-a64.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index d36611e04a5..735e777d103 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1579,6 +1579,7 @@ void pmu_init(ARMCPU *cpu); #define PSTATE_Z (1 << 30) #define PSTATE_N (1ULL << 31) #define PSTATE_EXLOCK (1ULL << 34) +#define PSTATE_UINJ (1ULL << 36) #define PSTATE_NZCV (PSTATE_N | PSTATE_Z | PSTATE_C | PSTATE_V) #define PSTATE_DAIF (PSTATE_D | PSTATE_A | PSTATE_I | PSTATE_F) #define CACHED_PSTATE_BITS (PSTATE_NZCV | PSTATE_DAIF | PSTATE_BTYPE) diff --git a/target/arm/helper.c b/target/arm/helper.c index c3f607e6d6b..0111cbeac03 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9606,6 +9606,15 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *c= s) =20 env->condexec_bits =3D 0; } + + /* + * R_XKSNJ: If FEAT_UINJ, PSTATE.UINJ is set to 0 *and* the resulting + * value stored in SPSR_ELx is 0. The new PSTATE is automatically + * handled by construction of a new value from 0; clear it from the + * old state and as UINJ is RES0 otherwise, skip the feature check. + */ + old_mode &=3D ~PSTATE_UINJ; + env->banked_spsr[aarch64_banked_spsr_index(new_el)] =3D old_mode; =20 qemu_log_mask(CPU_LOG_INT, "...with SPSR 0x%" PRIx64 "\n", old_mode); diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 9d805231a08..f76d89990c3 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -764,10 +764,12 @@ illegal_return: * mandated behaviour: * restore NZCV and DAIF from SPSR_ELx * set PSTATE.IL + * reset PSTATE.UINJ * restore PC from ELR_ELx * no change to exception level, execution state or stack pointer */ env->pstate |=3D PSTATE_IL; + env->pstate &=3D ~PSTATE_UINJ; env->pc =3D new_pc; spsr &=3D PSTATE_NZCV | PSTATE_DAIF | PSTATE_ALLINT; spsr |=3D pstate_read(env) & ~(PSTATE_NZCV | PSTATE_DAIF | PSTATE_ALLI= NT); --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373179966561.5536869305763; Fri, 25 Sep 2026 14:52:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADov-0008Ij-3Z; Fri, 25 Sep 2026 17:51:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoE-0007ln-Kp for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:27 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADo9-0007mg-DV for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:21 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-880cb967dffso409477b3a.1 for ; Fri, 25 Sep 2026 14:50:16 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373016; x=1790977816; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=AMEmlBAFtWi79NQF55/dXyLKuHzSkHvrh+ifYujfOUA=; b=xHgbYR8U7/m9/riIChd4aTpjdBw0rP0RAyuQi13n4WMlxUVXonB3dyk9MY063r+vRb nc7WOSZi9iC+gIHPqvYqZ4fZbxLtMp7eUedhNZ+5QEdQvdouo2Pq39HRhOr+Uf/jzKjz Z1CkO50lds1CWEVxMwrSPUrOBpcf3BghRoqomqAdOgl7GHU6u+LktrOQnI7p03DUD8t8 WxbmgWMbuW5WHv/FuJglMy+TJuu7iMHigMAa/1EXNYn9OqseQpgMc5ah6qZrRA2O/9FM d3D42l4WkEOgtWLm9sHemWIXLqkwocy831XzgB/mn4VW8Glauavze3gRYXpDA9Xip3JU dMEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373016; x=1790977816; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=AMEmlBAFtWi79NQF55/dXyLKuHzSkHvrh+ifYujfOUA=; b=XrtpmQliBbGQlx+XS3Y1hLFlcAAZBZ29jHq/re5bIbcfN+M3gnvkc1jFvr7iD0+jEY 2HpPt0CqNrn/AEDCvcNbp6lhn/Euum4jxvsE0T8Qy5+/0BKLUYgeXGZBeJJj13KXYzMU EQz7DUykXXONu+VXH/BHM28Nb5cbGGD0RHNwUlS9dX3sw0+FEo/30oNuHXQlVY5+yjB3 r2rJea5AookSriSwJ1dGR5gmAH4dcYIN5PdrJAyugEE6g49mzOejSBL4cmhxXAFsuVeE 53qv7nMctkVRHsINLZX1dkfV1tbHO9k3dQptujYMzkVP4hJR0vcFQIeym6aoSB0rKQGZ YjJw== X-Gm-Message-State: AFuF++lKlICx+Bi0MaE7hgkEqmytGNvQFn7++hVuixStPwnG2kpY50J/ 62FUWF85JTrZOvlV4C6Ca+6KH/AqJSVXAFwnMR3dMdsiIrghHn12XENWuXR2Vgk44uUxFDeAxpG Fn3rY X-Gm-Gg: AYBFou0nUTVIsbWQ3YMIKt5a6+9rg5ZTI8JWXG/f8RtzFpGgKj3VLIvWZfXHH4V2iAv mX/etD6fGWuinac9O5S2hC986rHSkOVWS5wIYFH503z9Mgi601Pjxc5gPX7nnf9HNSy3kXL/nBC SSa7tLVvysUnI5uyfL8ORrqgDCvOfwk6QxlWBAYAopLFdBN0j2bUlmyo5/aPT8lg9dFAsBa3uC2 qzFVt/UoGOyzyGxskISci9lXUGjDZONkN0mf4zjmKyJ6prUCPmQ8rUZFRKSSb6krImc2+pWELHh fyKaH1iASJvlq/B78sX5rF7gsVTLdoe1G/qxQzta3K7QtalVecb2w/G8+gwTxnAPZeXUD51kfUl vd3cro1DtVi50kXMVQZ1mm0U+9c8LcMRyLffTus+1Z2CWwrNRYUGeZ8RmHeybGXm7dTNJ37s9UV BXbTjjOPVXVGPBYbtKL7U/eMEIuTpiC21dpUKepRE0dD7bA35PfPfhclPa70P9qvUd8TirXbmx8 HkowTakytDZVgxBTSyQxNAaY4T+rg== X-Received: by 2002:a05:6a00:c584:10b0:880:d895:4c60 with SMTP id d2e1a72fcca58-880d8955316mr661857b3a.30.1790373015215; Fri, 25 Sep 2026 14:50:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 09/14] target/arm: Widen cpsr_{read, write}_for_spsr_elx to uint64_t Date: Fri, 25 Sep 2026 14:49:59 -0700 Message-ID: <20260925215004.456336-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-1-richard.henderson@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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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: qemu development 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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1790373181165158500 We will shortly need to handle bit 36: PSTATE.UINJ. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/arm/internals.h | 4 ++-- target/arm/helper.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 1efda543270..843e12487ec 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -2016,8 +2016,8 @@ void vfp_clear_float_status_exc_flags(CPUARMState *en= v); */ void vfp_set_fpcr_to_host(CPUARMState *env, uint32_t val, uint32_t mask); bool arm_pan_enabled(CPUARMState *env); -uint32_t cpsr_read_for_spsr_elx(CPUARMState *env); -void cpsr_write_from_spsr_elx(CPUARMState *env, uint32_t val); +uint64_t cpsr_read_for_spsr_elx(CPUARMState *env); +void cpsr_write_from_spsr_elx(CPUARMState *env, uint64_t val); =20 /* Compare uint64_t for qsort and bsearch. */ int compare_u64(const void *a, const void *b); diff --git a/target/arm/helper.c b/target/arm/helper.c index 0111cbeac03..2034f1d1f17 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9376,9 +9376,9 @@ static int aarch64_regnum(CPUARMState *env, int aarch= 32_reg) } } =20 -uint32_t cpsr_read_for_spsr_elx(CPUARMState *env) +uint64_t cpsr_read_for_spsr_elx(CPUARMState *env) { - uint32_t ret =3D cpsr_read(env); + uint64_t ret =3D cpsr_read(env); =20 /* Move DIT to the correct location for SPSR_ELx */ if (ret & CPSR_DIT) { @@ -9391,7 +9391,7 @@ uint32_t cpsr_read_for_spsr_elx(CPUARMState *env) return ret; } =20 -void cpsr_write_from_spsr_elx(CPUARMState *env, uint32_t val) +void cpsr_write_from_spsr_elx(CPUARMState *env, uint64_t val) { uint32_t mask; =20 --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373172; cv=none; d=zohomail.com; s=zohoarc; b=giy+uTpn4ZJSAU72U0NCC+EB7//obPLjHyc//kQ0hoV/e8DunPrItaMkB+zIxq/uS55OMKncPBGAHpnfqWKAOV9hFMIRCwvz5ojkOP+14qaPbzgm1qIHSJBx2+aJF95RHZWmQvTtYJ+C9yb6yieOLeXDL8yeVfp63WO2smsj9eE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373172; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tQfq9b5gBx/LgSnqN5kSQmZ7qxJt+3ELV+MU7inlpJI=; b=Dp3WlBI38YJ50/o69rRXHNnrtSY8VVVmek/RVbifmP7Bn36sEAZM+2GxK9TqvhCc75hQUmMS54GTo77+DHL9zWHLjkYzOdCZeKIb4dN+h5s9iuxqaJnTquBryYfJHipGFOoz+Fw8hy1wwH1482sAQS0+EVqlawyxKu/ZcYKlHFA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 179037317245293.44555340108468; Fri, 25 Sep 2026 14:52:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADox-0008PI-II; Fri, 25 Sep 2026 17:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoE-0007lr-N0 for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:27 -0400 Received: from mail-pz2-x10.google.com ([2607:f8b0:4864:3b::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADoA-0007nA-5x for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:21 -0400 Received: by mail-pz2-x10.google.com with SMTP id d2e1a72fcca58-86b90133ae8so738062b3a.1 for ; Fri, 25 Sep 2026 14:50:17 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373016; x=1790977816; 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:content-type; bh=tQfq9b5gBx/LgSnqN5kSQmZ7qxJt+3ELV+MU7inlpJI=; b=xqQf/+m6nt9v1mUlD6mXbZm7SCObMH5SjuVT8UMwK7+RoPljnipZjs0Gk9sewEiYUj iQZkg16d6T/2SpQN5BhKQS/zXw1W47kPLDUgdvP4i+iBr24ZuFnhrtssO88vK4KTLpyF A+5TYPq6yEHZhFesoTgvxl2UHG2t+9zAJGAph0iqBMMqY7guZuw1ryB1U4vbHAI5/IIy SlKHE0i8Pqa/7Oq+wxAgHN72qTAVhvBsEjG7SN9+Kjad7Q9W14aPqW5qQzW6fXDvlF9x M8C1psVjCB2LMcRnDrgV0igSTfvjxCZX1gt4Q2CGnZVj8iCdjUn3+6ebboNWy0352Jx/ G+5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373016; x=1790977816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=tQfq9b5gBx/LgSnqN5kSQmZ7qxJt+3ELV+MU7inlpJI=; b=sLiSmLcjr5tSVbZbRPVgRX1G/khPIy1aZPUqzIwgEt1INLDcgY2+ulVuJ0v4sCylca De8hzhHdfMuGwc0yxi4T9LLCxJcd4y/wYR2bhihkczXs49v+yiylh/GBeOFLrDoh2+cq ImQ2KH4UCzGjr0EHIW4cSDyWGlihJ9LFpTiMVJVkvbk3mq0JQIhvVvmXul2GndGxaSRH 2IBOFCLhGUN6zlGlRfsq5o8/NJGX8hrWk3vC561X73zuOK1vc4rBMaV6+vDmxCwvndA9 cYzErkb6NEYbB7dTLT7VkM7HFPHzregnOxcwcna363R+fXntEVs6UxqED7bnaFcVKWa4 t/GQ== X-Gm-Message-State: AFuF++mODO8s2yxp6rfHHnMAmuD8z7oyUoyfAot//HOO5kCtnwFr/JVe zP3W/s8ugJO/bAkBOWqiyRcIWV7fwwl13fk5szkWubiqRJ6+d0Hx/ufHdP1FQpTYSjYwljGjGt3 5CwTF X-Gm-Gg: AYBFou3/7yQMdT6PBTUgjAg3ncloDhR/gmoxuKTKYZ+1lEbpr2aWbvaR3CPQbpHgd4H NXeENeH3uSN5qK0yHdI2wBfq1P0XKEhRa02JouCGtgNaDMJ4M95giro1fg8PUDjHNBNq5i9PSqy bfyQcVzUxMjTHcjtb6+/NVucuA9FOv+z4PQ0pw2YqUkUZD+Q8qsEkIwzvh6/CZF5jNAoLo8MKM1 aK0jLx/CbhaOBeb5lhZ6YvHvEGG4MWtDPkl8itBcFJiE4xyg7rtE0qgvA+c0HDTmKzLKJxz0aXF 4q1Ee3TtBMwh/EsqvYSxPApTaSCXmlLt1PVQ010llTav+3kdtkLkHXxUxlKunqxmPOv2jjn1eoZ IhJY1e2GH6ImtW2NDnbF1AZOKQM80erEPzYzKbzDPAVZ9UyJ++zWElzgTfnJw9iG5M59p11j+nQ 1g7AlRbpZz2WWowzQDOgu5fLSPm8wYdXeJx249rm/y9zmqJxI22YB8oBWE6n3h6zxVVdorBcd9L XvELFRE/CYUcvBUobzIBM40ZFgA8+zdfbatQ7wJ X-Received: by 2002:a05:6a00:2a0f:b0:874:705d:f63e with SMTP id d2e1a72fcca58-87e9b896643mr5303369b3a.32.1790373016444; Fri, 25 Sep 2026 14:50:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 10/14] target/arm: Read and write PSTATE.UINJ Date: Fri, 25 Sep 2026 14:50:00 -0700 Message-ID: <20260925215004.456336-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::10; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x10.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: qemu development 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: 1790373175103158500 Content-Type: text/plain; charset="utf-8" With FEAT_UINJ, allow PSTATE.UINJ to be set from aa64 and aa32 modes. Read the value back for SPSR_ELx from aa32 mode. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/internals.h | 3 +++ target/arm/helper.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 843e12487ec..c41fa5225c7 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1392,6 +1392,9 @@ static inline uint32_t aarch64_pstate_valid_mask(cons= t ARMISARegisters *id) if (isar_feature_aa64_nmi(id)) { valid |=3D PSTATE_ALLINT; } + if (isar_feature_aa64_uinj(id)) { + valid |=3D PSTATE_UINJ; + } =20 return valid; } diff --git a/target/arm/helper.c b/target/arm/helper.c index 2034f1d1f17..ee48442383c 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9385,8 +9385,9 @@ uint64_t cpsr_read_for_spsr_elx(CPUARMState *env) ret &=3D ~CPSR_DIT; ret |=3D PSTATE_DIT; } - /* Merge PSTATE.SS into SPSR_ELx */ - ret |=3D env->pstate & PSTATE_SS; + + /* Merge PSTATE.{SS,UINJ} into SPSR_ELx */ + ret |=3D env->pstate & (PSTATE_SS | PSTATE_UINJ); =20 return ret; } @@ -9395,6 +9396,14 @@ void cpsr_write_from_spsr_elx(CPUARMState *env, uint= 64_t val) { uint32_t mask; =20 + /* Save SPSR_ELx.UINJ into PSTATE. */ + if (unlikely(val & PSTATE_UINJ) + && arm_feature(env, ARM_FEATURE_AARCH64) + && cpu_isar_feature(aa64_uinj, env_archcpu(env))) { + env->pstate |=3D PSTATE_UINJ; + val &=3D ~PSTATE_UINJ; + } + /* Save SPSR_ELx.SS into PSTATE. */ env->pstate =3D (env->pstate & ~PSTATE_SS) | (val & PSTATE_SS); val &=3D ~PSTATE_SS; --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373110; cv=none; d=zohomail.com; s=zohoarc; b=askkcbtgS8wWXJLHYq+m9MCVjSaAV0WP2a4L8sIvOwSy/I6dHyUvBbUfXzC1HQXkk/UgaeCoju6W9Wr4qSk5Gj/PpPzdTR9Yezp/xQBFH952EITYKmUmFEkJ2VKmXSBUDSu6Kb9Yk6Zv3mukEwC+eMbtpCpba8YLUfmCogWuuF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373110; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DgcW59+pyp3+kc3Gq1uovvoNZ6RuVzP0QLBQ3UuY5fU=; b=luRXkRHxCKRkhftF2cMoHVgOFbXFCGD4W6paBj0ig7TglPIfAy52j4tzUqmaI4uyGZgvaR8XBLvYFYALIZ6kyUndovmvWyBY18O8xEQ0H/8e3cOnuizgvIgZl4lM6qmpzajKguHT/5W+DGaZjsZxDMin/UpglFyNtuC30+4GRzk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373110954921.3796810501665; Fri, 25 Sep 2026 14:51:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADpE-0000CX-Pd; Fri, 25 Sep 2026 17:51:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoI-0007n1-7T for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:27 -0400 Received: from mail-pz2-x2b.google.com ([2607:f8b0:4864:3b::2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADoC-0007ng-Hj for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:23 -0400 Received: by mail-pz2-x2b.google.com with SMTP id d2e1a72fcca58-88098dbba5fso192930b3a.1 for ; Fri, 25 Sep 2026 14:50:19 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373018; x=1790977818; 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:content-type; bh=DgcW59+pyp3+kc3Gq1uovvoNZ6RuVzP0QLBQ3UuY5fU=; b=HpZQLiPA0YZ4zTpblzejDOKDBMoHOGjrM6g2SYxa8lQ3RQL3rF+vys4NVtWb6ECQ74 ilERqbayHqrpdwh+1NTeKmpqO5Pr/KDbhOhlXOKmCYX2tC8KSx/IxpQAANPnJmB9Mbi5 If7Exl/L17PMwFWQmFPmRKzo9zxdl+ykfAgx2zrpwwu6OYFwULe3zlasqzU7vsYajSmR OC7ck/oEkG0v2tDCvdtBNnxxfEBfpjDrkYvv20Vpf+jViqAkL2tDegymVYamXJK6IDO/ OkSNjc/rLv6XLg7RASseL+f6iWp9hkG2S7fjGoI97HIFCw6dpZ8Hken+n0bhheozMn1B 6NvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373018; x=1790977818; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=DgcW59+pyp3+kc3Gq1uovvoNZ6RuVzP0QLBQ3UuY5fU=; b=zXE8n+ckpy5ll3d3gXCNeoWBvQWdnYS2/zi6yTVpkE0VhXlIe9BdlYS9pUi88Awpae 2jdBlOADrSK4N4ee/+ZD81LOVOVC7KExpqQTdU7WQkIZF4XbttWgBXUOPC72s3Fn+6zY 7ItxQydx5gk7JGkdhULlN9W38mXO/TNEeManx30yJMkfNK7Kmt/noR1Iy0okr0Ve8BUc nQ6zQAxGEvGdxF7YtawxQXxr9tsnuubn0zFaJ2ttItt0VAWrF/eaZVsVEFUgXKi+Ot7E wEF3hOjAOYzrulcwgT39UonIltOruLhWkyCXfPiVe1WiC8g5dl9n3FUdgUUMdyYBnIUs PcRg== X-Gm-Message-State: AFuF++kUziJ/GTfUCVY6Vo8ONRZwdWqCTKgYbbtjQ8KsAiI7vycZft5I hsUQ2dfu3zq5pnbsVdIP/OyDC30B12cyid5MOxhHS54EcCBkHwGdrJhI8L8jcwdkERzCx+x9c0q 1A7wF X-Gm-Gg: AYBFou3AsKrlpZqRH8pJMSwlFXRf1I46WOjTaMLi80zi2edZtge5kJ1eT0MuR77AQoh 7EfScUTGD3h7LZgAUrtRCM+fSIl9Cvy8eWin7ILqvAF5ngXRcem/hAur8xPIv+vDxiwENRrZFLB ucnEG4TlY8AyKtUR9derXZ928nyBBcdtIAqB2edPAwJl9CBm6Kn1uOTdPUhxWKqUU3Gl1nnFh3q RxYfmrFKFXf69jehDKzLHW0dzXPQNEsLS6acp/wrcjFU2YeQjBDF1nlK8l+a1KWi1lJ+CWYMMCZ JqHF6pq3yWhdW2P+aYFq0vqMShgjGsVcchC+HijUSRp9JWlR0Ss4PnJ+8QWsKz8/vfpAz0ITZFM K0iJlUeOnE2zghR4CzHBSntnZlj6JMBzd/Nrd1XLaKr7xBV3NRAC75Gy04Lnkvnm16XLYloUzaU PDREGGsYFT06//RqcNNGXXhpd1ARFe9ki6Z9uoMgEToZk5Nb1yL8SLct/eLQ/Bz9mkXtZQqLlZS aCF/LhRfOC9MT6zRNrcNyzE1iuSVQ== X-Received: by 2002:a05:6a00:3a06:b0:878:3704:e0f1 with SMTP id d2e1a72fcca58-87ea07d0e7fmr3855395b3a.23.1790373017912; Fri, 25 Sep 2026 14:50:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 11/14] target/arm: Add PSTATE.UINJ to tbflags Date: Fri, 25 Sep 2026 14:50:01 -0700 Message-ID: <20260925215004.456336-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::2b; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x2b.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, 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: qemu development 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: 1790373112967158500 Content-Type: text/plain; charset="utf-8" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu.h | 1 + target/arm/tcg/translate.h | 2 ++ target/arm/tcg/hflags.c | 3 +++ target/arm/tcg/translate-a64.c | 1 + target/arm/tcg/translate.c | 1 + 5 files changed, 8 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 735e777d103..4e8a472ee71 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2483,6 +2483,7 @@ FIELD(TBFLAG_ANY, ALIGN_MEM, 10, 1) FIELD(TBFLAG_ANY, PSTATE__IL, 11, 1) FIELD(TBFLAG_ANY, FGT_ACTIVE, 12, 1) FIELD(TBFLAG_ANY, FGT_SVC, 13, 1) +FIELD(TBFLAG_ANY, PSTATE__UINJ, 14, 1) =20 /* * Bit usage when in AArch32 state, both A- and M-profile. diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 31f52a34a68..f633aa265f0 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -155,6 +155,8 @@ typedef struct DisasContext { bool align_mem; /* True if PSTATE.IL is set */ bool pstate_il; + /* True if PSTATE.UINJ is set */ + bool pstate_uinj; /* True if PSTATE.SM is set. */ bool pstate_sm; /* True if PSTATE.ZA is set. */ diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index cf7d49be908..c0b47f484e6 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -121,6 +121,9 @@ static void rebuild_hflags_common_aprofile(CPUARMTBFlag= s *flags, if (il) { DP_TBFLAG_ANY(*flags, PSTATE__IL, 1); } + if (env->pstate & PSTATE_UINJ) { + DP_TBFLAG_ANY(*flags, PSTATE__UINJ, 1); + } if (aprofile_require_alignment(env, el, sctlr)) { DP_TBFLAG_ANY(*flags, ALIGN_MEM, 1); } diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index c60f4c4103d..b3438235828 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -11028,6 +11028,7 @@ static void aarch64_tr_init_disas_context(DisasCont= extBase *dcbase, dc->fp_excp_el =3D EX_TBFLAG_ANY(tb_flags, FPEXC_EL); dc->align_mem =3D EX_TBFLAG_ANY(tb_flags, ALIGN_MEM); dc->pstate_il =3D EX_TBFLAG_ANY(tb_flags, PSTATE__IL); + dc->pstate_uinj =3D EX_TBFLAG_ANY(tb_flags, PSTATE__UINJ); dc->fgt_active =3D EX_TBFLAG_ANY(tb_flags, FGT_ACTIVE); dc->fgt_svc =3D EX_TBFLAG_ANY(tb_flags, FGT_SVC); dc->trap_eret =3D EX_TBFLAG_A64(tb_flags, TRAP_ERET); diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 8c56348a665..f32200cc47e 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -6418,6 +6418,7 @@ static void arm_tr_init_disas_context(DisasContextBas= e *dcbase, CPUState *cs) dc->fp_excp_el =3D EX_TBFLAG_ANY(tb_flags, FPEXC_EL); dc->align_mem =3D EX_TBFLAG_ANY(tb_flags, ALIGN_MEM); dc->pstate_il =3D EX_TBFLAG_ANY(tb_flags, PSTATE__IL); + dc->pstate_uinj =3D EX_TBFLAG_ANY(tb_flags, PSTATE__UINJ); dc->fgt_active =3D EX_TBFLAG_ANY(tb_flags, FGT_ACTIVE); dc->fgt_svc =3D EX_TBFLAG_ANY(tb_flags, FGT_SVC); =20 --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373220; cv=none; d=zohomail.com; s=zohoarc; b=BZFGbZLrC0rX2mJhCmyKcQ/mcxePshBHmrtLtf1ifCSpoKtgFutrCylNqLvmd+ar9YEV5C2TYO6JxrTK0B5ojkOPUEKnc63ED+fJ8iOp+FucrzVqlLPiAMu+BPRMg9bcpGyhAbhdSX+iDpSpXif4ZR0NafIh/YjvkKTGrccYj6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373220; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XtGPsasgp0HyndARAiz1kRlvHdn/laykPbN7JXONAq0=; b=UluQMG7bjBV3F2MfHvu6WPfH7Ruj+eGvY5bzPMVMFLVZfaioylFvjNJtHUDiZnV3DURQ5anP2JVz0SZFZyBdaoaRbAOaegpAT1FckjmWw1ZQ86iXMNfeHh25uqhj71iXjqtGvfmZUzsteWupNcLG3QzifzNhKYfYAlhkS+7r9+g= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17903732203617.187940066509782; Fri, 25 Sep 2026 14:53:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADox-0008Pu-SH; Fri, 25 Sep 2026 17:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoI-0007mz-7U for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:27 -0400 Received: from mail-pz2-x2b.google.com ([2607:f8b0:4864:3b::2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADoE-0007o2-C1 for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:23 -0400 Received: by mail-pz2-x2b.google.com with SMTP id d2e1a72fcca58-88098db8dcdso470456b3a.3 for ; Fri, 25 Sep 2026 14:50:19 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373019; x=1790977819; 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:content-type; bh=XtGPsasgp0HyndARAiz1kRlvHdn/laykPbN7JXONAq0=; b=ZeexUcZVqB0BX/sdEIx9oAJdWNol9KDYJ6GGXNwGQ2l2yhAWklY7dI9ZaBRWh50eE2 U0CUpsi2uESkXDL8ySOYVYP7sNs5Uw0Ka+YQ+1vpg4YuY0VwMPHEL3KSvvDfXtb9nqNt 3BdTALCsCjZsHf70fLIYfzrqI8vsHqoZ1nyxyul8hfhlZZP13dZQScuTrnbI2F8NVIza cH7TKSrJm1Q8BToJj6zwoOwCRJlOq0tqMQR5cXKzogAFA82bidAyayd07oy2zrIoAYxU TwZumpuy3a8LBoUfaRGZKgkzfbyZAJYXZJAz3KvIQivhx/I/OxxKf6XYVxUc5zpLjlP9 zWCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373019; x=1790977819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=XtGPsasgp0HyndARAiz1kRlvHdn/laykPbN7JXONAq0=; b=0f0qN0ESh5VIF2WOcEH8OEl9++7spCuhnnP2HuED8s+SyyrWS5YDu1gVk0Y8I6JEjj HSRTCunC9hXKr0shOI2GLYHvdWV7vZbUf5XuIJPoTAXDyFneh0pIkcbLAhXKnaRuMPIU 7DJrdH4AZFgaZ67oxDpcYliJId98h+IxwyD1zAm1cHq4+CwwuDDFTr/OxjTDgdHl/FuZ n7s6Lt/bNkhNLfFpqqMkkMxVetPW6etWr67oMzesCMENjHUUSX+O7nqnxm1qsv+0xSTY NQfJVjSUOEb9zPuoTmWM1MxRIlcMOqczTbVC6058/jVVD/MAdnW2VDJl0yDVCb0+bBEr 3PgA== X-Gm-Message-State: AFuF++mTZWiLhRwYYaLePeT/MS6nt4it/XA12IIMjwjmlxT+yyfktpNz OAGaUdqiAbbnaKjiDZTXLXsjOar10391JCYT9N6TFQqwfLTSxx8/1xx41y0X/jiwKbP5pzw3ZtT 74j7/ X-Gm-Gg: AYBFou3+M4NtOK8Vzflg+AfqNL58Mr/h1oC+Ve3tWNOFv9j4Nu9SKDyXBrsi2u6MdDz H+on/PgWHYDR3zLsdBDwi0QMFWA6Z/J9oQhuY84rEJ4nCwLt5N3Yfv4gSyNt8qX98n1sg/usaTV bQ4yEJh1pknG0kqA0atS0zR8Fw3RDnlJbeRxpKNIEC5i2BOpRK/+V2G/kxfAwY7dXWxpxPX4+Qk 2SMsgGanbJ5DD3r4t79n3g6bfpXArc8lyNInQq28QhcA0aG3Q0TAF6YwvUq4fAvJFw++qDjxbcA sRiGM9KobvH1Xs2Hw/4lbOgWNHtB0taG5z2GymOQMDCLVr8AXB8LiDeZvJmioB8iYbyPQaHYLky kThhRZ6lzhYkkoi11lyyuGTkvjQDVbC5/K6WAJXUN42dk2ZjLbnlmHXs/hwphspaOSorrSkL65w eJ+VL2h3Wjoc8lGO5fAR3pQIlwFFyqx8CwTX9P7UwNBEvFnujDA8nL/Aq7AdQ9zOIi0bALFM1oC B1buSuf3vbucwED1W4F149F8+LbFmRL/YaSi9vu X-Received: by 2002:a05:6a00:b70f:b0:87c:e6aa:30ec with SMTP id d2e1a72fcca58-87e9dfafebamr5408839b3a.49.1790373018749; Fri, 25 Sep 2026 14:50:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 12/14] target/arm: Split out check_il Date: Fri, 25 Sep 2026 14:50:02 -0700 Message-ID: <20260925215004.456336-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::2b; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x2b.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, 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: qemu development 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: 1790373221379158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- target/arm/tcg/translate.h | 1 + target/arm/tcg/translate-a64.c | 7 +------ target/arm/tcg/translate.c | 28 ++++++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index f633aa265f0..7eba9b764ce 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -382,6 +382,7 @@ void arm_jump_cc(DisasCompare *cmp, TCGLabel *label); void arm_gen_test_cc(int cc, TCGLabel *label); MemOp pow2_align(unsigned i); void unallocated_encoding(DisasContext *s); +bool check_il(DisasContext *s); void gen_exception_internal(int excp); void gen_exception_insn_el(DisasContext *s, int64_t pc_diff, int excp, uint32_t syn, uint32_t target_el); diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index b3438235828..7f858654c43 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -11174,12 +11174,7 @@ static void aarch64_tr_translate_insn(DisasContext= Base *dcbase, CPUState *cpu) s->fp_access_checked =3D 0; s->sve_access_checked =3D 0; =20 - if (s->pstate_il) { - /* - * Illegal execution state. This has priority over BTI - * exceptions, but comes after instruction abort exceptions. - */ - gen_exception_insn(s, 0, EXCP_UDEF, syn_illegalstate()); + if (check_il(s)) { return; } =20 diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index f32200cc47e..fbacc3b7574 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -1159,6 +1159,20 @@ void unallocated_encoding(DisasContext *s) gen_exception_insn(s, 0, EXCP_UDEF, syn_uncategorized()); } =20 +/* + * These conditions have less priority than instruction abort, and thus + * must be checked after reading the instruction. They have more priority + * than the AArch64 BTI exception. + */ +bool check_il(DisasContext *s) +{ + if (s->pstate_il) { + gen_exception_insn(s, 0, EXCP_UDEF, syn_illegalstate()); + return true; + } + return false; +} + /* Force a TB lookup after an instruction that changes the CPU state. */ void gen_lookup_tb(DisasContext *s) { @@ -6153,12 +6167,7 @@ static void disas_arm_insn(DisasContext *s, unsigned= int insn) return; } =20 - if (s->pstate_il) { - /* - * Illegal execution state. This has priority over BTI - * exceptions, but comes after instruction abort exceptions. - */ - gen_exception_insn(s, 0, EXCP_UDEF, syn_illegalstate()); + if (check_il(s)) { return; } =20 @@ -6728,12 +6737,7 @@ static void thumb_tr_translate_insn(DisasContextBase= *dcbase, CPUState *cpu) dc->base.pc_next =3D pc; dc->insn =3D insn; =20 - if (dc->pstate_il) { - /* - * Illegal execution state. This has priority over BTI - * exceptions, but comes after instruction abort exceptions. - */ - gen_exception_insn(dc, 0, EXCP_UDEF, syn_illegalstate()); + if (check_il(dc)) { return; } =20 --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373165; cv=none; d=zohomail.com; s=zohoarc; b=hX1ztkkP9iOhdct+easC5njDLO9y6Dt/s6IfNACLa0IjNYu+TdnuvrpNZZ3xh0th3FyNmUQuBA8DIZQIpxoOJZ45oFUxNLdyRxQPn3pBp6ayreHYOefjlPnQOe6sWq0ei508HFfn/vWeu/611yyXaVA+9erREFjPXB0g3KbQbio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373165; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cOzcQc8zTJgOy19nChNBP2tzW+uTl+R1lYrTRq/sk8I=; b=OVtRnil10P06ugPP9btn5MwGytjQxAcoA93yftl+Av5yzcRka8kxpsKTcawXaoMbW9inZdOp1HAwwEVesgCypqJX5SxLeL/ys4VucBuUT243Oy0S9rNOFhEKbtMSJ2OyrNloUUwg27zA2UWlN/tO0DOkXzqsRux+ejwo4JlnLNw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373165381564.311602713531; Fri, 25 Sep 2026 14:52:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADp1-0008V6-5y; Fri, 25 Sep 2026 17:51:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoI-0007mu-5d for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:27 -0400 Received: from mail-pz2-x2b.google.com ([2607:f8b0:4864:3b::2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADoE-0007oI-Cb for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:24 -0400 Received: by mail-pz2-x2b.google.com with SMTP id d2e1a72fcca58-8807e5b8fa9so633520b3a.0 for ; Fri, 25 Sep 2026 14:50:20 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373020; x=1790977820; 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:content-type; bh=cOzcQc8zTJgOy19nChNBP2tzW+uTl+R1lYrTRq/sk8I=; b=OsWWApk21a1rG6ukCqzzX599c5yZ+LkS8TjkBAZf88F78O6ecR3U72U3f9W+fE94Ua eorH5cZEHXMEEsuxNHPhJTfu9bo8sx9lC3QasZKAHDxaXLT2BWJBlbOEelPCzi6UGgIe GqMIe9pZhapf2lRZEOqohZ9xaFvuE6RR5Wj6SyXKM6oujo+Wm/OtlwMwVAyRPtflmOJc HtxZlvL7NMru75vPJgt5ehj5KHtOr+fEnVAEvK/xGrzWjHrZ3NGQN4WJ4sHjznmHFt7G 0AAIwbk2uGfjx5JEbuIBvpzJixG7tDQcAS8FHWipX/Y0gM2OMOj0LnkjR0Nk7ouP/og1 bTqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373020; x=1790977820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=cOzcQc8zTJgOy19nChNBP2tzW+uTl+R1lYrTRq/sk8I=; b=i2ZTsUrRWeaRLrivufqp15p3PA6NRGBpK4c3P3nkG6z7JU93MFnFz6i2tVlR5BXSLq HN+3qR69MSINEKu5h0hQryad9rLmRKmZIl0flB22ZEoh8C7VgDSkjYEtwvMOzbdX6f4x GcBP8YbqWNsq6J+Qtn8eGPTxYBRcnBEawbfWJyGTwTX8vYM2bdA7WIikAYTCeP4IHq8t l6v++fvzFrOYQOq+vReYrDLJ6MqneHUfYETpos9hlpSjteozRlef/KiGrf1nGZkBciyG v2wiVI1wAW4+NIZjmFN400yT1xsHsquAMmcwnJZNe8+xxw8ZbxuTCr5eZwDb5QqZOLwf MH0Q== X-Gm-Message-State: AFuF++mhhpVAGWeLnsqetf1bRjNKBHE8P67qTlh8F+0tTn87bWjCE3Yq tNX9qgwAabbkJOP0hzWkQtNi+xjBFr7G0HhbfwgCjiSB/jIYDBC27Pu+MO42JEG7B0TLYSGFMaS RxkQb X-Gm-Gg: AYBFou1VQW6Ku9Y4l3HkcZkaKx/zGjZzVYETL3/aG6D/1hFWHLjWAYLtHIQpzs8Dn/Q 8U+5UqphIVHzsYy+LBapnh2Tt3sa7/yse3+nI9atOS8tA5NDo9jb14NjK/24Dd8KW9XEzGw8bcj MDqB1P64Q2L0Ls7bgDfHtoFKgUZw6AF1dalX86rldz4P7AegBdLSVLvS8XRRj0puIeo7H2NKEWw v7H8BYNbPamgpxG1APBeRxqY+l+BurcFECWqLrFyzLoKT/3di9YmLfEiKuIxI67EV0frhcWb7jK 6O3G4ol3QkLv26zrbIsDdlvrlkuKdq0GibQNxJFp3lBObOVdHkdOgDz82JD6bMIJIv+b0kpq/dE QKLr1ENs5dEKqJVzfW6NrdytUM9YU/j5knrOQRfAA9ZP2NysVsW2W3hdrDPyw5c80TgAgtx42Q3 QJXwgn84sYO2Fxlpq+sjLiVwC7wAXzxUgCbVVZBCVs2XSk9BntQ1fTO5bXceiduKo8rjv4ABvHE 4WZ3/cqCHfOqoDS20BJsug/uIqWsw== X-Received: by 2002:a05:6a00:28cd:b0:878:34d7:6985 with SMTP id d2e1a72fcca58-8802d814675mr2664436b3a.51.1790373019553; Fri, 25 Sep 2026 14:50:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 13/14] target/arm: Honor PSTATE.UINJ during translation Date: Fri, 25 Sep 2026 14:50:03 -0700 Message-ID: <20260925215004.456336-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:3b::2b; envelope-from=richard.henderson@linaro.org; helo=mail-pz2-x2b.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, 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: qemu development 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: 1790373167076158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- target/arm/tcg/translate.h | 2 +- target/arm/tcg/translate-a64.c | 2 +- target/arm/tcg/translate.c | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 7eba9b764ce..57e45ea8724 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -382,7 +382,7 @@ void arm_jump_cc(DisasCompare *cmp, TCGLabel *label); void arm_gen_test_cc(int cc, TCGLabel *label); MemOp pow2_align(unsigned i); void unallocated_encoding(DisasContext *s); -bool check_il(DisasContext *s); +bool check_il_uinj(DisasContext *s); void gen_exception_internal(int excp); void gen_exception_insn_el(DisasContext *s, int64_t pc_diff, int excp, uint32_t syn, uint32_t target_el); diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 7f858654c43..5d5b11e2da9 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -11174,7 +11174,7 @@ static void aarch64_tr_translate_insn(DisasContextB= ase *dcbase, CPUState *cpu) s->fp_access_checked =3D 0; s->sve_access_checked =3D 0; =20 - if (check_il(s)) { + if (check_il_uinj(s)) { return; } =20 diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index fbacc3b7574..6983153ffc6 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -1164,12 +1164,16 @@ void unallocated_encoding(DisasContext *s) * must be checked after reading the instruction. They have more priority * than the AArch64 BTI exception. */ -bool check_il(DisasContext *s) +bool check_il_uinj(DisasContext *s) { if (s->pstate_il) { gen_exception_insn(s, 0, EXCP_UDEF, syn_illegalstate()); return true; } + if (s->pstate_uinj) { + unallocated_encoding(s); + return true; + } return false; } =20 @@ -6167,7 +6171,7 @@ static void disas_arm_insn(DisasContext *s, unsigned = int insn) return; } =20 - if (check_il(s)) { + if (check_il_uinj(s)) { return; } =20 @@ -6737,7 +6741,7 @@ static void thumb_tr_translate_insn(DisasContextBase = *dcbase, CPUState *cpu) dc->base.pc_next =3D pc; dc->insn =3D insn; =20 - if (check_il(dc)) { + if (check_il_uinj(dc)) { return; } =20 --=20 2.53.0 From nobody Sat Sep 26 19:16:13 2026 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=1790373125; cv=none; d=zohomail.com; s=zohoarc; b=MBBHHiAAE/aq1lE28vy4lSgS4PvQg/xFBgqltY4OyuRaB9AaN8mp39BObL+HgNHal/CGgUbf943d3LSH29144bZopiQVZkQNoTrLNVQ9eJ+Pr/3AI53bD9KFgYPNgP5QOeP+qhLxAoztfe8o2nrO0MciSZwGkhjugpyLJUOSTuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790373125; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C+cdoJ81YNEf4q3G5tKQRS1Ej9pjuy+FmmxI+jro6EY=; b=V7WViTy0KA1c9xPUsRgS+VBP4QGjdLlBj8IAtSG/aVYFFbvbN15l0/QudmAKl85quOcCDrBQGaQzI5xP0GEfqUKAK6l9/eQIGDVbCbEpCuu06REbS2PXwf0Mv4ckIuvEgnpMm0TTIX6wgEvdE2wHPVuZWRCVwYF/dbCnl+FXS9w= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790373125653831.688604846395; Fri, 25 Sep 2026 14:52:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xADot-0008E0-KC; Fri, 25 Sep 2026 17:51:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xADoI-0007mv-6T for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:27 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1xADoF-0007oe-Ef for qemu-devel@nongnu.org; Fri, 25 Sep 2026 17:50:25 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-880cb967dffso409519b3a.1 for ; Fri, 25 Sep 2026 14:50:22 -0700 (PDT) Received: from stoup (174-21-68-150.tukw.qwest.net. [174.21.68.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87fea1940ecsm1725256b3a.13.2026.09.25.14.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 14:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1790373021; x=1790977821; 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:content-type; bh=C+cdoJ81YNEf4q3G5tKQRS1Ej9pjuy+FmmxI+jro6EY=; b=DQJ5kP0sgpe5doq+b6dM8qf79zLntWEkHMB6VEIMjfFmQaZ+n2ImtpBWpV0r+4mT+E azXB/ZTRQKJ1EFKgeJtd+VGUgHUOF/qKiejNv6Srqp3L7AbHHSUWkkYVZ0aCy4Qx/AGC hRHGbhfkdlQP8RtuH7inY7T8nSzLF5Ppe+0VweDhjtm+YUZ2CcokV8LzFAtAAdPK8YTI 4XElKpSFYN8615RcwMKXaWbhIRbFmB2hfpYo0rfbOUHAl+eElqDdarX8MESHycgTYUOQ /r6jAC5FXKjnUQb/2Hqfqmp3/rnqPNa4tgDgLWcM7dFPR+UipsX7A91yTMTom0pKUb+b Wc2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790373021; x=1790977821; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=C+cdoJ81YNEf4q3G5tKQRS1Ej9pjuy+FmmxI+jro6EY=; b=rOpefurs90w3K1RcRNSt2LGb+SNmo8iv9Cg9ngSUJjQdjZp3em98djMeQsPR2mV21B HjVh7T4TBpyEkBt5Q4+nZOdotFadqT47kUw7g7rs7KpUpwO3Uvn9NOb97YY1tS9gMxIa 06oW6Vgqh2xsl/pObXtrw2eX1IGJVj6bV3tT9Sf7uwC8XQDQUJ383myGPBGEVf5Wq8Cx Eb941yFRX6jgU64berOU/edaP1K6ut4pSUeSSowATbt0gq8T0TryxQcXbGXuQUAw3Vjg uAjnh10CyLKP80qQriyeflOpevoh1stOylK+qAXWeigicAtl+PX4mLEc/wQE3PtcKWoc 6yZw== X-Gm-Message-State: AFuF++mwQT2jevljIAY9QMs9xAANx/5ReEaAaJDAr4Ect4HYV9H6vEkb lRHWaO132T5DOte0F3yM3V6TczZbKLYAIFkdnhN6c7Fn4qkybfBHKmIAGDGBrS5lZJeZAtdRYUs V4Pbb X-Gm-Gg: AYBFou1DtN3+7d+wTei9GBkutvna7pQjDMXJWb32bLIs5YgA2+L+JTfCyjIXbLf8eh5 rFYQ/mLKUsZrYCOxIEWKuAoloXMOGGWXCvmfW1nn024fjU6kQqFI2v9Co12jHJkg2ti/C5RfiaY rdyyH2XFUcFlJYyB4Tnhu7J3W/O4P2JDFBFI3OOK3LWUxMUrO+tYAg5A5p32yo/6An0z2ouOitX 55HTbEk0zv/UoSdZtS/Y0qg0J+1Slq52GeAR0UddoXvo/EwDjf/dgafwiTB+pcowaTVE8g7JnyV srA4ZgVsV5alqUtDstCfVFUv0QZjBHsvo42e3vIiMdhnWkS5/oT5uN61S5NDzf1tavxEndyyT9Q d6GrXBwqKxZLOPCyCLaWKIYK21W99LkJ27eXrtJwb+UFKMpBs20WVsSnILLDyU325H7oQ2O3Qd8 5maZt7XQ/rPwKIVx8uxWwexVM4d+vZD0KFvQMh1TkVMgKAU8KqIWfminIvrmGJerfzLpDUqPWsj ekNp6kji76mz+k7iRqvvW5njHmCGWyRpqCGR6tT X-Received: by 2002:a05:6a00:2e91:b0:881:236b:748e with SMTP id d2e1a72fcca58-881236b753bmr551959b3a.0.1790373020951; Fri, 25 Sep 2026 14:50:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v2 14/14] target/arm: Enable FEAT_UINJ for -cpu max-v9 Date: Fri, 25 Sep 2026 14:50:04 -0700 Message-ID: <20260925215004.456336-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260925215004.456336-1-richard.henderson@linaro.org> References: <20260925215004.456336-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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: qemu development 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: 1790373127071158500 Content-Type: text/plain; charset="utf-8" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- docs/system/arm/emulation.rst | 1 + target/arm/tcg/cpu64.c | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index 34b63f9867f..3bd5c42a664 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -223,6 +223,7 @@ the following architecture extensions: - FEAT_TTL (Translation Table Level) - FEAT_TTST (Small translation tables) - FEAT_UAO (Unprivileged Access Override control) +- FEAT_UINJ (Injection of Undefined Instruction exceptions) - FEAT_VHE (Virtualization Host Extensions) - FEAT_VMID16 (16-bit VMID) - FEAT_WFxT (WFE and WFI instructions with timeout) diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index affd87a3ae5..aecee55ef77 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -1457,6 +1457,7 @@ void aarch64_max_v9_tcg_initfn(Object *obj) SET_IDREG(isar, ID_AA64PFR1, t); =20 t =3D GET_IDREG(isar, ID_AA64PFR2); + t =3D FIELD_DP64(t, ID_AA64PFR2, UINJ, 1); /* v9.0: FEAT_UINJ */ t =3D FIELD_DP64(t, ID_AA64PFR2, FPMR, 1); /* v9.2: FEAT_FPMR */ SET_IDREG(isar, ID_AA64PFR2, t); =20 --=20 2.53.0