fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux-user: Move elf_core_copy_regs to ppc/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-07-29 05:55:56 -10:00
parent b71b68b233
commit a67e20d629
3 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
linux-user/elfload.c
View file

@ -361,32 +361,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t elf_flags)
NEW_AUX_ENT(AT_UCACHEBSIZE, 0); \
} while (0)
/* 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 = 0;
for (i = 0; i < ARRAY_SIZE(env->gpr); i++) {
r->regs[i] = tswapreg(env->gpr[i]);
}
r->regs[32] = tswapreg(env->nip);
r->regs[33] = tswapreg(env->msr);
r->regs[35] = tswapreg(env->ctr);
r->regs[36] = tswapreg(env->lr);
r->regs[37] = tswapreg(cpu_read_xer(env));
ccr = ppc_get_cr(env);
r->regs[38] = tswapreg(ccr);
}
#define HAVE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 4096
#ifndef TARGET_PPC64

22
linux-user/ppc/elfload.c
View file

@ -3,6 +3,7 @@
#include "qemu/osdep.h"
#include "qemu.h"
#include "loader.h"
#include "target_elf.h"
const char *get_elf_cpu_model(uint32_t eflags)
@ -129,3 +130,24 @@ abi_ulong get_elf_hwcap2(CPUState *cs)
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 = 0;
for (i = 0; i < ARRAY_SIZE(env->gpr); i++) {
r->regs[i] = tswapreg(env->gpr[i]);
}
r->regs[32] = tswapreg(env->nip);
r->regs[33] = tswapreg(env->msr);
r->regs[35] = tswapreg(env->ctr);
r->regs[36] = tswapreg(env->lr);
r->regs[37] = tswapreg(cpu_read_xer(env));
ccr = ppc_get_cr(env);
r->regs[38] = tswapreg(ccr);
}

9
linux-user/ppc/target_elf.h
View file

@ -10,5 +10,14 @@
#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;
#endif