From nobody Sun Sep 28 16:30: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=1756383063; cv=none; d=zohomail.com; s=zohoarc; b=mZYcheE3u5yVTk6hIqXpYv6SfEwSTbkg7xbaxvayrFWAh/FI3NL1/x/jxj3uhp3xnyK6HReei0KhJpc+E+n/j5os/9BwjiVnEctcZl4HgqYZbwBpxyFdoJ/2NDWgd5gde3CuiGZ0g0XtXEbYHFPUvgAKLnybEZ7RAAe8e361QQU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756383063; 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=pX3cyAXzWaI+M+ga3mt6VNWQq5Iik+1mUsefsD+nYFI=; b=QncFhucaZhV4HRvc1Buhqf5UlLKMPFuQXwrdSL+wNriIJyjlIpLTHHl+ri3Y/tgCi3qnXATqFWfZ3uctZd1r91eY1SnUEpuDyA0yE3+WcRPg5h96oIMCUOROYy+MzbEaDbjqxV9UtoFwNkAQDDUObkiA+TtwYHfEjIhLNJr4h40= 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 1756383063384329.73670852889427; Thu, 28 Aug 2025 05:11:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urbS9-0003Te-J9; 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 1urbRd-0002co-V2 for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:09:34 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urbRc-0007G3-1P for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:09:33 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7720f231174so773903b3a.1 for ; Thu, 28 Aug 2025 05:09:31 -0700 (PDT) Received: from stoup.. ([144.6.121.55]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b49cb8b4b98sm13933222a12.19.2025.08.28.05.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 05:09:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756382971; x=1756987771; 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=pX3cyAXzWaI+M+ga3mt6VNWQq5Iik+1mUsefsD+nYFI=; b=Ir8eHTJGM6MzX26lQjrYla52ciCR1/EFg5tjx38d6Oq8z25MgmUZehhlsh8X5BYpcJ 7cefVQ+GnU4YY4qsK2OSSYVdZSrN6mQY7M4ZEWBfLCjREYb6q1MpaW7O9JVperblD9Lt 3sQYvGQVFlGB8cpitWvw0RQxnwyH0LHANVALB3B/2CMAtZHh4A6u/Ny3k4fHvTXzDtdg SkgFd8a9pLxJ1ofVr6FQGyNsMHyj1Dm8mk0/PkXGMtBCVBJR1e6jDdT18MWihr2a4psW TBkI62TRYRbun/aa3oi9rjWdpK3J/JjI70omxOgrTOTKuikdkpXnK6aidW+Yb12ArjCY jRMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756382971; x=1756987771; 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=pX3cyAXzWaI+M+ga3mt6VNWQq5Iik+1mUsefsD+nYFI=; b=aXQXEVU/Xy7Pd44hqd4ClkAizUmNNBK5FxPXAjd7OLXjlFtsB9cfEUmt5zn00m5rji jlfLyRRjyM8vcMr3eiHumYFP16k+60uwRijzHzVQwbjja2HvW7fLHcC2ekwaNtApJCPs LALM/JK3hN7cNWyeiltzyCzijTA2muRBVffs9kT8GbxVbNwF2NnX5h8nAzDRqXm36yiN xEo15MpC5alKNBgxP/aZ+RxUiRYQRNfbIBpD/aODt/gwFhkzb782wB/dDAgf+VGVF/q4 JAigNejk0yC5XQNWXj4uLav0h6uz2/D7sqyWboUSqlj1ATGDowQrUtNkj3aHuyx9frTx 6U4w== X-Gm-Message-State: AOJu0YxwXVovl8FkFfrSsKf7yKVaCQIkWMudbL6cS7H+nDWBRlGgwuAU ckfDYU21nlBYcx1QwTeQ4/mZZrX9BZxzWdu7xNUk1kYkKJrIG++SYVi8gXc3P9/UFUIh5kX01Z0 /Tm+oqMg= X-Gm-Gg: ASbGnctK6vvA/nikBuJKHv6cBUaZDeRQKWPATv4kwGXeJmbzN9lSfg+wGnMT0xK3njG Mb9piRFVUVtxv6QjhocNOm4TvmbUZHAJU/RS4aJPLL58A7g2s33vauNvy4/Rak6506vIo+msl3u Q36Wjc5OFyNVK6qOXZt9y8/+BLF9a/WIPY9yfJSCEdlwE3onLx0Y5ByVv3wwt/TQSC5jsL3Afgv L+2Yq1R+xlvxFfCGENMBpsqYVJrb7ptG3y80fa3QjWwxFR19CoUyNJPqspUzCM3e0ACyRVu6Re5 KDFrqflB83GExiw1YxmHOW05q5JWI07eVHBNCRiwizwOabS3IMPJAiSPdfNV7E6XegTAor6WIDj k0CwpJwTrX5M/T055dw+OmXWC4NN6LYU5Se4A X-Google-Smtp-Source: AGHT+IE4Rwt0oYBXaL9moWaBU2U6kttoV9gM+jvHmkl0c9tFM+GmILqIv0lDcxyefCxGrjhJneholg== X-Received: by 2002:a05:6a20:9189:b0:243:7beb:8424 with SMTP id adf61e73a8af0-2437beb8edbmr20990106637.46.1756382970585; Thu, 28 Aug 2025 05:09:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PATCH v3 20/87] linux-user: Move elf_core_copy_regs to ppc/elfload.c Date: Thu, 28 Aug 2025 22:07:29 +1000 Message-ID: <20250828120836.195358-21-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::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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: 1756383064819116600 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/ppc/target_elf.h | 9 +++++++++ linux-user/elfload.c | 26 -------------------------- linux-user/ppc/elfload.c | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/linux-user/ppc/target_elf.h b/linux-user/ppc/target_elf.h index 4203a89d66..72615553ea 100644 --- a/linux-user/ppc/target_elf.h +++ b/linux-user/ppc/target_elf.h @@ -10,5 +10,14 @@ =20 #define HAVE_ELF_HWCAP 1 #define HAVE_ELF_HWCAP2 1 +#define HAVE_ELF_CORE_DUMP 1 + +typedef abi_ulong target_elf_greg_t; + +/* See linux kernel: arch/powerpc/include/asm/elf.h. */ +#define ELF_NREG 48 +typedef struct target_elf_gregset_t { + target_elf_greg_t regs[ELF_NREG]; +} target_elf_gregset_t; =20 #endif diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 017346b82d..d1d0a112fb 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -361,32 +361,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t e= lf_flags) NEW_AUX_ENT(AT_UCACHEBSIZE, 0); \ } while (0) =20 -/* See linux kernel: arch/powerpc/include/asm/elf.h. */ -#define ELF_NREG 48 -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 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]); - } - - 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); -} - -#define HAVE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 =20 #ifndef TARGET_PPC64 diff --git a/linux-user/ppc/elfload.c b/linux-user/ppc/elfload.c index a214675650..114e40a358 100644 --- a/linux-user/ppc/elfload.c +++ b/linux-user/ppc/elfload.c @@ -3,6 +3,7 @@ #include "qemu/osdep.h" #include "qemu.h" #include "loader.h" +#include "target_elf.h" =20 =20 const char *get_elf_cpu_model(uint32_t eflags) @@ -129,3 +130,24 @@ abi_ulong get_elf_hwcap2(CPUState *cs) =20 return features; } + +#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]); + } + + 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); +} --=20 2.43.0