From nobody Sun Sep 28 16:34:25 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=1756569473; cv=none; d=zohomail.com; s=zohoarc; b=CQM2XF5MbLwxaFm+PupyjMHnJ9lHY/kNKR/0QiBpaNeYIvJw0kL1v8zOQjnWUmEytKLsB3UYujUT9wE5c87HZMiqCjqgUDIuv5y6KJXMUH0r6jf1Z56ZOiy9jzq1lilJbQPNsyyTEWVYXJZgbUVXs7vdxYQlXYNaX0Fs0NsNPtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756569473; 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=dZ69fieo27ga4u9iCgxP9hhIT5qNBs4sxkqT2Bndt4s=; b=QTMKuaORoUBjizam+X49B2nPKin+vpSlIPnWgkWV+Qlb3/JKGqag2Y/rKLMiu7cFdUJcGWDkZq/Ok0Jvp55p2dFenrd/I5mHygJztNFcY31E/uAU/7ByJwomeQLblLUf8I8jfh42dwnAHoZhM7I8HRKhgJ6D74DRt0Dlji0Llh8= 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 1756569473714654.369214417967; Sat, 30 Aug 2025 08:57:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNiS-0004Eb-IB; Sat, 30 Aug 2025 11:42:08 -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 1us7XH-00038a-S6 for qemu-devel@nongnu.org; Fri, 29 Aug 2025 18:25:32 -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 1us7XF-0002y5-0R for qemu-devel@nongnu.org; Fri, 29 Aug 2025 18:25:31 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7723bf02181so237179b3a.1 for ; Fri, 29 Aug 2025 15:25:28 -0700 (PDT) Received: from stoup.. (122-150-204-12.dyn.ip.vocus.au. [122.150.204.12]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7722a71c60bsm3302493b3a.103.2025.08.29.15.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 15:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756506326; x=1757111126; 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=dZ69fieo27ga4u9iCgxP9hhIT5qNBs4sxkqT2Bndt4s=; b=MNqdGrc2hW+WrecDDKXJiuq2+tcIwWQicW49S9LwCqItwhq+yzgp0KLEjmMUzPyhe3 GHX6kVzMePuvnJCGztmXeEnfFw079ioJTvehQbSzNrtvQEfBziZ9RT0HdL319oJ227Gb 5Pe0Vw4SFdPWycpu95ujcF2uLfUiIjF40OfNeKwjqgEnQgYRhnj6GL/00ESClvJlrFg8 KY4e0FwPzjahVP2WtqoQcMoIDeFnPO17K1rePKh3mD6nVMo+ZIVXng1ZWPmALhUYp1va 6Uk9slq/PokNsSnaYFnp845EmQ8C6t5J1kerQCO/Abl520n89uU2R6agUUzHITQCzwAD +90w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756506326; x=1757111126; 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=dZ69fieo27ga4u9iCgxP9hhIT5qNBs4sxkqT2Bndt4s=; b=Zh+1z9EkO7mh/akYL1JHffQVfEmuAqmIFjXfPyPoIVWnpT2fRsh0V9iWFdoKDSjwL1 k6gYmUVKI7M0RGbYnAp4oiYy8MJebpbZx7gIRjgl2dn4zqaa17qHlBv+NdUqXjF0L988 tkX+VLc1WEb5E3p5+HrNtaLTgEmyuQIhmuiXRnMxqX88U2KU5OT3FV2OrhUNx8QT0jYr pdL5Zmp3jkNINp1TH6zr70aaoP71+pjy/l+AGbCngHoYUCSEvE3TdK+rZnT6xuNKzz5N NIPqeVgzMjVyUmlUFT9z0UJ7WiVTAkNIgirG39vhU5iMwlZ9plExYQx7Pp9u2xPc5Xx4 p6Lw== X-Gm-Message-State: AOJu0YyB0Q2tNNBqdTL/0hZsyAMG4rMoScaAk5SnOcd+tBt7pgRBNres RQAwaOQ9rjV6okJMZ2uP3Nkl03VdaKCxAq22YClxy9jD68fVfmqaquOmxCjL+1YO1y62dltdCSR K0oXxGfE= X-Gm-Gg: ASbGnctB4m6vG7aCa4YWbFtAsHQLwPSO+Oc81q4/nFpDhqZ/cY5nYtqLU/UgZ9MYYcr I7KAYHpYEg9HCxxo2PtEf8zEBn06MtSOzVkNZwcjIsEa8ITdwt4hRM7YkQrIoUGiE0szCFTImiM cKpN9JsEHd5PDJ1WNbpnAWwbnnY/UBNGpiTJ9SZImMaiwPloLnlkTyDAH/6jCgqy3z5JT15R34l Sndh42ieFomjXdxHYSl2DTMMpcuiFSdOeEtYQ1flienkQKlGo69qfdjHLaE86PK/3LnuPHLc81i 1VLJ0No++Pb+sb7YuKAliSqwhmZXIF7VmzvC5q4jTlX/oC2ojjgsIe20048qP3H3JZKDtXMo8V+ 4r8AqEX4lZGCeGz+tB4DwHAsPJyvqZEaIQi2mbcr3UErvwT8radgx+vGcMabhfYg2ckb3BJk= X-Google-Smtp-Source: AGHT+IHXoCHiUkh17itETcYBz3HYtHS1p6uyTOydKlY/p2qT0JnWOKxK/AR214x5gVB8/7gegctbHw== X-Received: by 2002:a05:6a20:938c:b0:243:a000:5be3 with SMTP id adf61e73a8af0-243d6dce65emr339133637.8.1756506326502; Fri, 29 Aug 2025 15:25:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 22/91] linux-user: Move elf_core_copy_regs to arm/elfload.c Date: Sat, 30 Aug 2025 08:23:18 +1000 Message-ID: <20250829222427.289668-23-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::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: 1756569475597116600 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. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/arm/target_elf.h | 8 ++++++++ linux-user/arm/elfload.c | 12 ++++++++++++ linux-user/elfload.c | 15 --------------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/linux-user/arm/target_elf.h b/linux-user/arm/target_elf.h index 856ca41b16..94db3738e8 100644 --- a/linux-user/arm/target_elf.h +++ b/linux-user/arm/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 18 +typedef struct target_elf_gregset_t { + target_elf_greg_t regs[ELF_NREG]; +} target_elf_gregset_t; =20 #endif diff --git a/linux-user/arm/elfload.c b/linux-user/arm/elfload.c index 7de1f13f4b..47fe16a1a6 100644 --- a/linux-user/arm/elfload.c +++ b/linux-user/arm/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) @@ -199,3 +200,14 @@ const char *get_elf_platform(CPUState *cs) =20 #undef END } + +#define tswapreg(ptr) tswapal(ptr) + +void elf_core_copy_regs(target_elf_gregset_t *r, const CPUARMState *env) +{ + for (int i =3D 0; i < 16; ++i) { + r->regs[i] =3D tswapreg(env->regs[i]); + } + r->regs[16] =3D tswapreg(cpsr_read((CPUARMState *)env)); + r->regs[17] =3D tswapreg(env->regs[0]); /* XXX */ +} diff --git a/linux-user/elfload.c b/linux-user/elfload.c index e4f821f8c8..72a291e51f 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -218,21 +218,6 @@ static bool init_guest_commpage(void) #define ELF_CLASS ELFCLASS32 #define EXSTACK_DEFAULT true =20 -#define ELF_NREG 18 -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 < 16; ++i) { - r->regs[i] =3D tswapreg(env->regs[i]); - } - r->regs[16] =3D tswapreg(cpsr_read((CPUARMState *)env)); - r->regs[17] =3D tswapreg(env->regs[0]); /* XXX */ -} - -#define HAVE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 =20 /* The commpage only exists for 32 bit kernels */ --=20 2.43.0