limit family values for CPUID

This commit is contained in:
Stanislav Shwartsman 2011-02-26 20:50:26 +00:00
parent acb83acfa7
commit f600fcf6c1
2 changed files with 2 additions and 2 deletions

View File

@ -365,7 +365,7 @@ void bx_init_options()
new bx_param_num_c(cpuid_param,
"family", "Family ID",
"Processor family ID, extended family ID",
BX_CPU_LEVEL, 4095,
BX_CPU_LEVEL, (BX_CPU_LEVEL >= 6) ? 4095 : BX_CPU_LEVEL,
BX_CPU_LEVEL);
#if BX_CPU_LEVEL >= 5

View File

@ -1195,7 +1195,7 @@ bx_bool BX_CPU_C::hwbreakpoint_check(bx_address laddr)
void BX_CPU_C::code_breakpoint_match(bx_address laddr)
{
if (BX_CPU_THIS_PTR dr7 & 0x000000ff) {
Bit32u dr6_bits = hwdebug_compare(iaddr, 1, BX_HWDebugInstruction, BX_HWDebugInstruction);
Bit32u dr6_bits = hwdebug_compare(laddr, 1, BX_HWDebugInstruction, BX_HWDebugInstruction);
if (dr6_bits) {
// Add to the list of debug events thus far.
BX_CPU_THIS_PTR debug_trap |= dr6_bits;