linux-user/alpha: write the floating-point registers to a core dump
PATCH 1/5 linux-user/alpha: write the floating-point registers to a core dump
A guest core carried only the general-purpose registers, so a debugger opening one reported every floating-point register as unavailable -- including the arguments of the function that crashed.
Implement HAVE_ELF_CORE_FPREGS for Alpha: define target_elf_fpregset_t to match the kernel's layout ($f0-$f30 plus the control register in the slot $f31 would occupy) and fill it from elf_core_copy_fpregs().
Checked with lldb on a core from a program that faults with live values in $f16 and $f17: both read back correctly, as does the control register.
--- linux-user/alpha/elfload.c | 10 ++++++++++ linux-user/alpha/target_elf.h | 11 +++++++++++ 2 files changed, 21 insertions(+)
linux-user/alpha/elfload.c +10 -0
@@ -32,3 +32,13 @@ const char *get_elf_cpu_model(uint32_t eflags) {return "ev67" ; } + +void elf_core_copy_fpregs (target_elf_fpregset_t *r,const CPUAlphaState *env) +{ +int i; + +for (i =0 ; i <31 ; i++) { + r->fpr[i] =tswap64 (env->fir[i]); + } + r->fpcr =tswap64 (cpu_alpha_load_fpcr ((CPUAlphaState *)env)); +}
linux-user/alpha/target_elf.h +11 -0
@@ -19,6 +19,17 @@* r0-r30 at indices 0-30, pc at 31, ps at 32. * r31 (hardwired zero) is not stored; pc occupies index 31. */ +/* +* The floating-point note holds $f0 through $f30 and then the control +* register in the slot $f31 would occupy; $f31 reads as zero. +*/ +#define HAVE_ELF_CORE_FPREGS 1 + +typedef struct target_elf_fpregset_t { +uint64_t fpr[31 ];/* $f0-$f30 */ +uint64_t fpcr;/* the slot for $f31 */ +}target_elf_fpregset_t ; + typedef struct target_elf_gregset_t { abi_ulong regs[31]; /* integer registers r0-r30 [0..30] */ abi_ulong pc; /* program counter [31] */
Signature · 1 line
2.54.0
PATCH 2/5 linux-user/mips: write the floating-point registers to a core dump
Write an NT_FPREGSET note for MIPS and MIPS64, matching the kernel's elf_fpregset_t layout (ELF_NFPREG = 33): fpr[0..31] hold f0-f31, and fcsr occupies the low 32 bits of slot 32. The pad field rounds the struct to 33 × 8 bytes = 264 bytes.
--- linux-user/mips/elfload.c | 8 ++++++++ linux-user/mips/target_elf.h | 13 +++++++++++++ linux-user/mips64/target_elf.h | 13 +++++++++++++ 3 files changed, 34 insertions(+)
linux-user/mips/elfload.c +8 -0
@@ -130,6 +130,14 @@ const char *get_elf_base_platform(CPUState *cs)#undef MATCH_PLATFORM_INSN +void elf_core_copy_fpregs (target_elf_fpregset_t *r,const CPUMIPSState *env) +{ +for (int i =0 ; i <32 ; i++) { + r->fpr[i] =tswap64 (env->active_fpu.fpr[i].d); + } + r->fcsr =tswap32 (env->active_fpu.fcr31); +} +/* See linux kernel: arch/mips/kernel/process.c:elf_dump_regs. */ #ifndef TARGET_MIPS64 void elf_core_copy_regs (target_elf_gregset_t *r,const CPUMIPSState *env)
linux-user/mips/target_elf.h +13 -0
@@ -26,4 +26,17 @@ typedef struct target_elf_gregset_t { }; } target_elf_gregset_t; +#define HAVE_ELF_CORE_FPREGS 1 + +/* +* Matches the kernel's elf_fpregset_t (ELF_NFPREG = 33): +* fpr[0..31] hold f0-f31; fcsr occupies the low 32 bits of slot 32. +* pad rounds the struct to 33 × 8 bytes = 264 bytes. +*/ +typedef struct target_elf_fpregset_t { +uint64_t fpr[32 ]; +uint32_t fcsr; +uint32_t pad; +}target_elf_fpregset_t ; +#endif
linux-user/mips64/target_elf.h +13 -0
@@ -32,4 +32,17 @@ typedef struct target_elf_gregset_t { }; } target_elf_gregset_t; +#define HAVE_ELF_CORE_FPREGS 1 + +/* +* Matches the kernel's elf_fpregset_t (ELF_NFPREG = 33): +* fpr[0..31] hold f0-f31; fcsr occupies the low 32 bits of slot 32. +* pad rounds the struct to 33 × 8 bytes = 264 bytes. +*/ +typedef struct target_elf_fpregset_t { +uint64_t fpr[32 ]; +uint32_t fcsr; +uint32_t pad; +}target_elf_fpregset_t ; +#endif
Signature · 1 line
2.54.0
PATCH 3/5 linux-user/hppa: write the floating-point registers to a core dump
In reply to Matt TurnerWrite an NT_FPREGSET note for HPPA, matching the kernel's elf_fpregset_t layout (ELF_NFPREG = 32): fr0-fr31 as 64-bit values.
--- linux-user/hppa/elfload.c | 7 +++++++ linux-user/hppa/target_elf.h | 9 +++++++++ 2 files changed, 16 insertions(+)
linux-user/hppa/elfload.c +7 -0
@@ -17,6 +17,13 @@ const char *get_elf_platform(CPUState *cs)return "PARISC" ; } +void elf_core_copy_fpregs (target_elf_fpregset_t *r,const CPUArchState *env) +{ +for (int i =0 ; i <32 ; i++) { + r->fpr[i] =tswap64 (env->fr[i]); + } +} +void elf_core_copy_regs (target_elf_gregset_t *r,const CPUArchState *env) {int i;
linux-user/hppa/target_elf.h +9 -0
@@ -39,4 +39,13 @@ typedef struct target_elf_gregset_t {#define STACK_ALIGNMENT 64#define VDSO_HEADER "vdso.c.inc" +#define HAVE_ELF_CORE_FPREGS 1 + +/* +* Matches the kernel's elf_fpregset_t (ELF_NFPREG = 32): fr0-fr31. +*/ +typedef struct target_elf_fpregset_t { +uint64_t fpr[32 ]; +}target_elf_fpregset_t ; +#endif
Signature · 1 line
2.54.0
PATCH 4/5 linux-user/riscv: write the floating-point registers to a core dump
In reply to Matt TurnerWrite an NT_FPREGSET note for RISC-V, matching struct __riscv_d_ext_state from uapi/asm/ptrace.h: f0-f31 as 64-bit values followed by fcsr.
--- linux-user/riscv/elfload.c | 9 +++++++++ linux-user/riscv/target_elf.h | 11 +++++++++++ 2 files changed, 20 insertions(+)
linux-user/riscv/elfload.c +9 -0
@@ -11,6 +11,15 @@ const char *get_elf_cpu_model(uint32_t eflags)return "max" ; } +void elf_core_copy_fpregs (target_elf_fpregset_t *r,const CPURISCVState *env) +{ +for (int i =0 ; i <32 ; i++) { + r->fpr[i] =tswap64 (env->fpr[i]); + } + r->fcsr =tswap32 (((uint32_t )env->frm <<FSR_RD_SHIFT ) | + (riscv_cpu_get_fflags ((CPURISCVState *)env) <<FSR_AEXC_SHIFT )); +} +void elf_core_copy_regs (target_elf_gregset_t *r,const CPURISCVState *env) { r->pc =tswapal (env->pc);
linux-user/riscv/target_elf.h +11 -0
@@ -27,4 +27,15 @@ typedef struct target_elf_gregset_t { abi_ulong regs[31]; } target_elf_gregset_t; +#define HAVE_ELF_CORE_FPREGS 1 + +/* +* Matches struct __riscv_d_ext_state from uapi/asm/ptrace.h: +* f0-f31 as 64-bit values followed by fcsr. +*/ +typedef struct target_elf_fpregset_t { +uint64_t fpr[32 ]; +uint32_t fcsr; +}target_elf_fpregset_t ; +#endif
Signature · 1 line
2.54.0
PATCH 5/5 linux-user/sh4: write the floating-point registers to a core dump
In reply to Matt TurnerWrite an NT_FPREGSET note for SH4, matching struct user_fpu_struct from arch/sh/include/asm/user.h: fr0-fr15, xf0-xf15, fpscr, fpul.
--- linux-user/sh4/elfload.c | 10 ++++++++++ linux-user/sh4/target_elf.h | 12 ++++++++++++ 2 files changed, 22 insertions(+)
linux-user/sh4/elfload.c +10 -0
@@ -52,6 +52,16 @@ abi_ulong get_elf_hwcap(CPUState *cs)return hwcap; } +void elf_core_copy_fpregs (target_elf_fpregset_t *r,const CPUSH4State *env) +{ +for (int i =0 ; i <16 ; i++) { + r->fpregs[i] =tswap32 (env->fregs[i]); + r->xfpregs[i] =tswap32 (env->fregs[16 + i]); + } + r->fpscr =tswap32 (env->fpscr); + r->fpul =tswap32 (env->fpul); +} +void elf_core_copy_regs (target_elf_gregset_t *r,const CPUSH4State *env) {for (int i =0 ; i <16 ; i++) {
linux-user/sh4/target_elf.h +12 -0
@@ -25,4 +25,16 @@ typedef struct target_elf_gregset_t { struct target_pt_regs pt; } target_elf_gregset_t; +#define HAVE_ELF_CORE_FPREGS 1 + +/* +* Matches struct user_fpu_struct from arch/sh/include/asm/user.h. +*/ +typedef struct target_elf_fpregset_t { +uint32_t fpregs[16 ]; +uint32_t xfpregs[16 ]; +uint32_t fpscr; +uint32_t fpul; +}target_elf_fpregset_t ; +#endif
Signature · 1 line
2.54.0
Quoted 8 lines · Matt Turner
A guest core carried only the general-purpose registers, so a debugger opening one reported every floating-point register as unavailable -- including the arguments of the function that crashed.
Implement
HAVE_ELF_CORE_FPREGSfor Alpha: definetarget_elf_fpregset_tto match the kernel's layout ($f0-$f30 plus the control register in the slot $f31 would occupy) and fill it fromelf_core_copy_fpregs().
Quoted 8 lines
Checked with lldb on a core from a program that faults with live values in $f16 and $f17: both read back correctly, as does the control register.
Signed-off-by Matt Turner <[email protected]>--- linux-user/alpha/elfload.c | 10 ++++++++++ linux-user/alpha/target_elf.h | 11 +++++++++++ 2 files changed, 21 insertions(+)
For the whole series:
series queued up for past qemu-v11.1
Thanks!
Helge