From nobody Sun Sep 28 16:34:22 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=1756569551; cv=none; d=zohomail.com; s=zohoarc; b=fKQeOPcxtpQgH/d6+PoR8gumGL0wLzyGvj0v9cz88woJgzZr3LdaGaO5+ViYQUqDi8L223638c2ZQt75HY5EmRUmosnrCNzSO5H1JYtN8FYGFBrNVusRPtGY9IcBBAijCa13Ot+WU1ofMAJQPPcU9HTPETCk3XkWl4BJo6lMv+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756569551; 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=QqPfbNKA06t+UTNS9gbkWsyk9nvfuwNoDjToDAtDRNI=; b=ehkDUnAPGfZ8/APr5bMtywQh9CeBP124WRW+r/PU/IfqBDk8ga8tN5X26TcQW5rFGXea60sCsJ+GAvYJAU8ZPxanJwsP0TaTMaBmt9wYYv2uy2hd4QBCGB8jfObRvfCB2ryYSLot6+fWmPii0tqCDCrxo/litSc/DBDECXwfKm8= 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 1756569550957702.4899191765635; Sat, 30 Aug 2025 08:59:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNlF-0004PO-Oi; Sat, 30 Aug 2025 11:45:02 -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 1us7bQ-0004Rw-Eo for qemu-devel@nongnu.org; Fri, 29 Aug 2025 18:29:48 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1us7bO-0003dN-Ix for qemu-devel@nongnu.org; Fri, 29 Aug 2025 18:29:48 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-32326e20aadso2799751a91.2 for ; Fri, 29 Aug 2025 15:29:46 -0700 (PDT) Received: from stoup.. (122-150-204-179.dyn.ip.vocus.au. [122.150.204.179]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7722a4bb5dasm3364297b3a.55.2025.08.29.15.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 15:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756506585; x=1757111385; 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=QqPfbNKA06t+UTNS9gbkWsyk9nvfuwNoDjToDAtDRNI=; b=cfH1/YNnM7ueY9b6kmxrTMqijaEdkuiGOjTTo19357L2BGvYNd5K1SJ3lmvk37Dg0u PEGhaiFhsK/S7iHCmFW3cDiR37x7x8bH+nCXoJL6tmFhuZYAzbwo5zEaziuFNQ9gvO/T EBOyMu7sbFWbOwwX8Z4vAvgq6Jtz4bq5r+MciA9Oobs7b9nRtqd37WP+roEt93kD2b8E IKyeroVnD6HTFdLANHF/OJDqEY9InBCOq0iXvlyathlsXXvzlgxkKpkNDyuXUDX0jXc4 7AZtjBe87ZtbY0EepTUodMw0jHOl9lHYtIGwoL0Uz7cLbo3KsqIf7ZyH6xxlKV7YTbY+ WY4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756506585; x=1757111385; 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=QqPfbNKA06t+UTNS9gbkWsyk9nvfuwNoDjToDAtDRNI=; b=TtWWc1oE8gxxsG71LR0deh3XKonu55kWLeyPldJOWK+1XPYvFz0c73fJNYg1dRel4J jI73VcXT95ZCnyz3N1gFKtVqLOOiJqEIPTphEjbe3BHGJ/BSC7b3J+Knax0/zNRBloSb 5KlM6dHtkKVXEsuhPeXpu+qhdGdxi+M6jKHgkRHuxwbSA88BB7LZTyUX9AgkNCkWacl2 gVleFgT17GhxAUvofkh/nuhtACL4yvhvzcaEqKwrTY7xAEbpJPoSZaaA6AhWTWJYJdP3 +tx0fzHjbQZoXgGwW9xn0PZGaNhmjBaZVLYHas2S4ra5D11w24FtRv12jkUPC2HnysHK O2nQ== X-Gm-Message-State: AOJu0YxdYkVVOKNiJCRT790Rj62tHeew4KyZzY7XjNj2nPVvgcox9IFb +DaTf54gi2L9Gc29rnPLkPcwNg0PTwR6ApVZNDe6B5fQpj9WT1UvEwTKVWBUEQFOWNiTSU0yjuH c/vAc/24= X-Gm-Gg: ASbGncsoeCn0prO7BO30sPfgTJYigXG5Qhw0wXzEWmyRZcFc34Z0pLFmmXxYa6l47Gh r1dfIHHxu70RJQPn55GMJNzWw0PYflDZ71FLMkQE+bi/HzwLb6s0jZcCj70YZtIHpO9cCc5bwsV lt7FgiTFETRmMD+FXHSEeVR36OIVvMHNGOLxlBhgN1+YcPG+dz2rTENhRQqXtnc/ov6lEFep9EG pRmQhcguo+7aIZNsfMyOa8g8okB3Ys0ximDXI9Etnrxnj67BOAyW1Bi2S+4LfSZ7lHmNjNea7NI 4W5Zaft2oUdywwU75z3cvJxQY7h97lRQRrSS1oMCTJycv86x0YODOHGnRnG2d0gCx/Y/Rv2duly t7g1v9prnjvGW+Ey4tfXXxP4GUi1pm8qhCKhv6NwZVGSJEEa5iA6wT2wW3wqoqdMNlzGYf1Y+qg == X-Google-Smtp-Source: AGHT+IGjufkwQUUanUyORsttC84G+hr8V9R7SW4SGGrxSxe5gNtjBygtE4g9RHTKqS1VPXNI2NS5jg== X-Received: by 2002:a17:90a:d606:b0:327:dcab:d4f0 with SMTP id 98e67ed59e1d1-328156bac20mr335354a91.19.1756506584872; Fri, 29 Aug 2025 15:29:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 54/91] linux-user/ppc: Expand target_elf_gregset_t Date: Sat, 30 Aug 2025 08:23:50 +1000 Message-ID: <20250829222427.289668-55-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250829222427.289668-1-richard.henderson@linaro.org> References: <20250829222427.289668-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::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.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: 1756569552554116600 Content-Type: text/plain; charset="utf-8" Make use of the fact that target_elf_gregset_t is a proper structure. Drop ELF_NREG, target_elf_greg_t, and tswapreg. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/ppc/target_elf.h | 16 +++++++++++----- linux-user/ppc/elfload.c | 23 ++++++++--------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/linux-user/ppc/target_elf.h b/linux-user/ppc/target_elf.h index 72615553ea..2a61cd2896 100644 --- a/linux-user/ppc/target_elf.h +++ b/linux-user/ppc/target_elf.h @@ -8,16 +8,22 @@ #ifndef PPC_TARGET_ELF_H #define PPC_TARGET_ELF_H =20 +#include "target_ptrace.h" + #define HAVE_ELF_HWCAP 1 #define HAVE_ELF_HWCAP2 1 #define HAVE_ELF_CORE_DUMP 1 =20 -typedef abi_ulong target_elf_greg_t; - -/* See linux kernel: arch/powerpc/include/asm/elf.h. */ -#define ELF_NREG 48 +/* + * The size of 48 words is set in arch/powerpc/include/uapi/asm/elf.h. + * However PPC_ELF_CORE_COPY_REGS in arch/powerpc/include/asm/elf.h + * open-codes a memcpy from struct pt_regs, then zeros the rest. + */ typedef struct target_elf_gregset_t { - target_elf_greg_t regs[ELF_NREG]; + union { + struct target_pt_regs pt; + abi_ulong reserved[48]; + }; } target_elf_gregset_t; =20 #endif diff --git a/linux-user/ppc/elfload.c b/linux-user/ppc/elfload.c index 114e40a358..0d54da9803 100644 --- a/linux-user/ppc/elfload.c +++ b/linux-user/ppc/elfload.c @@ -131,23 +131,16 @@ abi_ulong get_elf_hwcap2(CPUState *cs) return features; } =20 -#define tswapreg(ptr) tswapal(ptr) - void elf_core_copy_regs(target_elf_gregset_t *r, const CPUPPCState *env) { - int i; - target_ulong ccr =3D 0; - - for (i =3D 0; i < ARRAY_SIZE(env->gpr); i++) { - r->regs[i] =3D tswapreg(env->gpr[i]); + for (int i =3D 0; i < ARRAY_SIZE(env->gpr); i++) { + r->pt.gpr[i] =3D tswapal(env->gpr[i]); } =20 - r->regs[32] =3D tswapreg(env->nip); - r->regs[33] =3D tswapreg(env->msr); - r->regs[35] =3D tswapreg(env->ctr); - r->regs[36] =3D tswapreg(env->lr); - r->regs[37] =3D tswapreg(cpu_read_xer(env)); - - ccr =3D ppc_get_cr(env); - r->regs[38] =3D tswapreg(ccr); + r->pt.nip =3D tswapal(env->nip); + r->pt.msr =3D tswapal(env->msr); + r->pt.ctr =3D tswapal(env->ctr); + r->pt.link =3D tswapal(env->lr); + r->pt.xer =3D tswapal(cpu_read_xer(env)); + r->pt.ccr =3D tswapal(ppc_get_cr(env)); } --=20 2.43.0