diff options
| author | Luca Dariz <luca@orpolo.org> | 2023-05-26 20:48:01 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-05-26 23:39:04 +0200 |
| commit | ee2e9072964ce1615c9059a6141200244f9f9119 (patch) | |
| tree | a25bc96fa5fa77d376b4e54a6d59618b71c0cb45 | |
| parent | 4677606b7c4c2b090d11fdd705ce9978fb1c5d5a (diff) | |
| download | gnumach-ee2e9072964ce1615c9059a6141200244f9f9119.tar.gz gnumach-ee2e9072964ce1615c9059a6141200244f9f9119.tar.bz2 gnumach-ee2e9072964ce1615c9059a6141200244f9f9119.zip | |
x86_64: add 64-bit registers when dumping thread state
* i386/i386/debug_i386.c: when using a 64-bit userspace we need to use
RAX and so on, and we can ignore most segments except FS/GS, but
only the base address is useful.
Message-Id: <20230526184801.753581-4-luca@orpolo.org>
| -rw-r--r-- | i386/i386/debug_i386.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/i386/i386/debug_i386.c b/i386/i386/debug_i386.c index 4b8804cd..b5465796 100644 --- a/i386/i386/debug_i386.c +++ b/i386/i386/debug_i386.c @@ -31,6 +31,19 @@ void dump_ss(const struct i386_saved_state *st) { printf("Dump of i386_saved_state %p:\n", st); +#if defined(__x86_64__) && ! defined(USER32) + printf("RAX %016lx RBX %016lx RCX %016lx RDX %016lx\n", + st->eax, st->ebx, st->ecx, st->edx); + printf("RSI %016lx RDI %016lx RBP %016lx RSP %016lx\n", + st->esi, st->edi, st->ebp, st->uesp); + printf("R8 %016lx R9 %016lx R10 %016lx R11 %016lx\n", + st->r8, st->r9, st->r10, st->r11); + printf("R12 %016lx R13 %016lx R14 %016lx R15 %016lx\n", + st->r12, st->r13, st->r14, st->r15); + printf("FSBASE %016lx GSBASE %016lx\n", + st->fsbase, st->gsbase); + printf("RIP %016lx EFLAGS %08lx\n", st->eip, st->efl); +#else printf("EAX %08lx EBX %08lx ECX %08lx EDX %08lx\n", st->eax, st->ebx, st->ecx, st->edx); printf("ESI %08lx EDI %08lx EBP %08lx ESP %08lx\n", @@ -45,6 +58,7 @@ void dump_ss(const struct i386_saved_state *st) st->v86_segs.v86_ds & 0xffff, st->v86_segs.v86_es & 0xffff, st->v86_segs.v86_gs & 0xffff, st->v86_segs.v86_gs & 0xffff); printf("EIP %08lx EFLAGS %08lx\n", st->eip, st->efl); +#endif printf("trapno %ld: %s, error %08lx\n", st->trapno, trap_name(st->trapno), st->err); |