From nobody Sun Sep 28 16:30:45 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=1756383082; cv=none; d=zohomail.com; s=zohoarc; b=nwR83RQDkz87Sfl+6d2/j9IP54LTpdoixRNTaN9TKQ7cGK+3B5WchPBlCJXA3wfVjdI6D2Nque/unK6bgUp3k/v3A6cpLk5DxS0DfzrMuIANxYbvKRXJ0KxCSQwGYEx71WNJLdnAsHOIgmo42awsyj9Kyc+np7E3BxbdfwliFT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756383082; 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=DYOR2txVRXgp+21wx6twyLM7OtlGXRFl33SFJCsnOmM=; b=L3mukLFlfMqnJ/Doqsq+TDSJsyraIGWRwW7vqZWXrsnhRZ0qYOLh2qHbFKz6ZvXYUZOcMcfhleemj7B4iCpe7M3/9Snib/kYWEoc/57Fbyqo95tzUjF5/06UDT4R1ESFw5aVnnKRfSn5WJC4EmsftpsgnkUQ/7ThsCCOGwY+yzs= 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 1756383082450234.10823462147846; Thu, 28 Aug 2025 05:11:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urbS9-0003UA-Jn; Thu, 28 Aug 2025 08:10:05 -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 1urbRc-0002cS-61 for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:09:33 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urbRa-0007Fj-Gq for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:09:31 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-771e15ce64eso707116b3a.0 for ; Thu, 28 Aug 2025 05:09:29 -0700 (PDT) Received: from stoup.. ([144.6.121.55]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b49cb8b4b98sm13933222a12.19.2025.08.28.05.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 05:09:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756382968; x=1756987768; 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=DYOR2txVRXgp+21wx6twyLM7OtlGXRFl33SFJCsnOmM=; b=RJFcQVWkdRZUM4v+KNRyZkFbpfb/R3QQYfQjTgRK+bnN/QMVD4Q2LKGpVHZ3QrXMqd KWG6B51aHPPUw4qLTbDX4RzSJkruML75xK5xChr6K9NA+T9dVo0NYcKOTojAHFTiZeGd DTYaZswf/RYp6R63D94kX4GG0hbfi4/Iy5NAx9PZyiKtdSqyqYKJox39vTCL6jHt9ztB 4IldecBcy5dO2ZMfhAzNbnmaWnCCRhRzMSdubUEfp6VT4H9W2raPP7PBJYJPUGaotzqe p+ZBxKhFfd08nZVkKIMZ8a9ifVN13oRuXf5OOH+/zDawgXjNDx5DVUYjqYBt8e9xhFzJ 2HVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756382968; x=1756987768; 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=DYOR2txVRXgp+21wx6twyLM7OtlGXRFl33SFJCsnOmM=; b=A6pGwETBVnXP92Hzq4DvlpTElbzDBUMCqTAzrt7jOO33eOKmfnaqf14EZLCNZ7rfDT 2LDsgqGjA8C3ssLrGnBeBR8LmB6AdlKUc9lGk3qKfKnhwE/lybk6ij2+vblWmPAb7Nk3 pf+IKVBqO6xpoMRpVfcB3+KMRhOWLgYfsRSwUHLY3wSoqrn5X4KGOGKMDl3osRJZhGnr HXlIXzhgWPvxLK5CYQkn6WCfXFQkDXtqAjwLAAhCHJ4X5XF9L2o6kjbBXFBvuWuIsKHp TRDCKoxrcg0QerqhH0zxfChrA/5Lnn70yU9/mtf9A0yr9evZdAFOzZDaRuA8N+7XGfel znjQ== X-Gm-Message-State: AOJu0Yy6wjtzJnhpGBRUGsptAF0YYDvmTgFjii8KUGYSAbAvvpet8RKv m966rvT4mJc4UgSYlGCNTKqaknBOkcIjDKs09jQBH6/+jF1edNOoN1EWiG3RfKoRkTS9nAcy7BI WZ/8eAQw= X-Gm-Gg: ASbGncuydSbNmwFiw6VGqZ7yOnXzaPmn8BFpZCN7UHe5JaNyVLvotfHtIkREfvh9ZJ7 l20ckLv0vsXXmdgCe5acHht54ZKmTBPDEK23SGJrUEgAt2N0vpbqVZ1FC21LTuAfITjH7/UmDCF 3vjLB/Ood34pMmA71BUUsmL571H16lmh8/EBBMWhC8YfeB/Ht+7yZWbzdeD/h2WRPqe4EqJATiE qr39DoY5vjfiwYHCJ/kWaPQNX2POc4BHDWUWTRAmRtpxyAC7DEz6Tkj8i7NEwfyEKRCq9nuYqTp TMq9KdoRN6IU7y0DuT4XTqz68jqrwx7nnHdQgPST92Rz+xe1NZ0IhBAlKLqe6oHhDkTiyvXBRIf VKYlHWAMOCNZnQt3y/WzxnKWz6Q== X-Google-Smtp-Source: AGHT+IGFokdnb+OfB62Va6xZo3dXxGOgMTj9A/oa1QKme0DFnt24ma9LP1ranfsPCGFrakkgzmFQzA== X-Received: by 2002:a05:6a20:3c8d:b0:243:b656:dcc9 with SMTP id adf61e73a8af0-243b656dd00mr945598637.55.1756382968299; Thu, 28 Aug 2025 05:09:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PATCH v3 19/87] linux-user: Move elf_core_copy_regs to aarch64/elfload.c Date: Thu, 28 Aug 2025 22:07:28 +1000 Message-ID: <20250828120836.195358-20-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::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.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: 1756383085796124100 Content-Type: text/plain; charset="utf-8" Move elf_core_copy_regs to elfload.c. Move HAVE_ELF_CORE_DUMP, ELF_NREGS, target_elf_gregset_t to target_elf.h. For now, duplicate the definitions of target_elf_greg_t and tswapreg. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/aarch64/target_elf.h | 8 ++++++++ linux-user/aarch64/elfload.c | 12 ++++++++++++ linux-user/elfload.c | 15 --------------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/linux-user/aarch64/target_elf.h b/linux-user/aarch64/target_el= f.h index dee79ce0c6..b0728a1008 100644 --- a/linux-user/aarch64/target_elf.h +++ b/linux-user/aarch64/target_elf.h @@ -11,5 +11,13 @@ #define HAVE_ELF_HWCAP 1 #define HAVE_ELF_HWCAP2 1 #define HAVE_ELF_PLATFORM 1 +#define HAVE_ELF_CORE_DUMP 1 + +typedef abi_ulong target_elf_greg_t; + +#define ELF_NREG 34 +typedef struct target_elf_gregset_t { + target_elf_greg_t regs[ELF_NREG]; +} target_elf_gregset_t; =20 #endif diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c index 1030cb8094..00550f9fdf 100644 --- a/linux-user/aarch64/elfload.c +++ b/linux-user/aarch64/elfload.c @@ -4,6 +4,7 @@ #include "qemu.h" #include "loader.h" #include "target/arm/cpu-features.h" +#include "target_elf.h" =20 =20 const char *get_elf_cpu_model(uint32_t eflags) @@ -347,3 +348,14 @@ const char *get_elf_platform(CPUState *cs) { return TARGET_BIG_ENDIAN ? "aarch64_be" : "aarch64"; } + +#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]); + } + r->regs[32] =3D tswapreg(env->pc); + r->regs[33] =3D tswapreg(pstate_read((CPUARMState *)env)); +} diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 72a291e51f..017346b82d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -291,21 +291,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t e= lf_flags) #define ELF_ARCH EM_AARCH64 #define ELF_CLASS ELFCLASS64 =20 -#define ELF_NREG 34 -typedef struct target_elf_gregset_t { - target_elf_greg_t regs[ELF_NREG]; -} target_elf_gregset_t; - -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]); - } - r->regs[32] =3D tswapreg(env->pc); - r->regs[33] =3D tswapreg(pstate_read((CPUARMState *)env)); -} - -#define HAVE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 =20 #if TARGET_BIG_ENDIAN --=20 2.43.0