Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed ordering of registers in arch_debug_gdb_get_registers.

Browse Source 
Current code was sending EAX, EBX, ECX, EDX..., GDB (all versions as far
as I can tell) expects EAX, ECX, EDX, EBX... Also added missing FS and GS.
This commit is contained in:
Alex Smith 2012-07-12 15:59:50 +01:00
parent 8c51cca27e
commit 7dc738b0fb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/kernel/arch/x86/arch_debug.cpp
View File

@ -1188,21 +1188,22 @@ arch_debug_gdb_get_registers(char* buffer, size_t bufferSize)
// For x86 the register order is: // For x86 the register order is:
// //
// eax, ebx, ecx, edx, // eax, ecx, edx, ebx,
// esp, ebp, esi, edi, // esp, ebp, esi, edi,
// eip, eflags, // eip, eflags,
// cs, ss, ds, es // cs, ss, ds, es, fs, gs
// //
// Note that even though the segment descriptors are actually 16 bits wide, // Note that even though the segment descriptors are actually 16 bits wide,
// gdb requires them as 32 bit integers. Note also that for some reason // gdb requires them as 32 bit integers. Note also that for some reason
// gdb wants the register dump in *big endian* format. // gdb wants the register dump in *big endian* format.
static const int32 kRegisterCount = 14; static const int32 kRegisterCount = 16;
uint32 registers[kRegisterCount] = { uint32 registers[kRegisterCount] = {
frame->eax, frame->ebx, frame->ecx, frame->edx, frame->eax, frame->ecx, frame->edx, frame->ebx,
frame->esp, frame->ebp, frame->esi, frame->edi, frame->esp, frame->ebp, frame->esi, frame->edi,
frame->eip, frame->flags, frame->eip, frame->flags,
frame->cs, frame->ds, frame->ds, frame->es frame->cs, frame->ds, frame->ds, frame->es,
// assume ss == ds // assume ss == ds
frame->fs, frame->gs
}; };
const char* const bufferStart = buffer; const char* const bufferStart = buffer;