ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winedbg: Correctly display whether we're in 32 vs 64 bit code.

This commit is contained in:
Eric Pouech 2010-04-19 22:33:19 +02:00 committed by Alexandre Julliard
parent 8734d5b9ac
commit 3833600c79
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/winedbg/tgt_active.c
View File

@ -131,7 +131,8 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC
switch (addr.Mode) switch (addr.Mode)
{ {
case AddrModeFlat: case AddrModeFlat:
dbg_printf(" in 32-bit code (%s)", dbg_printf(" in %d-bit code (%s)",
be_cpu->pointer_size * 8,
memory_offset_to_string(hexbuf, addr.Offset, 0)); memory_offset_to_string(hexbuf, addr.Offset, 0));
break; break;
case AddrModeReal: case AddrModeReal:
@ -141,7 +142,7 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC
dbg_printf(" in 16-bit code (%04x:%04x)", addr.Segment, (unsigned) addr.Offset); dbg_printf(" in 16-bit code (%04x:%04x)", addr.Segment, (unsigned) addr.Offset);
break; break;
case AddrMode1632: case AddrMode1632:
dbg_printf(" in 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset); dbg_printf(" in segmented 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset);
break; break;
default: dbg_printf(" bad address"); default: dbg_printf(" bad address");
} }
@ -164,15 +165,14 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC
if (addr.Mode != dbg_curr_thread->addr_mode) if (addr.Mode != dbg_curr_thread->addr_mode)
{ {
const char* name = NULL; const char* name = NULL;
switch (addr.Mode) switch (addr.Mode)
{ {
case AddrMode1616: name = "16 bit"; break; case AddrMode1616: name = "16 bit"; break;
case AddrMode1632: name = "32 bit"; break; case AddrMode1632: name = "segmented 32 bit"; break;
case AddrModeReal: name = "vm86"; break; case AddrModeReal: name = "vm86"; break;
case AddrModeFlat: name = "32 bit"; break; case AddrModeFlat: name = be_cpu->pointer_size == 4 ? "32 bit" : "64 bit"; break;
} }
dbg_printf("In %s mode.\n", name); dbg_printf("In %s mode.\n", name);
dbg_curr_thread->addr_mode = addr.Mode; dbg_curr_thread->addr_mode = addr.Mode;
} }