mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for internal debugger for 64-bit guest debugging

Browse Source
This commit is contained in:
Stanislav Shwartsman 2019-12-04 19:40:21 +00:00
parent 276482e67d
commit 79d6bf9d42
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bochs/bx_debug/dbg_main.cc
View File

@ -2782,8 +2782,7 @@ void bx_dbg_restore_command(const char *param_name, const char *restore_path)
void bx_dbg_disassemble_current(const char *format) void bx_dbg_disassemble_current(const char *format)
{ {
Bit64u addr = bx_dbg_get_laddr(bx_dbg_get_selector_value(BX_SEG_REG_CS), Bit64u addr = BX_CPU(dbg_cpu)->get_laddr(BX_SEG_REG_CS, BX_CPU(dbg_cpu)->get_instruction_pointer());
BX_CPU(dbg_cpu)->get_instruction_pointer());
bx_dbg_disassemble_command(format, addr, addr); bx_dbg_disassemble_command(format, addr, addr);
} }
@ -3859,26 +3858,27 @@ bx_address bx_dbg_get_laddr(Bit16u sel, bx_address ofs)
bx_address laddr; bx_address laddr;
if (BX_CPU(dbg_cpu)->protected_mode()) { if (BX_CPU(dbg_cpu)->protected_mode()) {
bx_descriptor_t descriptor;
Bit32u lowaddr, highaddr;
bx_descriptor_t descriptor;
if (! bx_dbg_read_pmode_descriptor(sel, &descriptor)) if (! bx_dbg_read_pmode_descriptor(sel, &descriptor))
return 0; return 0;
// expand-down if (BX_CPU(dbg_cpu)->get_cpu_mode() != BX_MODE_LONG_64) {
if (IS_DATA_SEGMENT(descriptor.type) && IS_DATA_SEGMENT_EXPAND_DOWN(descriptor.type)) { Bit32u lowaddr, highaddr;
lowaddr = descriptor.u.segment.limit_scaled;
highaddr = descriptor.u.segment.g ? 0xffffffff : 0xffff;
}
else {
lowaddr = 0;
highaddr = descriptor.u.segment.limit_scaled;
}
if ((ofs < lowaddr || ofs > highaddr) && // expand-down
BX_CPU(dbg_cpu)->get_cpu_mode() != BX_MODE_LONG_64) { if (IS_DATA_SEGMENT(descriptor.type) && IS_DATA_SEGMENT_EXPAND_DOWN(descriptor.type)) {
dbg_printf("WARNING: Offset %08X is out of selector %04x limit (%08x...%08x)!\n", lowaddr = descriptor.u.segment.limit_scaled;
ofs, sel, lowaddr, highaddr); highaddr = descriptor.u.segment.g ? 0xffffffff : 0xffff;
}
else {
lowaddr = 0;
highaddr = descriptor.u.segment.limit_scaled;
}
if (ofs < lowaddr || ofs > highaddr) {
dbg_printf("WARNING: Offset %08X is out of selector %04x limit (%08x...%08x)!\n", ofs, sel, lowaddr, highaddr);
}
} }
laddr = descriptor.u.segment.base + ofs; laddr = descriptor.u.segment.base + ofs;