--- np2/i386c/ia32/instructions/system_inst.c 2004/03/09 14:14:05 1.23 +++ np2/i386c/ia32/instructions/system_inst.c 2004/03/23 13:32:50 1.26 @@ -1,4 +1,4 @@ -/* $Id: system_inst.c,v 1.23 2004/03/09 14:14:05 monaka Exp $ */ +/* $Id: system_inst.c,v 1.26 2004/03/23 13:32:50 yui Exp $ */ /* * Copyright (c) 2003 NONAKA Kimihiro @@ -90,7 +90,8 @@ SGDT_Ms(UINT32 op) void LLDT_Ew(UINT32 op) { - UINT32 src, madr; + UINT32 madr; + UINT16 src; if (CPU_STAT_PM && !CPU_STAT_VM86) { if (CPU_STAT_CPL == 0) { @@ -102,7 +103,7 @@ LLDT_Ew(UINT32 op) madr = calc_ea_dst(op); src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } - load_ldtr((UINT16)src, GP_EXCEPTION); + load_ldtr(src, GP_EXCEPTION); return; } VERBOSE(("LLDT: CPL(%d) != 0", CPU_STAT_CPL)); @@ -287,7 +288,8 @@ MOV_CdRd(void) reg = CPU_CR0; src &= 0xe005003f; #ifndef USE_FPU - src &= ~CPU_CR0_ET; /* FPU not present */ + src |= CPU_CR0_EM | CPU_CR0_NE; + src &= ~(CPU_CR0_MP | CPU_CR0_ET); #else src |= CPU_CR0_ET; /* FPU present */ #endif @@ -484,8 +486,8 @@ CLTS(void) void ARPL_EwGw(void) { - UINT32 op, src, madr; - UINT16 dst; + UINT32 op, madr; + UINT src, dst; if (CPU_STAT_PM && !CPU_STAT_VM86) { PREPART_EA_REG16(op, src); @@ -496,7 +498,7 @@ ARPL_EwGw(void) CPU_FLAGL |= Z_FLAG; dst &= ~3; dst |= (src & 3); - *(reg16_b20[op]) = dst; + *(reg16_b20[op]) = (UINT16)dst; } else { CPU_FLAGL &= ~Z_FLAG; } @@ -508,7 +510,7 @@ ARPL_EwGw(void) CPU_FLAGL |= Z_FLAG; dst &= ~3; dst |= (src & 3); - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, dst); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)dst); } else { CPU_FLAGL &= ~Z_FLAG; } @@ -844,7 +846,9 @@ MOV_DdRd(void) UINT32 src; UINT op; int idx; +#if defined(IA32_SUPPORT_DEBUG_REGISTER) int i; +#endif CPU_WORKCLOCK(11); GET_PCBYTE(op);