From nobody Sun Sep 28 16:30:40 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=1756383477; cv=none; d=zohomail.com; s=zohoarc; b=F0bR3a1Vlkh2HEB7FGgpicBgIzr4kdIRMrdz+tTfNJDYTqTCNqlcmi7Zpr/Dn4bCcTy/YwmgwmNsN60TofKwNuqkNO1cezKM69/HxOQZn27VeXBIf0MljZkt3/ZgI1vuYPuJ1id33qKk7cBkHn5oL6Ic70zC4OzF7VDuQBRPy8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756383477; 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=sGKOMxTbtB0fTMjFgi2SLDv1p+aCDxxUGh+EB/xA3MU=; b=diyOCbRK1kkDJcCej2tR0KKBOPn+LupPbnVj/RrNyxh+Xu7bvdl94LGy3KivsWJ7tAVanSwzeQcmkJspfrI/QOZ8DaE2fuoM5Q0FiBEG/f2iiKtocE63UTb8Rcf8ZU6cBNPs0DDXshWLD76RoAc4JVLEylKytA7w2XehRVtaN4o= 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 1756383477273716.5090986831825; Thu, 28 Aug 2025 05:17:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urbTz-00069i-BC; Thu, 28 Aug 2025 08:11: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 1urbSF-0003lQ-I5 for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:10:17 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urbSD-0007aU-CX for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:10:11 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-24457f581aeso6960625ad.0 for ; Thu, 28 Aug 2025 05:10:08 -0700 (PDT) Received: from stoup.. ([144.6.121.55]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b49cb8b4b98sm13933222a12.19.2025.08.28.05.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 05:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756383007; x=1756987807; 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=sGKOMxTbtB0fTMjFgi2SLDv1p+aCDxxUGh+EB/xA3MU=; b=dUfHiygZbCqD/wbgc0SFeBawkCBc1giAd6J6g5mJOdt1McC3/IkrkvXJDEG2kKixET C2oXCpowIj26yg2x4OFhkaHie/LEZGbU25gNuubqv3pdrfEG2LnMlWJ4peUvNxFLWY49 rteHEmX7R+XmbJ5hrhI+P0nVFZbHiXssQk/KuIb0Ce8M4U7C0qt0WshC9sJi1K7Ej/c2 ejbOrerNB046tNEdYAc9mONlz6i7D0x2VY2H0kg9CFLpEAoKckmmqQbx4K9XPzU+GeMq u2lcDM76N1qkk3B/1Lx04g1jQsW3wWcLFHTLcgaYo5aZHLUm+h3EcwCTwd77LyPS9gxk JJWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756383007; x=1756987807; 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=sGKOMxTbtB0fTMjFgi2SLDv1p+aCDxxUGh+EB/xA3MU=; b=jNdWE2G0RRYZXIF/CNFd0x8Ukrd39A0s07qQhhd2rXHQS/YeD6NGcNdJfbAc1lSlET eImHfIRU/JzUOK2zoLhcX5x65KUxuf9UeqMEjQW1dn2FMMTiRiF6EnOCLEvOtDLeldeG ELEh6V09M0ypr9fBC3w6+d/lTRx8DoRddamsv/H4TB0NpyWnEktSnuD4kkZAryRBJC6m wbmZTweqthp/n9ixcZbrHVEsFSp5edPWEzBnx+MtltJPV+CRMtxX52fi7XfhgfKHVzOi 8LVvRgGQBpGfYaby17vGQTtOB4RihYpPNi4QCZM/IsKj8SccR2NzsxobYQz0YVVkN5FO GkHA== X-Gm-Message-State: AOJu0YyR6OEmeRp70aFHnWrzoDU42wsaf7R40oe+eSfpBKAkFtbz1qXl wD/5vlANNK03Rc+y9czmAn4d8fK1/FgoZFlM2dF/rb3Yc/AqWLn5V4ak4lWFog97atd0ZyveV2y c6XXw7NQ= X-Gm-Gg: ASbGncsOVdTz9AuffZcsI4WXhCRGLbR4Hrvo8OV6Bavf2oHK9iqqF8wA5teQrmgc+q9 Gx2IQZSiPf5KgLMCDDKnznaelp6Td/eImfvpx8Y/0uYh+CAaeYNaSRIm6DnePi+fKGlZ1kaY+YI 3AiXNH7b/GtVaD/540mwqS2sgYSF5K6bGT/4kC0dU89Yt5/k9ZLyVjPi7370On5euQsgWZtkTNi 5leeHmZblQ2YONn+ITV7Xv81MM960iDZ2N0RQsl2OzAon8N/libQ8n9dKJ4bWZH6aTuFCI91JtZ mjA2k7/odZjarouPws1h6ixn5fAkNv2CIej6gIMEfLXQBOX3/49e5lIkRqztBzqgh1D1eguT3hR g2szn0j/MuI3u8AY6kciRmiFdvWS6u1CAOJ6M X-Google-Smtp-Source: AGHT+IEVXtxT6Fz/SifRKsKeA38aHVbkfWebjxmuyrvMNFAp+zLpmxGWu5yMIqa8bA/8/2od3fYfgQ== X-Received: by 2002:a17:902:cec2:b0:242:9bc4:f1c9 with SMTP id d9443c01a7336-2462efdbcc7mr304676725ad.56.1756383007378; Thu, 28 Aug 2025 05:10:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PATCH v3 36/87] linux-user/aarch64: Expand target_elf_gregset_t Date: Thu, 28 Aug 2025 22:07:45 +1000 Message-ID: <20250828120836.195358-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250828120836.195358-1-richard.henderson@linaro.org> References: <20250828120836.195358-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::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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: 1756383479168124100 Content-Type: text/plain; charset="utf-8" Make use of the fact that target_elf_gregset_t is a proper structure by using target_user_pt_regs. Drop ELF_NREG, target_elf_greg_t, and tswapreg. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/aarch64/target_elf.h | 11 +++++++---- linux-user/aarch64/elfload.c | 11 +++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/linux-user/aarch64/target_elf.h b/linux-user/aarch64/target_el= f.h index b0728a1008..9eb8bb547e 100644 --- a/linux-user/aarch64/target_elf.h +++ b/linux-user/aarch64/target_elf.h @@ -8,16 +8,19 @@ #ifndef AARCH64_TARGET_ELF_H #define AARCH64_TARGET_ELF_H =20 +#include "target_ptrace.h" + #define HAVE_ELF_HWCAP 1 #define HAVE_ELF_HWCAP2 1 #define HAVE_ELF_PLATFORM 1 #define HAVE_ELF_CORE_DUMP 1 =20 -typedef abi_ulong target_elf_greg_t; - -#define ELF_NREG 34 +/* + * See linux kernel: arch/arm64/include/asm/elf.h, where + * elf_gregset_t is mapped to struct user_pt_regs via sizeof. + */ typedef struct target_elf_gregset_t { - target_elf_greg_t regs[ELF_NREG]; + struct target_user_pt_regs pt; } target_elf_gregset_t; =20 #endif diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c index 00550f9fdf..07a0c3f844 100644 --- a/linux-user/aarch64/elfload.c +++ b/linux-user/aarch64/elfload.c @@ -349,13 +349,12 @@ const char *get_elf_platform(CPUState *cs) return TARGET_BIG_ENDIAN ? "aarch64_be" : "aarch64"; } =20 -#define tswapreg(ptr) tswapal(ptr) - void elf_core_copy_regs(target_elf_gregset_t *r, const CPUARMState *env) { - for (int i =3D 0; i < 32; i++) { - r->regs[i] =3D tswapreg(env->xregs[i]); + for (int i =3D 0; i < 31; i++) { + r->pt.regs[i] =3D tswap64(env->xregs[i]); } - r->regs[32] =3D tswapreg(env->pc); - r->regs[33] =3D tswapreg(pstate_read((CPUARMState *)env)); + r->pt.sp =3D tswap64(env->xregs[31]); + r->pt.pc =3D tswap64(env->pc); + r->pt.pstate =3D tswap64(pstate_read((CPUARMState *)env)); } --=20 2.43.0