From nobody Sun Sep 28 17:07:20 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=1756257620; cv=none; d=zohomail.com; s=zohoarc; b=RiAHs/pw5sZOj9/oiytuCvxeYvbF9RItmEdjcfnTrVbzQBijZgpJRFEugCk3n6GI8HQGk3WlioAr0evCSVxg51ghncNRD5dKdzA8WfnIXSavYBcAoGTgML6WN54aOSybMpiOuysMsq3MgNu8i+yo4qh2sWwG/2Ow5lCsbs+rKJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756257620; 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=GXUdqCkF+LYn22BhLyzjofcSNfXOcqV3+XqLF12lMmE=; b=VkoFUSlyU0Vbdord6IoFyF4LpuLGXsYceKexGqYajKILyiHKS72XKB+VCJR0/r9x0GoI+tzzDI35yXoGeDepr3rvtgYUnWaAwA/BHlNNzGpkhs/ALfUJradTPOIfzd43XB6Y515Ww+PZK2gfzKYGsFkAG2M4J1rOsPAgTzQO/pQ= 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 1756257620394621.3168690278262; Tue, 26 Aug 2025 18:20:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ur4dq-0000T9-TL; Tue, 26 Aug 2025 21:07:59 -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 1ur4dd-0007pE-Tw for qemu-devel@nongnu.org; Tue, 26 Aug 2025 21:07:47 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ur4dW-0007cL-MD for qemu-devel@nongnu.org; Tue, 26 Aug 2025 21:07:45 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-770d7dafacdso3339156b3a.0 for ; Tue, 26 Aug 2025 18:07:37 -0700 (PDT) Received: from stoup.. ([144.6.121.55]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7720274534esm1419241b3a.47.2025.08.26.18.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Aug 2025 18:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756256856; x=1756861656; 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=GXUdqCkF+LYn22BhLyzjofcSNfXOcqV3+XqLF12lMmE=; b=nKcdtVmPJA+Dlh4W96IBj0DTKeJOWi3jetSUC6V87hA+97cSDYO+NCTXIS1ywrJ4YQ 7n7deoZzuvS2XlGGOFILNfbhyOEY/v60cHGe+CrSMmL1QWYZzzTd3yeQAbOwqiOGQwEI tf3RYdBuSiiPBXBlypfbinM+5G9oZTKqvC1w0YBZt8F27YqgR0Tgv/qSr7W1dAWWikXf dOGwuZXDzJ0EQwdPej89h0Tc+20m6rgFmkV0ip60gLRvQ215/DqIcw2Y+0dO/WzOKcDp qnOem1Vw3roiRLHATIi4vB5K7jZruGkUvEbC8kZ15QEQWvMgYLA/uU9cSnOP4Nm9kK6a vEYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756256856; x=1756861656; 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=GXUdqCkF+LYn22BhLyzjofcSNfXOcqV3+XqLF12lMmE=; b=FQ+nwoHBe0EnnLPSmW5UDxGrqdkqhAjRN711e7EheqzueNVwRtmMl+PBPuouT5fO+p 0d87CSleHbWhHb5f0rxZLmoIQQhAKqUGrTX6HvXggoNlJeVgfvwhnGicVz/qW81XAT7E H7qNOkiSGR5gYdWMaXvAAbCUfC6Q/rjtTMSsr6zVRGn+wPmKqBVXR0+FYNx0I3lY2fPI z2WGtL/j+auXrRD2kRrPrZMRIpr1ZhgOeoFsNo9BFQPXEQS4jQbkbgbgs/OLf8JnHKlV Lxd6ydZwbQ2LmfDN/XQYLZCHvEJ4gCknkOx9bkIOId5Dg6Dvo+HaEdzfpXCq65LzAECX 7V8A== X-Gm-Message-State: AOJu0YxviVi/suYoQh0o7b0cRH/FBfG7LJZJqnSst1JYCipldZDfQBVO +cpWsDdFzh+D4su6zxwzC6p4cuF502h2fDJubGcWPQHmyW86PKNdJAPxWWmVF1eUXrcJJHcbji6 1HhPU7q0= X-Gm-Gg: ASbGncuXj0t26t1biuuiToRZVOmFjE5Ip7C8TWiR+zhpOK/9rfHeVc/jFD5BpSCidXn a57XYvTDXfI5I5NmPgNEOJ+1I4Q6RxKRYGRDRajPfOh1OZdOizeDD9Du0oNPuwLZmvj1qqToqO7 0lmby0Z4FR3tephB0NckXVJDz7fAfyztmngNi92TVrCVYvf5BqJST1JqRJjyxjjMvd+dj+I6D4P cFT2a6+u5ytOhWrHZeVuKQkC2IoFpbLAIiPHhn7ZiXKYuAAKBEvNpEJALYhJfzvHDJtd5RppgAQ RriFCLHstcv60zA8nDr3NLV0TyyQW2fNsKxnXUMtkZoGhLQvDuj3l8PyGi+rUE6WdmWtQU0Ghzy U42ENGsXnsd7eA5UyIEAPBP3vJd7jq00iclBm X-Google-Smtp-Source: AGHT+IFf7ecdlminGXOBAydYbtK4duI+sSVUcfD5+Urj5l/NAJlkvs0mcElP4ltd85I9IUgbbqoCsQ== X-Received: by 2002:a05:6a00:439b:b0:771:f8b5:d88 with SMTP id d2e1a72fcca58-771f8b51015mr6428666b3a.22.1756256856477; Tue, 26 Aug 2025 18:07:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 28/61] target/arm: Move alias setting for wildcards Date: Wed, 27 Aug 2025 11:04:19 +1000 Message-ID: <20250827010453.4059782-33-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::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756257622565116600 Content-Type: text/plain; charset="utf-8" Move this test from add_cpreg_to_hashtable to define_one_arm_cp_reg_with_opaque, where we can also simplify it based on the loop variables. Signed-off-by: Richard Henderson --- target/arm/helper.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 3cd4546494..1a321ad181 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7349,20 +7349,12 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, ARM= CPRegInfo *r, } =20 /* - * By convention, for wildcarded registers only the first - * entry is used for migration; the others are marked as - * ALIAS so we don't try to transfer the register - * multiple times. Special registers (ie NOP/WFI) are - * never migratable and not even raw-accessible. + * Special registers (ie NOP/WFI) are never migratable and + * are not even raw-accessible. */ if (r->type & ARM_CP_SPECIAL_MASK) { r->type |=3D ARM_CP_NO_RAW; } - if (((r->crm =3D=3D CP_ANY) && crm !=3D 0) || - ((r->opc1 =3D=3D CP_ANY) && opc1 !=3D 0) || - ((r->opc2 =3D=3D CP_ANY) && opc2 !=3D 0)) { - r->type |=3D ARM_CP_ALIAS | ARM_CP_NO_GDB; - } =20 /* * Update fields to match the instantiation, overwiting wildcards @@ -7665,6 +7657,16 @@ void define_one_arm_cp_reg(ARMCPU *cpu, const ARMCPR= egInfo *r) ARMCPRegInfo *r2 =3D alloc_cpreg(r, NULL); ARMCPRegInfo *r3; =20 + /* + * By convention for wildcarded registers, only the first + * entry is used for migration; the others are marked as + * ALIAS so we don't try to transfer the register + * multiple times. + */ + if (crm !=3D crmmin || opc1 !=3D opc1min || opc2 !=3D opc2= min) { + r2->type |=3D ARM_CP_ALIAS | ARM_CP_NO_GDB; + } + switch (r->state) { case ARM_CP_STATE_AA32: add_cpreg_to_hashtable_aa32(cpu, r2, cp, crm, opc1, op= c2); --=20 2.43.0