From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 50/95] linux-user: Move elf_core_copy_regs to {i386, x86_64}/elfload.c
Date: Sun, 3 Aug 2025 09:04:14 +1000 [thread overview]
Message-ID: <20250802230459.412251-51-richard.henderson@linaro.org> (raw)
In-Reply-To: <20250802230459.412251-1-richard.henderson@linaro.org>
Move elf_core_copy_regs to elfload.c.
Move ELF_NREG to target_elf.h.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/i386/target_elf.h | 8 ++++
linux-user/x86_64/target_elf.h | 8 ++++
linux-user/elfload.c | 70 ----------------------------------
linux-user/i386/elfload.c | 21 ++++++++++
linux-user/x86_64/elfload.c | 31 +++++++++++++++
5 files changed, 68 insertions(+), 70 deletions(-)
diff --git a/linux-user/i386/target_elf.h b/linux-user/i386/target_elf.h
index 44dde1ac4a..aaf7b229c0 100644
--- a/linux-user/i386/target_elf.h
+++ b/linux-user/i386/target_elf.h
@@ -11,4 +11,12 @@
#define HAVE_ELF_HWCAP 1
#define HAVE_ELF_PLATFORM 1
+/*
+ * Note that ELF_NREG should be 19 as there should be place for
+ * TRAPNO and ERR "registers" as well but linux doesn't dump those.
+ *
+ * See linux kernel: arch/x86/include/asm/elf.h
+ */
+#define ELF_NREG 17
+
#endif
diff --git a/linux-user/x86_64/target_elf.h b/linux-user/x86_64/target_elf.h
index 498c3f7e4e..3ab10a6328 100644
--- a/linux-user/x86_64/target_elf.h
+++ b/linux-user/x86_64/target_elf.h
@@ -11,4 +11,12 @@
#define HAVE_ELF_HWCAP 1
#define HAVE_ELF_PLATFORM 1
+/*
+ * Note that ELF_NREG should be 29 as there should be place for
+ * TRAPNO and ERR "registers" as well but linux doesn't dump those.
+ *
+ * See linux kernel: arch/x86/include/asm/elf.h
+ */
+#define ELF_NREG 27
+
#endif
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 4e0d52f1f6..177741522c 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -145,46 +145,6 @@ typedef abi_int target_pid_t;
#define ELF_CLASS ELFCLASS64
#define ELF_ARCH EM_X86_64
-#define ELF_NREG 27
-
-/*
- * Note that ELF_NREG should be 29 as there should be place for
- * TRAPNO and ERR "registers" as well but linux doesn't dump
- * those.
- *
- * See linux kernel: arch/x86/include/asm/elf.h
- */
-void elf_core_copy_regs(target_ulong *regs, const CPUX86State *env)
-{
- regs[0] = tswapl(env->regs[15]);
- regs[1] = tswapl(env->regs[14]);
- regs[2] = tswapl(env->regs[13]);
- regs[3] = tswapl(env->regs[12]);
- regs[4] = tswapl(env->regs[R_EBP]);
- regs[5] = tswapl(env->regs[R_EBX]);
- regs[6] = tswapl(env->regs[11]);
- regs[7] = tswapl(env->regs[10]);
- regs[8] = tswapl(env->regs[9]);
- regs[9] = tswapl(env->regs[8]);
- regs[10] = tswapl(env->regs[R_EAX]);
- regs[11] = tswapl(env->regs[R_ECX]);
- regs[12] = tswapl(env->regs[R_EDX]);
- regs[13] = tswapl(env->regs[R_ESI]);
- regs[14] = tswapl(env->regs[R_EDI]);
- regs[15] = tswapl(get_task_state(env_cpu_const(env))->orig_ax);
- regs[16] = tswapl(env->eip);
- regs[17] = tswapl(env->segs[R_CS].selector & 0xffff);
- regs[18] = tswapl(env->eflags);
- regs[19] = tswapl(env->regs[R_ESP]);
- regs[20] = tswapl(env->segs[R_SS].selector & 0xffff);
- regs[21] = tswapl(env->segs[R_FS].selector & 0xffff);
- regs[22] = tswapl(env->segs[R_GS].selector & 0xffff);
- regs[23] = tswapl(env->segs[R_DS].selector & 0xffff);
- regs[24] = tswapl(env->segs[R_ES].selector & 0xffff);
- regs[25] = tswapl(env->segs[R_FS].selector & 0xffff);
- regs[26] = tswapl(env->segs[R_GS].selector & 0xffff);
-}
-
#if ULONG_MAX > UINT32_MAX
#define INIT_GUEST_COMMPAGE
static bool init_guest_commpage(void)
@@ -221,36 +181,6 @@ static bool init_guest_commpage(void)
#define EXSTACK_DEFAULT true
-#define ELF_NREG 17
-
-/*
- * Note that ELF_NREG should be 19 as there should be place for
- * TRAPNO and ERR "registers" as well but linux doesn't dump
- * those.
- *
- * See linux kernel: arch/x86/include/asm/elf.h
- */
-void elf_core_copy_regs(target_ulong *regs, const CPUX86State *env)
-{
- regs[0] = tswapl(env->regs[R_EBX]);
- regs[1] = tswapl(env->regs[R_ECX]);
- regs[2] = tswapl(env->regs[R_EDX]);
- regs[3] = tswapl(env->regs[R_ESI]);
- regs[4] = tswapl(env->regs[R_EDI]);
- regs[5] = tswapl(env->regs[R_EBP]);
- regs[6] = tswapl(env->regs[R_EAX]);
- regs[7] = tswapl(env->segs[R_DS].selector & 0xffff);
- regs[8] = tswapl(env->segs[R_ES].selector & 0xffff);
- regs[9] = tswapl(env->segs[R_FS].selector & 0xffff);
- regs[10] = tswapl(env->segs[R_GS].selector & 0xffff);
- regs[11] = tswapl(get_task_state(env_cpu_const(env))->orig_ax);
- regs[12] = tswapl(env->eip);
- regs[13] = tswapl(env->segs[R_CS].selector & 0xffff);
- regs[14] = tswapl(env->eflags);
- regs[15] = tswapl(env->regs[R_ESP]);
- regs[16] = tswapl(env->segs[R_SS].selector & 0xffff);
-}
-
/*
* i386 is the only target which supplies AT_SYSINFO for the vdso.
* All others only supply AT_SYSINFO_EHDR.
diff --git a/linux-user/i386/elfload.c b/linux-user/i386/elfload.c
index ef3a6c35d2..909f8edcab 100644
--- a/linux-user/i386/elfload.c
+++ b/linux-user/i386/elfload.c
@@ -23,3 +23,24 @@ const char *get_elf_platform(CPUState *cs)
family = MAX(MIN(family, 6), 3);
return elf_platform[family - 3];
}
+
+void elf_core_copy_regs(target_ulong *regs, const CPUX86State *env)
+{
+ regs[0] = tswapl(env->regs[R_EBX]);
+ regs[1] = tswapl(env->regs[R_ECX]);
+ regs[2] = tswapl(env->regs[R_EDX]);
+ regs[3] = tswapl(env->regs[R_ESI]);
+ regs[4] = tswapl(env->regs[R_EDI]);
+ regs[5] = tswapl(env->regs[R_EBP]);
+ regs[6] = tswapl(env->regs[R_EAX]);
+ regs[7] = tswapl(env->segs[R_DS].selector & 0xffff);
+ regs[8] = tswapl(env->segs[R_ES].selector & 0xffff);
+ regs[9] = tswapl(env->segs[R_FS].selector & 0xffff);
+ regs[10] = tswapl(env->segs[R_GS].selector & 0xffff);
+ regs[11] = tswapl(get_task_state(env_cpu_const(env))->orig_ax);
+ regs[12] = tswapl(env->eip);
+ regs[13] = tswapl(env->segs[R_CS].selector & 0xffff);
+ regs[14] = tswapl(env->eflags);
+ regs[15] = tswapl(env->regs[R_ESP]);
+ regs[16] = tswapl(env->segs[R_SS].selector & 0xffff);
+}
diff --git a/linux-user/x86_64/elfload.c b/linux-user/x86_64/elfload.c
index 88541ea45e..cd7aeb9743 100644
--- a/linux-user/x86_64/elfload.c
+++ b/linux-user/x86_64/elfload.c
@@ -19,3 +19,34 @@ const char *get_elf_platform(CPUState *cs)
{
return "x86_64";
}
+
+void elf_core_copy_regs(target_ulong *regs, const CPUX86State *env)
+{
+ regs[0] = tswapl(env->regs[15]);
+ regs[1] = tswapl(env->regs[14]);
+ regs[2] = tswapl(env->regs[13]);
+ regs[3] = tswapl(env->regs[12]);
+ regs[4] = tswapl(env->regs[R_EBP]);
+ regs[5] = tswapl(env->regs[R_EBX]);
+ regs[6] = tswapl(env->regs[11]);
+ regs[7] = tswapl(env->regs[10]);
+ regs[8] = tswapl(env->regs[9]);
+ regs[9] = tswapl(env->regs[8]);
+ regs[10] = tswapl(env->regs[R_EAX]);
+ regs[11] = tswapl(env->regs[R_ECX]);
+ regs[12] = tswapl(env->regs[R_EDX]);
+ regs[13] = tswapl(env->regs[R_ESI]);
+ regs[14] = tswapl(env->regs[R_EDI]);
+ regs[15] = tswapl(get_task_state(env_cpu_const(env))->orig_ax);
+ regs[16] = tswapl(env->eip);
+ regs[17] = tswapl(env->segs[R_CS].selector & 0xffff);
+ regs[18] = tswapl(env->eflags);
+ regs[19] = tswapl(env->regs[R_ESP]);
+ regs[20] = tswapl(env->segs[R_SS].selector & 0xffff);
+ regs[21] = tswapl(env->segs[R_FS].selector & 0xffff);
+ regs[22] = tswapl(env->segs[R_GS].selector & 0xffff);
+ regs[23] = tswapl(env->segs[R_DS].selector & 0xffff);
+ regs[24] = tswapl(env->segs[R_ES].selector & 0xffff);
+ regs[25] = tswapl(env->segs[R_FS].selector & 0xffff);
+ regs[26] = tswapl(env->segs[R_GS].selector & 0xffff);
+}
--
2.43.0
next prev parent reply other threads:[~2025-08-02 23:22 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-02 23:03 [PATCH v2 00/95] linux-user: Split up elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 01/95] semihosting: Retrieve stack top from image_info Richard Henderson
2025-08-03 10:43 ` Peter Maydell
2025-08-02 23:03 ` [PATCH v2 02/95] semihosting: Initialize heap once per process Richard Henderson
2025-08-03 10:41 ` Peter Maydell
2025-08-03 19:59 ` Richard Henderson
2025-08-02 23:03 ` [PATCH v2 03/95] linux-user: Create target/elfload.c files Richard Henderson
2025-08-02 23:03 ` [PATCH v2 04/95] linux-user: Move ppc uabi/asm/elf.h workaround to osdep.h Richard Henderson
2025-08-03 10:32 ` Peter Maydell
2025-08-02 23:03 ` [PATCH v2 05/95] linux-user: Move get_elf_cpu_model to target/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 06/95] linux-user: Move get_elf_hwcap to {i386, x86_64}/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 07/95] linux-user: Move hwcap functions to {arm, aarch64}/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 08/95] linux-user: Move get_elf_hwcap to sparc/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 09/95] linux-user: Move hwcap functions to ppc/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 10/95] linux-user: Move get_elf_hwcap to loongarch64/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 11/95] linux-user: Move get_elf_hwcap to mips/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 12/95] linux-user: Move get_elf_hwcap to sh4/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 13/95] linux-user: Move hwcap functions to s390x/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 14/95] linux-user: Move get_elf_hwcap to riscv/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 15/95] linux-user: Remove ELF_HWCAP Richard Henderson
2025-08-02 23:03 ` [PATCH v2 16/95] linux-user: Remove ELF_HWCAP2 Richard Henderson
2025-08-03 10:44 ` Peter Maydell
2025-08-02 23:03 ` [PATCH v2 17/95] linux-user: Move get_elf_platform to {i386, x86_64}/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 18/95] linux-user/i386: Return const data from get_elf_platform Richard Henderson
2025-08-02 23:03 ` [PATCH v2 19/95] linux-user: Move get_elf_platform to arm/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 20/95] linux-user/loongarch64: Create get_elf_platform Richard Henderson
2025-08-02 23:03 ` [PATCH v2 21/95] linux-user/hppa: " Richard Henderson
2025-08-02 23:03 ` [PATCH v2 22/95] linux-user: Remove ELF_PLATFORM Richard Henderson
2025-08-02 23:03 ` [PATCH v2 23/95] linux-user: Move get_elf_base_platform to mips/elfload.c Richard Henderson
2025-08-02 23:03 ` [PATCH v2 24/95] linux-user: Move target_cpu_copy_regs decl to qemu.h Richard Henderson
2025-08-02 23:03 ` [PATCH v2 25/95] linux-user: Create do_init_main_thread Richard Henderson
2025-08-02 23:03 ` [PATCH v2 26/95] linux-user/i386: Create init_main_thread Richard Henderson
2025-08-03 10:46 ` Peter Maydell
2025-08-02 23:03 ` [PATCH v2 27/95] linux-user/arm: " Richard Henderson
2025-08-03 10:44 ` Peter Maydell
2025-08-02 23:03 ` [PATCH v2 28/95] linux-user/arm: Remove a.out startup remenents Richard Henderson
2025-08-03 10:45 ` Peter Maydell
2025-08-02 23:03 ` [PATCH v2 29/95] linux-user/aarch64: Create init_main_thread Richard Henderson
2025-08-02 23:03 ` [PATCH v2 30/95] linux-user/sparc: " Richard Henderson
2025-08-02 23:03 ` [PATCH v2 31/95] linux-user/ppc: " Richard Henderson
2025-08-02 23:03 ` [PATCH v2 32/95] linux-user/loongarch64: " Richard Henderson
2025-08-02 23:03 ` [PATCH v2 33/95] linux-user/mips: " Richard Henderson
2025-08-02 23:03 ` [PATCH v2 34/95] linux-user/microblaze: " Richard Henderson
2025-08-02 23:03 ` [PATCH v2 35/95] linux-user/openrisc: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 36/95] linux-user/sh4: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 37/95] linux-user/m68k: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 38/95] linux-user/alpha: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 39/95] linux-user/s390x: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 40/95] linux-user/riscv: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 41/95] linux-user/hppa: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 42/95] linux-user/xtensa: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 43/95] linux-user/hexagon: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 44/95] linux-user: Remove do_init_main_thread Richard Henderson
2025-08-02 23:04 ` [PATCH v2 45/95] linux-user: Remove target_elf_greg_t Richard Henderson
2025-08-03 10:59 ` Peter Maydell
2025-08-03 20:11 ` Richard Henderson
2025-08-04 8:54 ` Peter Maydell
2025-08-02 23:04 ` [PATCH v2 46/95] linux-user: Replace tswapreg with tswapl Richard Henderson
2025-08-02 23:04 ` [PATCH v2 47/95] linux-user: Unify elf_core_copy_regs signatures Richard Henderson
2025-08-02 23:04 ` [PATCH v2 48/95] linux-user: Declare elf_core_copy_regs in loader.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 49/95] linux-user: Remove USE_ELF_CORE_DUMP Richard Henderson
2025-08-02 23:04 ` Richard Henderson [this message]
2025-08-02 23:04 ` [PATCH v2 51/95] linux-user: Move elf_core_copy_regs to arm/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 52/95] linux-user: Move elf_core_copy_regs to aarch64/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 53/95] linux-user: Move elf_core_copy_regs to ppc/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 54/95] linux-user: Move elf_core_copy_regs to loongarch64/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 55/95] linux-user: Move elf_core_copy_regs to mips/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 56/95] linux-user: Move elf_core_copy_regs to microblaze/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 57/95] linux-user: Move elf_core_copy_regs to openrisc/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 58/95] linux-user: Move elf_core_copy_regs to sh4/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 59/95] linux-user: Move elf_core_copy_regs to m68k/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 60/95] linux-user: Move elf_core_copy_regs to s390x/elfload.c Richard Henderson
2025-08-03 11:05 ` Peter Maydell
2025-08-02 23:04 ` [PATCH v2 61/95] linux-user: Move elf_core_copy_regs to xtensa/elfload.c Richard Henderson
2025-08-03 11:04 ` Peter Maydell
2025-08-02 23:04 ` [PATCH v2 62/95] linux-user: Move init_guest_commpage to x86_64/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 63/95] linux-user: Move init_guest_commpage to arm/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 64/95] linux-user: Move init_guest_commpage to hppa/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 65/95] linux-user: Replace init_guest_commpage macro with function Richard Henderson
2025-08-02 23:04 ` [PATCH v2 66/95] linux-user: Move get_vdso_image_info to arm/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 67/95] linux-user: Remove ELF_EXEC_PAGESIZE Richard Henderson
2025-08-02 23:04 ` [PATCH v2 68/95] linux-user: Remove redundant ELF_DATA definitons Richard Henderson
2025-08-03 11:04 ` Peter Maydell
2025-08-02 23:04 ` [PATCH v2 69/95] linux-user: Move elf parameters to {i386, x86_64}/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 70/95] linux-user: Move elf parameters to {arm, aarch64}/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 71/95] linux-user: Move elf parameters to sparc/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 72/95] linux-user: Move elf parameters to ppc/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 73/95] linux-user: Move elf parameters to loongarch64/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 74/95] linux-user: Move elf parameters to {mips, mips64}/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 75/95] linux-user: Move elf parameters to microblaze/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 76/95] linux-user: Move elf parameters to openrisc/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 77/95] linux-user: Move elf parameters to sh4/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 78/95] linux-user: Move elf parameters to m68k/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 79/95] linux-user: Move elf parameters to alpha/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 80/95] linux-user: Move elf parameters to s390x/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 81/95] linux-user: Move elf parameters to riscv/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 82/95] linux-user: Move elf parameters to hppa/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 83/95] linux-user: Move elf parameters to xtensa/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 84/95] linux-user: Move elf parameters to hexagon/target_elf.h Richard Henderson
2025-08-02 23:04 ` [PATCH v2 85/95] linux-user: Standardize on ELF_MACHINE not ELF_ARCH Richard Henderson
2025-08-02 23:04 ` [PATCH v2 86/95] linux-user: Rename elf_check_arch Richard Henderson
2025-08-02 23:04 ` [PATCH v2 87/95] linux-user: Remove ELIBBAD from elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 88/95] linux-user: Remove MAP_DENYWRITE " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 89/95] linux-user: Move arch_parse_elf_property to aarch64/elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 90/95] linux-user: Remove a.out declarations from elfload.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 91/95] linux-user/sparc: Move target_pt_regs to signal.c Richard Henderson
2025-08-02 23:04 ` [PATCH v2 92/95] linux-user/microblaze: " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 93/95] linux-user/openrisc: " Richard Henderson
2025-08-03 11:03 ` Peter Maydell
2025-08-02 23:04 ` [PATCH v2 94/95] linux-user/s390x: Move target_psw_t " Richard Henderson
2025-08-02 23:04 ` [PATCH v2 95/95] linux-user: Remove struct target_pt_regs from target_syscall.h Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250802230459.412251-51-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).