preserve-emulation/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2026-07-11 01:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

linux-user/s390x: Expand target_elf_gregset_t

Browse Source 
Make use of the fact that target_elf_gregset_t is a proper structure.
This lets us drop the ugly cast to uint32_t* in the middle.

Drop ELF_NREG, 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-28 12:31:49 +10:00
parent 71c2c79815
commit dabda4f36a
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linux-user/s390x/elfload.c
+7 -21
View File
@@ -68,29 +68,15 @@ const char *elf_hwcap_str(uint32_t bit)
return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL;
}
#define tswapreg(ptr) tswapal(ptr)
enum {
TARGET_REG_PSWM = 0,
TARGET_REG_PSWA = 1,
TARGET_REG_GPRS = 2,
TARGET_REG_ARS = 18,
TARGET_REG_ORIG_R2 = 26,
};
void elf_core_copy_regs(target_elf_gregset_t *r, const CPUS390XState *env)
{
int i;
uint32_t *aregs;
r->regs[TARGET_REG_PSWM] = tswapreg(env->psw.mask);
r->regs[TARGET_REG_PSWA] = tswapreg(env->psw.addr);
for (i = 0; i < 16; i++) {
r->regs[TARGET_REG_GPRS + i] = tswapreg(env->regs[i]);
r->pt.psw.mask = tswapal(env->psw.mask);
r->pt.psw.addr = tswapal(env->psw.addr);
for (int i = 0; i < 16; i++) {
r->pt.gprs[i] = tswapal(env->regs[i]);
}
aregs = (uint32_t *)&(r->regs[TARGET_REG_ARS]);
for (i = 0; i < 16; i++) {
aregs[i] = tswap32(env->aregs[i]);
for (int i = 0; i < 16; i++) {
r->pt.acrs[i] = tswap32(env->aregs[i]);
}
r->regs[TARGET_REG_ORIG_R2] = 0;
r->pt.orig_gpr2 = 0;
}
linux-user/s390x/target_elf.h
+7 -5
View File
@@ -8,15 +8,17 @@
#ifndef S390X_TARGET_ELF_H
#define S390X_TARGET_ELF_H
#include "target_ptrace.h"
#define HAVE_ELF_HWCAP 1
#define HAVE_ELF_CORE_DUMP 1
typedef abi_ulong target_elf_greg_t;
/* See linux kernel: arch/s390/include/uapi/asm/ptrace.h (s390_regs). */
#define ELF_NREG 27
/*
* See linux kernel: arch/s390/include/asm/elf.h, where
* elf_gregset_t is typedef'd to struct s390_regs.
*/
typedef struct target_elf_gregset_t {
target_elf_greg_t regs[ELF_NREG];
struct target_s390_regs pt;
} target_elf_gregset_t;
#endif