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

Fixed compilation with debugger on

Browse Source
This commit is contained in:
Stanislav Shwartsman 2009-03-10 17:02:03 +00:00
parent 9e723a044f
commit 51ea504442
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/bx_debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.177 2009-03-10 16:28:00 sshwarts Exp $
// $Id: dbg_main.cc,v 1.178 2009-03-10 17:02:03 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -1759,8 +1759,8 @@ void bx_dbg_disassemble_current(int which_cpu, int print_time)
if (bx_dbg_read_linear(which_cpu, BX_CPU(which_cpu)->guard_found.laddr, 16, bx_disasm_ibuf))
{
unsigned ilen = bx_disassemble.disasm(IS_CODE32(BX_CPU(which_cpu)->guard_found.code_32_64),
IS_CODE64(BX_CPU(which_cpu)->guard_found),
unsigned ilen = bx_disassemble.disasm(IS_CODE_32(BX_CPU(which_cpu)->guard_found.code_32_64),
IS_CODE_64(BX_CPU(which_cpu)->guard_found.code_32_64),
BX_CPU(which_cpu)->get_segment_base(BX_SEG_REG_CS),
BX_CPU(which_cpu)->guard_found.eip, bx_disasm_ibuf, bx_disasm_tbuf);
@ -3674,8 +3674,8 @@ void bx_dbg_step_over_command()
return;
}
x86_insn insn = bx_disassemble.decode(IS_CODE32(BX_CPU(dbg_cpu)->guard_found.code_32_64),
IS_CODE64(BX_CPU(dbg_cpu)->guard_found.code_32_64),
x86_insn insn = bx_disassemble.decode(IS_CODE_32(BX_CPU(dbg_cpu)->guard_found.code_32_64),
IS_CODE_64(BX_CPU(dbg_cpu)->guard_found.code_32_64),
BX_CPU(dbg_cpu)->get_segment_base(BX_SEG_REG_CS),
BX_CPU(dbg_cpu)->guard_found.eip, bx_disasm_ibuf, bx_disasm_tbuf);

6
bochs/cpu/cpu.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.cc,v 1.273 2009-03-10 16:28:00 sshwarts Exp $
// $Id: cpu.cc,v 1.274 2009-03-10 17:02:03 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -916,9 +916,7 @@ bx_bool BX_CPU_C::dbg_check_begin_instr_bpoint(void)
BX_CPU_THIS_PTR guard_found.cs = cs;
BX_CPU_THIS_PTR guard_found.eip = debug_eip;
BX_CPU_THIS_PTR guard_found.laddr = BX_CPU_THIS_PTR get_laddr(BX_SEG_REG_CS, debug_eip);
BX_CPU_THIS_PTR guard_found.is_32bit_code =
BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.d_b;
BX_CPU_THIS_PTR guard_found.is_64bit_code = Is64BitMode();
BX_CPU_THIS_PTR guard_found.code_32_64 = BX_CPU_THIS_PTR fetchModeMask >> 30;
// support for 'show' command in debugger
if(dbg_show_mask) {