izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

linux-user: Move elf_core_copy_regs to m68k/elfload.c

Browse Source 
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 <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
2025-08-30 07:04:03 +10:00
parent a4ea8c30e7
commit bcaebf6e5b
3 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linux-user/elfload.c
-31
View File
@@ -442,37 +442,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t elf_flags)
#define ELF_CLASS ELFCLASS32
#define ELF_ARCH EM_68K
/* See linux kernel: arch/m68k/include/asm/elf.h. */
#define ELF_NREG 20
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 CPUM68KState *env)
{
r->regs[0] = tswapreg(env->dregs[1]);
r->regs[1] = tswapreg(env->dregs[2]);
r->regs[2] = tswapreg(env->dregs[3]);
r->regs[3] = tswapreg(env->dregs[4]);
r->regs[4] = tswapreg(env->dregs[5]);
r->regs[5] = tswapreg(env->dregs[6]);
r->regs[6] = tswapreg(env->dregs[7]);
r->regs[7] = tswapreg(env->aregs[0]);
r->regs[8] = tswapreg(env->aregs[1]);
r->regs[9] = tswapreg(env->aregs[2]);
r->regs[10] = tswapreg(env->aregs[3]);
r->regs[11] = tswapreg(env->aregs[4]);
r->regs[12] = tswapreg(env->aregs[5]);
r->regs[13] = tswapreg(env->aregs[6]);
r->regs[14] = tswapreg(env->dregs[0]);
r->regs[15] = tswapreg(env->aregs[7]);
r->regs[16] = tswapreg(env->dregs[0]); /* FIXME: orig_d0 */
r->regs[17] = tswapreg(env->sr);
r->regs[18] = tswapreg(env->pc);
r->regs[19] = 0; /* FIXME: regs->format | regs->vector */
}
#define HAVE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 8192
#endif
linux-user/m68k/elfload.c
+27
View File
@@ -4,6 +4,7 @@
#include "qemu.h"
#include "loader.h"
#include "elf.h"
#include "target_elf.h"
const char *get_elf_cpu_model(uint32_t eflags)
@@ -16,3 +17,29 @@ const char *get_elf_cpu_model(uint32_t eflags)
/* Coldfire */
return "any";
}
#define tswapreg(ptr) tswapal(ptr)
void elf_core_copy_regs(target_elf_gregset_t *r, const CPUM68KState *env)
{
r->regs[0] = tswapreg(env->dregs[1]);
r->regs[1] = tswapreg(env->dregs[2]);
r->regs[2] = tswapreg(env->dregs[3]);
r->regs[3] = tswapreg(env->dregs[4]);
r->regs[4] = tswapreg(env->dregs[5]);
r->regs[5] = tswapreg(env->dregs[6]);
r->regs[6] = tswapreg(env->dregs[7]);
r->regs[7] = tswapreg(env->aregs[0]);
r->regs[8] = tswapreg(env->aregs[1]);
r->regs[9] = tswapreg(env->aregs[2]);
r->regs[10] = tswapreg(env->aregs[3]);
r->regs[11] = tswapreg(env->aregs[4]);
r->regs[12] = tswapreg(env->aregs[5]);
r->regs[13] = tswapreg(env->aregs[6]);
r->regs[14] = tswapreg(env->dregs[0]);
r->regs[15] = tswapreg(env->aregs[7]);
r->regs[16] = tswapreg(env->dregs[0]); /* FIXME: orig_d0 */
r->regs[17] = tswapreg(env->sr);
r->regs[18] = tswapreg(env->pc);
r->regs[19] = 0; /* FIXME: regs->format | regs->vector */
}
linux-user/m68k/target_elf.h
+10
View File
@@ -8,4 +8,14 @@
#ifndef M68K_TARGET_ELF_H
#define M68K_TARGET_ELF_H
#define HAVE_ELF_CORE_DUMP 1
typedef abi_ulong target_elf_greg_t;
/* See linux kernel: arch/m68k/include/asm/elf.h. */
#define ELF_NREG 20
typedef struct target_elf_gregset_t {
target_elf_greg_t regs[ELF_NREG];
} target_elf_gregset_t;
#endif