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 sh4/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 06:12:27 -10:00
parent 28c7d60b54
commit a4ea8c30e7
3 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

33
linux-user/elfload.c
View file

@ -433,39 +433,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t elf_flags)
#define ELF_CLASS ELFCLASS32
#define ELF_ARCH EM_SH
/* See linux kernel: arch/sh/include/asm/elf.h. */
#define ELF_NREG 23
typedef struct target_elf_gregset_t {
target_elf_greg_t regs[ELF_NREG];
} target_elf_gregset_t;
/* See linux kernel: arch/sh/include/asm/ptrace.h. */
enum {
TARGET_REG_PC = 16,
TARGET_REG_PR = 17,
TARGET_REG_SR = 18,
TARGET_REG_GBR = 19,
TARGET_REG_MACH = 20,
TARGET_REG_MACL = 21,
TARGET_REG_SYSCALL = 22
};
void elf_core_copy_regs(target_elf_gregset_t *r, const CPUSH4State *env)
{
for (int i = 0; i < 16; i++) {
r->regs[i] = tswapreg(env->gregs[i]);
}
r->regs[TARGET_REG_PC] = tswapreg(env->pc);
r->regs[TARGET_REG_PR] = tswapreg(env->pr);
r->regs[TARGET_REG_SR] = tswapreg(env->sr);
r->regs[TARGET_REG_GBR] = tswapreg(env->gbr);
r->regs[TARGET_REG_MACH] = tswapreg(env->mach);
r->regs[TARGET_REG_MACL] = tswapreg(env->macl);
r->regs[TARGET_REG_SYSCALL] = 0; /* FIXME */
}
#define HAVE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 4096
#endif

29
linux-user/sh4/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)
@ -36,3 +37,31 @@ abi_ulong get_elf_hwcap(CPUState *cs)
return hwcap;
}
#define tswapreg(ptr) tswapal(ptr)
/* See linux kernel: arch/sh/include/asm/ptrace.h. */
enum {
TARGET_REG_PC = 16,
TARGET_REG_PR = 17,
TARGET_REG_SR = 18,
TARGET_REG_GBR = 19,
TARGET_REG_MACH = 20,
TARGET_REG_MACL = 21,
TARGET_REG_SYSCALL = 22
};
void elf_core_copy_regs(target_elf_gregset_t *r, const CPUSH4State *env)
{
for (int i = 0; i < 16; i++) {
r->regs[i] = tswapreg(env->gregs[i]);
}
r->regs[TARGET_REG_PC] = tswapreg(env->pc);
r->regs[TARGET_REG_PR] = tswapreg(env->pr);
r->regs[TARGET_REG_SR] = tswapreg(env->sr);
r->regs[TARGET_REG_GBR] = tswapreg(env->gbr);
r->regs[TARGET_REG_MACH] = tswapreg(env->mach);
r->regs[TARGET_REG_MACL] = tswapreg(env->macl);
r->regs[TARGET_REG_SYSCALL] = 0; /* FIXME */
}

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

@ -9,5 +9,14 @@
#define SH4_TARGET_ELF_H
#define HAVE_ELF_HWCAP 1
#define HAVE_ELF_CORE_DUMP 1
typedef abi_ulong target_elf_greg_t;
/* See linux kernel: arch/sh/include/asm/elf.h. */
#define ELF_NREG 23
typedef struct target_elf_gregset_t {
target_elf_greg_t regs[ELF_NREG];
} target_elf_gregset_t;
#endif