From nobody Sun Sep 28 17:04:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756257024; cv=none; d=zohomail.com; s=zohoarc; b=UtJ+VC1ELt4dCPQtTEDpTNYLRKlSoaO9RarUMhWS90wMk3OQXw4EZfOvOKM3n6FCRknwS+eSWcHA/9xypEU8qvadeTt/wCO8F2fyJKQRhu+2e23cl+XwaXX8SbbjNmjm05vpNGRY/5sBIJkW9ANLIf5yKhX+z+IyNAySr8BnxFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756257024; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=V4VzluGVNtyKJrvXVDGigWrz7oPLdUT2YsAV8VDVK+g=; b=Sn2oScFS1pbgcr+MwnFG0q/LScQWbt+HoCFFIglH8QBgwwt+3nxFOdw+sviXpQociURybOnQAN1JkGw+AkklB37IJXsvFFhnyim6pJWAXnePVoAynZ599xDmrT+USBvpdRwBI8LCcfluJS2oMhN1YsKAwmux0B9bNYRwRGLu6SM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175625702477462.08280694714824; Tue, 26 Aug 2025 18:10:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ur4df-0007pi-Fn; Tue, 26 Aug 2025 21:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ur4d1-0005SK-6m for qemu-devel@nongnu.org; Tue, 26 Aug 2025 21:07:09 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ur4cx-0007UN-93 for qemu-devel@nongnu.org; Tue, 26 Aug 2025 21:07:06 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-b474e8d6d01so4073303a12.0 for ; Tue, 26 Aug 2025 18:07:00 -0700 (PDT) Received: from stoup.. ([144.6.121.55]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7720274534esm1419241b3a.47.2025.08.26.18.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Aug 2025 18:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756256819; x=1756861619; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V4VzluGVNtyKJrvXVDGigWrz7oPLdUT2YsAV8VDVK+g=; b=dBcFsylxDkpAk/XUzWb3PnrM7/VKpVGpnmRYlf4a4JMTTJA89UsT8wyGHuivQCLg2J iNnKTVL8PiGr88hofzVYg0HzEYy5AZ2Udz0zjmSf4/iViSmZsAsKmTIN7PUh736UDh2V 1otyXGYbXismhCiZenZbWkFpqwfqyrUOrCao0d67MZzX5Tg6FfgkDcn1Vt8l6GlNtVBO EJGZ6MVCeupjyGysVE0gUwyHG63TpBDyOY0iZLO3tjwxLj2mCKh5FLmjzCWv4sVaKZMq gR8nhQD+i9kBaeyYI3WPPLd8esPrxzbilsqX3KkUjCDxTvIF5BExzn5UJR2lDB5skF23 feLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756256819; x=1756861619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V4VzluGVNtyKJrvXVDGigWrz7oPLdUT2YsAV8VDVK+g=; b=bEu5gHPY38miQWzOrB9ZBmm6DgO/lwVZG93qF8AKHYgdtCeP2sq/q2k1gZ/wG8b+pg 3v+B2Tf9I1HMKUd+yWuHtGbUF/02e+zZpZDofWhtMPHhk7Ym04py3vmtVSuY1uBZCkuS IKHyEjsMC13f3ZAhtfSZ/4aUPKgcmE6jX2Uz/darR7X55iULKoRPZhF7EN2l1mrqM6rs b4TKU8qnJFKSjK9lTeSKKUp4f57WNN3sWCGfUdWZXj7O2TJLPR8lM/V839nUISbcQhfy SF7zSDCh+h/i3QD9n9bDnWOEC1SR7gCX2rY0D3lBGh5KjocsuIpwoNI6RNTLmg9c8l0M 9Nfg== X-Gm-Message-State: AOJu0YxaXkBvvom6bAX7WXpFdwDPV1SlyxbQzPdZoduIxTPqI3wp2V+w GS5NSniKq64L6WArY6BnmUwuDlDZiPOu+ZMqmcnNhnOZ7rSW3iP+dNPnsrh3xE86mjtpB/I26XB r4JaNxZA= X-Gm-Gg: ASbGncvpQ3cnlp5qxTrhxQw42yD+aghmua9HcqvuGrEuC+7FoXtYTu/Fek1sjg1H+7g 1VH8gaa2QSDbiAaERed5Eqp/nZpIdSh62pBnSJUFSeFujxX94CN2JTRjxcJkLYORV8+FYay3adX HuyVWN6Zg0X/T4qBcpR8aasoJW2PCP35hLOhK3eEmbtNbeH+cIwMMn/XUv+5um2+8n4gheQfmHW 1eCwJfHRhQoksZI2pO3oTT8crmmMblI8yFFfNRXNI3u+0iKIeiSBGFIt39WdJJ7Ohq3TarmdasU 73qtU9mhuh8u6vb5lkr8hycb8PDmfFPbvfeJKGDpmGCGKyv2quQ713P73W+ZIhu5wLeMAOZKdXn PvNtbneWMraFvnWg/aEXv16/oQ3o0t/bBYmB+ X-Google-Smtp-Source: AGHT+IHAPEr7d+JyW0l3CDykgcLwjOqu1e68QQty6uIE/pqXE6SRPBhYWw2V456kdFTreGMS83r+ig== X-Received: by 2002:a05:6a20:a124:b0:240:5b1:e157 with SMTP id adf61e73a8af0-24340d1241bmr23386974637.32.1756256818732; Tue, 26 Aug 2025 18:06:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 21/61] target/arm: Improve asserts in define_one_arm_cp_reg Date: Wed, 27 Aug 2025 11:04:12 +1000 Message-ID: <20250827010453.4059782-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250827010453.4059782-1-richard.henderson@linaro.org> References: <20250827010453.4059782-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756257048074124100 Content-Type: text/plain; charset="utf-8" Reject ARM_CP_64BIT with ARM_CP_STATE_BOTH, because encoding constrains prevent it from working. Remove some extra parens; distribute ! across && to simplify. Signed-off-by: Richard Henderson --- target/arm/helper.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 7ce03336fe..da6a8f0a8f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7552,12 +7552,17 @@ void define_one_arm_cp_reg(ARMCPU *cpu, const ARMCP= RegInfo *r) int opc2min =3D (r->opc2 =3D=3D CP_ANY) ? 0 : r->opc2; int opc2max =3D (r->opc2 =3D=3D CP_ANY) ? 7 : r->opc2; =20 - /* 64 bit registers have only CRm and Opc1 fields */ - assert(!((r->type & ARM_CP_64BIT) && (r->opc2 || r->crn))); + /* + * AArch64 regs are all 64 bit so ARM_CP_64BIT is meaningless. + * Moreover, the encoding test just following in general prevents + * shared encoding so ARM_CP_STATE_BOTH won't work either. + */ + assert(r->state =3D=3D ARM_CP_STATE_AA32 || !(r->type & ARM_CP_64BIT)); + /* AArch32 64-bit registers have only CRm and Opc1 fields. */ + assert(!(r->type & ARM_CP_64BIT) || !(r->opc2 || r->crn)); /* op0 only exists in the AArch64 encodings */ - assert((r->state !=3D ARM_CP_STATE_AA32) || (r->opc0 =3D=3D 0)); - /* AArch64 regs are all 64 bit so ARM_CP_64BIT is meaningless */ - assert((r->state !=3D ARM_CP_STATE_AA64) || !(r->type & ARM_CP_64BIT)); + assert(r->state !=3D ARM_CP_STATE_AA32 || r->opc0 =3D=3D 0); + /* * This API is only for Arm's system coprocessors (14 and 15) or * (M-profile or v7A-and-earlier only) for implementation defined --=20 2.43.0