i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into x86_64

Browse Source 
Conflicts:
	src/system/kernel/arch/x86/arch_debug.cpp
This commit is contained in:
Alex Smith
2012-07-12 16:32:12 +01:00
parent 4ebc6dfa68 7dc738b0fb
commit 8a65fedaaa
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_debug.cpp
+6 -5
View File
@@ -1189,21 +1189,22 @@ arch_debug_gdb_get_registers(char* buffer, size_t bufferSize)
// For x86 the register order is:
//
// eax, ebx, ecx, edx,
// eax, ecx, edx, ebx,
// esp, ebp, esi, edi,
// eip, eflags,
// cs, ss, ds, es
// cs, ss, ds, es, fs, gs
//
// 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 wants the register dump in *big endian* format.
static const int32 kRegisterCount = 14;
static const int32 kRegisterCount = 16;
uint32 registers[kRegisterCount] = {
frame->ax, frame->bx, frame->cx, frame->dx,
frame->ax, frame->cx, frame->dx, frame->bx,
frame->sp, frame->bp, frame->si, frame->di,
frame->ip, frame->flags,
frame->cs, frame->ds, frame->ds, frame->es
frame->cs, frame->ds, frame->ds, frame->es,
// assume ss == ds
frame->fs, frame->gs
};
const char* const bufferStart = buffer;