--- np2/i386c/ia32/instructions/system_inst.c 2011/12/29 13:32:13 1.37 +++ np2/i386c/ia32/instructions/system_inst.c 2012/01/24 17:17:13 1.39 @@ -286,6 +286,7 @@ MOV_CdRd(void) src &= CPU_CR0_ALL; #if defined(USE_FPU) src |= CPU_CR0_ET; /* FPU present */ + src &= ~CPU_CR0_EM; #else src |= CPU_CR0_EM | CPU_CR0_NE; src &= ~(CPU_CR0_MP | CPU_CR0_ET); @@ -853,9 +854,6 @@ MOV_DdRd(void) UINT32 src; UINT op; int idx; -#if defined(IA32_SUPPORT_DEBUG_REGISTER) - int i; -#endif CPU_WORKCLOCK(11); GET_PCBYTE(op); @@ -890,13 +888,6 @@ MOV_DdRd(void) case 7: CPU_DR7 = src; CPU_STAT_BP = 0; -#if defined(IA32_SUPPORT_DEBUG_REGISTER) - for (i = 0; i < CPU_DEBUG_REG_INDEX_NUM; i++) { - if (CPU_DR7 & (CPU_DR7_L(i)|CPU_DR7_G(i))) { - CPU_STAT_BP |= (1 << i); - } - } -#endif /* IA32_SUPPORT_DEBUG_REGISTER */ break; default: