From nobody Sun Sep 28 17:07:43 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1758032744; cv=none; d=zohomail.com; s=zohoarc; b=VBTM78zqDes2V7sGcLHx7ZsZlghbNehQQkmqWiFSTPpRc9ke4K12Z4XLPFEfIZCr62Y5vgwE7T93RoxReA3OYqjDoHswXMg580dPDHRtMKY5D86BKklw2zis6V3b49l4msG0UM5EnFWXwxuLbLkTtuz61WKcPtuuJi8s3MsOgfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758032744; 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=m0hu6kiQPPC+ffTUWEZf+Bo8Uxcdw7g9TE3KnE/8zz0=; b=ZPT8S4F28bmQM9eDsWcYnrOT+Qj9thsQ6r8Da9MkPCti5t07hFj380qNyfcMot4rkrlJZy92qsu2ptkC6IKUbBK13hFIwMyj0sNcdf2YEDICLwbvQUZXGByWPBJb+xeUC/CnEQBD08juk5zVJRW/9OZVtwFzQyHuwwCjdoAeCXs= 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 1758032744684716.6486721287997; Tue, 16 Sep 2025 07:25:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyWao-0006Cm-Gq; Tue, 16 Sep 2025 10:23:38 -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 1uyWaC-0005lQ-Og for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:07 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uyWa6-0008Jq-Sj for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:22:58 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-251fc032d1fso61991385ad.3 for ; Tue, 16 Sep 2025 07:22:51 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2651d2df15esm73459905ad.45.2025.09.16.07.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 07:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758032570; x=1758637370; 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=m0hu6kiQPPC+ffTUWEZf+Bo8Uxcdw7g9TE3KnE/8zz0=; b=tmXmaIlmmGC8OpSbzG42wafZ8d+IhQfDJ+ykkdKswNEixxTElEbp+9F5f4VXaUnWLw goaacKktpwMT8Y2yZvOlrD8TsH8bRhUBCXR4NRYXpnx0uKFJ+sGLGLVLLXR4qBqBUHC/ 7YL9rLCz2HUM66jcxHLN70SvD5AtUmDsvlNRRO6oO/fVLHdlI+YvtHK4NzTRf3J8RMXs 3Hy4jQpFA6c5mCWjx24zD8Rk+oukprnOAEGAvt16Dr+QF2TUPtTDXknf9v1oHfalKmTZ lG01kt8FdYDt9g2dLz3iseLytxKcF7i/5VkefEbVDsSVx4bhk4ztqTdn53npQqC9qRSa xiZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758032570; x=1758637370; 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=m0hu6kiQPPC+ffTUWEZf+Bo8Uxcdw7g9TE3KnE/8zz0=; b=AJrXT2L731kb5G8E4om9e86Lrb3+ucoDd0Vl0dOKVz0M2t5Xh7+O7Ni5ggSw/x/tNF fJZrw5FUNDHl0TrOtGZRR3vZXXL2ft/QVejVBeCeJUSq1iN0m+S5u+GKO2PSqM9Kcgk5 qCPlsjO6vtxHXNOwjgSJG7mZYCGSVdnqmuE7WuLgKKeIsj3aAk13G0MYGPupEPlCudb/ QD/SNUpA60G0cQLo0W4n9cMPY44EUDONI7VJeC9vIneIZthr9QhB+rLHM9YtlyJG+k9q eRhXO2cYIEX1LSyBU947sGwH/eOYNUm/ES7bYlI3CAXkabkjVy/mgvFzcXBgYhlYvs39 8YBA== X-Gm-Message-State: AOJu0YyRG//oOCHwxR/3VmU5pAdUvDyFdd5UE0SHA3oOi8Sli711UTSp 5cJ27zB40IEMGF9M+kPxI9gIjtHN+AGPyYFyuwjv0uwrY/kUG/Dajx2ismtIN9m7qR/XS2pV9Ju MJtvP X-Gm-Gg: ASbGncsWqBsuLFFRbL50J3C8kb2YFAJqPCToimGElteM/zeana2Wik0tnA9xhW+a/6M paRBmiu2cm5vqJfq5TZ28+CgHh686Xvu2xQ2vARZh5p85DCSpdybDGNL2dVisQiedvDcdRpRCiG L8p8X7xrojG4KTuTJVYeUqHu9caJD39YS5OAJZDPTR/95IZPrnmqdzWE9Fdp2MuBc/lcjvgFWLc J1MM8UikMH66v9mCXdU1j6Tq2whO140XJbcJdsIrOZX+4B6PRY/DPPU7/jwdIsCnswfw8t9Ez5U GjEKPqfp/YcoC08d94XXztB2UOEZ1orDGeJBm8UAarN4n7NflfEAFRdBtTFMLdDTIL30Ot7y8qB 0NgRw9yTullXllYxBOB+yiFdCesbS X-Google-Smtp-Source: AGHT+IHrUDacm34/r32qETHk9yafX3YeEVYMMhHMw1ZHAmd7Q0wYtcY8QmXnQA1MnUUVE4sDSCGtIw== X-Received: by 2002:a17:902:cec6:b0:266:88ae:be6d with SMTP id d9443c01a7336-26688aec242mr94409275ad.6.1758032570229; Tue, 16 Sep 2025 07:22:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org, Manos Pitsidianakis Subject: [PATCH v2 13/36] target/arm: Restrict the scope of CPREG_FIELD32, CPREG_FIELD64 Date: Tue, 16 Sep 2025 07:22:14 -0700 Message-ID: <20250916142238.664316-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250916142238.664316-1-richard.henderson@linaro.org> References: <20250916142238.664316-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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: 1758032747009116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Manos Pitsidianakis Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpregs.h | 9 --------- target/arm/helper.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index b610716c24..812fb1340a 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -991,15 +991,6 @@ struct ARMCPRegInfo { CPAccessFn *orig_accessfn; }; =20 -/* - * Macros which are lvalues for the field in CPUARMState for the - * ARMCPRegInfo *ri. - */ -#define CPREG_FIELD32(env, ri) \ - (*(uint32_t *)((char *)(env) + (ri)->fieldoffset)) -#define CPREG_FIELD64(env, ri) \ - (*(uint64_t *)((char *)(env) + (ri)->fieldoffset)) - void define_one_arm_cp_reg(ARMCPU *cpu, const ARMCPRegInfo *regs); void define_arm_cp_regs_len(ARMCPU *cpu, const ARMCPRegInfo *regs, size_t = len); =20 diff --git a/target/arm/helper.c b/target/arm/helper.c index 5bc8fb23cc..b310f52724 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -51,6 +51,15 @@ int compare_u64(const void *a, const void *b) return 0; } =20 +/* + * Macros which are lvalues for the field in CPUARMState for the + * ARMCPRegInfo *ri. + */ +#define CPREG_FIELD32(env, ri) \ + (*(uint32_t *)((char *)(env) + (ri)->fieldoffset)) +#define CPREG_FIELD64(env, ri) \ + (*(uint64_t *)((char *)(env) + (ri)->fieldoffset)) + uint64_t raw_read(CPUARMState *env, const ARMCPRegInfo *ri) { assert(ri->fieldoffset); @@ -71,6 +80,9 @@ void raw_write(CPUARMState *env, const ARMCPRegInfo *ri, = uint64_t value) } } =20 +#undef CPREG_FIELD32 +#undef CPREG_FIELD64 + static void *raw_ptr(CPUARMState *env, const ARMCPRegInfo *ri) { return (char *)env + ri->fieldoffset; --=20 2.43.0