--- np2/i386c/ia32/instructions/system_inst.c 2004/01/29 11:42:58 1.12 +++ np2/i386c/ia32/instructions/system_inst.c 2004/03/07 04:09:27 1.21 @@ -1,4 +1,4 @@ -/* $Id: system_inst.c,v 1.12 2004/01/29 11:42:58 monaka Exp $ */ +/* $Id: system_inst.c,v 1.21 2004/03/07 04:09:27 yui Exp $ */ /* * Copyright (c) 2003 NONAKA Kimihiro @@ -35,16 +35,16 @@ void -LGDT_Ms(DWORD op) +LGDT_Ms(UINT32 op) { - DWORD madr; - DWORD base; - WORD limit; + UINT32 madr; + UINT32 base; + UINT16 limit; if (op < 0xc0) { if (!CPU_STAT_PM || !CPU_STAT_VM86 || CPU_STAT_CPL == 0) { CPU_WORKCLOCK(11); - madr = get_ea(op); + madr = calc_ea_dst(op); limit = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); base = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr + 2); if (!CPU_INST_OP32) { @@ -66,11 +66,11 @@ LGDT_Ms(DWORD op) } void -SGDT_Ms(DWORD op) +SGDT_Ms(UINT32 op) { - DWORD madr; - DWORD base; - WORD limit; + UINT32 madr; + UINT32 base; + UINT16 limit; if (op < 0xc0) { CPU_WORKCLOCK(11); @@ -79,7 +79,7 @@ SGDT_Ms(DWORD op) if (!CPU_INST_OP32) { base &= 0x00ffffff; } - madr = get_ea(op); + madr = calc_ea_dst(op); cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, limit); cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr + 2, base); return; @@ -88,9 +88,9 @@ SGDT_Ms(DWORD op) } void -LLDT_Ew(DWORD op) +LLDT_Ew(UINT32 op) { - DWORD src, madr; + UINT32 src, madr; if (CPU_STAT_PM && !CPU_STAT_VM86) { if (CPU_STAT_CPL == 0) { @@ -102,7 +102,7 @@ LLDT_Ew(DWORD op) madr = calc_ea_dst(op); src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } - load_ldtr(src, GP_EXCEPTION); + load_ldtr((UINT16)src, GP_EXCEPTION); return; } VERBOSE(("LLDT: CPL(%d) != 0", CPU_STAT_CPL)); @@ -113,10 +113,10 @@ LLDT_Ew(DWORD op) } void -SLDT_Ew(DWORD op) +SLDT_Ew(UINT32 op) { - DWORD madr; - WORD ldtr; + UINT32 madr; + UINT16 ldtr; if (CPU_STAT_PM && !CPU_STAT_VM86) { ldtr = CPU_LDTR; @@ -139,9 +139,9 @@ SLDT_Ew(DWORD op) } void -LTR_Ew(DWORD op) +LTR_Ew(UINT32 op) { - DWORD src, madr; + UINT32 src, madr; if (CPU_STAT_PM && !CPU_STAT_VM86) { if (CPU_STAT_CPL == 0) { @@ -153,7 +153,7 @@ LTR_Ew(DWORD op) madr = calc_ea_dst(op); src = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); } - load_tr(src); + load_tr((UINT16)src); return; } VERBOSE(("LTR: CPL(%d) != 0", CPU_STAT_CPL)); @@ -164,10 +164,10 @@ LTR_Ew(DWORD op) } void -STR_Ew(DWORD op) +STR_Ew(UINT32 op) { - DWORD madr; - WORD tr; + UINT32 madr; + UINT16 tr; if (CPU_STAT_PM && !CPU_STAT_VM86) { tr = CPU_TR; @@ -190,16 +190,16 @@ STR_Ew(DWORD op) } void -LIDT_Ms(DWORD op) +LIDT_Ms(UINT32 op) { - DWORD madr; - DWORD base; - WORD limit; + UINT32 madr; + UINT32 base; + UINT16 limit; if (op < 0xc0) { if (!CPU_STAT_PM || !CPU_STAT_VM86 || CPU_STAT_CPL == 0) { CPU_WORKCLOCK(11); - madr = get_ea(op); + madr = calc_ea_dst(op); limit = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr); base = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr + 2); if (!CPU_INST_OP32) { @@ -221,11 +221,11 @@ LIDT_Ms(DWORD op) } void -SIDT_Ms(DWORD op) +SIDT_Ms(UINT32 op) { - DWORD madr; - DWORD base; - WORD limit; + UINT32 madr; + UINT32 base; + UINT16 limit; if (op < 0xc0) { CPU_WORKCLOCK(11); @@ -234,7 +234,7 @@ SIDT_Ms(DWORD op) if (!CPU_INST_OP32) { base &= 0x00ffffff; } - madr = get_ea(op); + madr = calc_ea_dst(op); cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, limit); cpu_vmemorywrite_d(CPU_INST_SEGREG_INDEX, madr + 2, base); return; @@ -245,8 +245,8 @@ SIDT_Ms(DWORD op) void MOV_CdRd(void) { - DWORD op, src; - DWORD reg; + UINT32 op, src; + UINT32 reg; int idx; CPU_WORKCLOCK(11); @@ -277,7 +277,7 @@ MOV_CdRd(void) */ /* 下巻 p.182 割り込み 13 - 一般保護例外 */ - if ((src & (CPU_CR0_PE|CPU_CR0_PG)) == (DWORD)CPU_CR0_PG) { + if ((src & (CPU_CR0_PE|CPU_CR0_PG)) == (UINT32)CPU_CR0_PG) { EXCEPTION(GP_EXCEPTION, 0); } if ((src & (CPU_CR0_NW|CPU_CR0_CD)) == CPU_CR0_NW) { @@ -314,6 +314,8 @@ MOV_CdRd(void) change_pm(0); } } + + CPU_STAT_WP = (CPU_CR0 & CPU_CR0_WP) ? 0x10 : 0; break; case 2: /* CR2 */ @@ -379,15 +381,15 @@ MOV_CdRd(void) void MOV_RdCd(void) { - DWORD *out; - DWORD op; + UINT32 *out; + UINT32 op; int idx; CPU_WORKCLOCK(11); GET_PCBYTE(op); if (op >= 0xc0) { if (CPU_STAT_PM && (CPU_STAT_VM86 || CPU_STAT_CPL != 0)) { - VERBOSE(("MOV_CdRd: VM86(%s) or CPL(%d) != 0", CPU_STAT_VM86 ? "true" : "false", CPU_STAT_CPL)); + VERBOSE(("MOV_RdCd: VM86(%s) or CPL(%d) != 0", CPU_STAT_VM86 ? "true" : "false", CPU_STAT_CPL)); EXCEPTION(GP_EXCEPTION, 0); } @@ -425,10 +427,10 @@ MOV_RdCd(void) } void -LMSW_Ew(DWORD op) +LMSW_Ew(UINT32 op) { - DWORD src, madr; - DWORD cr0; + UINT32 src, madr; + UINT32 cr0; if (!CPU_STAT_PM || CPU_STAT_CPL == 0) { if (op >= 0xc0) { @@ -453,17 +455,17 @@ LMSW_Ew(DWORD op) } void -SMSW_Ew(DWORD op) +SMSW_Ew(UINT32 op) { - DWORD madr; + UINT32 madr; if (op >= 0xc0) { CPU_WORKCLOCK(2); - *(reg16_b20[op]) = (WORD)CPU_CR0; + *(reg16_b20[op]) = (UINT16)CPU_CR0; } else { CPU_WORKCLOCK(3); madr = calc_ea_dst(op); - cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)CPU_CR0); + cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)CPU_CR0); } } @@ -471,7 +473,7 @@ void CLTS(void) { - CPU_WORKCLOCK(2); + CPU_WORKCLOCK(5); if (CPU_STAT_PM && (CPU_STAT_VM86 || (CPU_STAT_CPL != 0))) { VERBOSE(("CLTS: VM86(%s) or CPL(%d) != 0", CPU_STAT_VM86 ? "true" : "false", CPU_STAT_CPL)); EXCEPTION(GP_EXCEPTION, 0); @@ -482,7 +484,7 @@ CLTS(void) void ARPL_EwGw(void) { - DWORD op, src, dst, madr; + UINT32 op, src, dst, madr; if (CPU_STAT_PM && !CPU_STAT_VM86) { PREPART_EA_REG16(op, src); @@ -493,7 +495,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; } @@ -505,7 +507,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; } @@ -523,10 +525,11 @@ void LAR_GwEw(void) { selector_t sel; - WORD *out; - DWORD op; + UINT16 *out; + UINT32 op; + UINT32 h; int rv; - WORD selector; + UINT16 selector; if (CPU_STAT_PM && !CPU_STAT_VM86) { PREPART_REG16_EA(op, selector, out, 5, 11); @@ -538,12 +541,17 @@ LAR_GwEw(void) } if (sel.desc.s) { - if (!(sel.desc.u.seg.c && !sel.desc.u.seg.ec) && - ((sel.desc.dpl < CPU_STAT_CPL) || (sel.desc.dpl < sel.rpl))) { - CPU_FLAGL &= ~Z_FLAG; - return; + /* code or data segment */ + if (!(sel.desc.u.seg.c && sel.desc.u.seg.ec)) { + /* not conforming code segment */ + if ((sel.desc.dpl < CPU_STAT_CPL) + || (sel.desc.dpl < sel.rpl)) { + CPU_FLAGL &= ~Z_FLAG; + return; + } } } else { + /* system segment */ switch (sel.desc.type) { case CPU_SYSDESC_TYPE_TSS_16: case CPU_SYSDESC_TYPE_LDT: @@ -561,7 +569,8 @@ LAR_GwEw(void) } } - *out = sel.desc.h & 0xff00; + h = cpu_kmemoryread_d(sel.addr + 4); + *out = (UINT16)(h & 0xff00); CPU_FLAGL |= Z_FLAG; return; } @@ -573,27 +582,33 @@ void LAR_GdEw(void) { selector_t sel; - DWORD *out; - DWORD op; + UINT32 *out; + UINT32 op; + UINT32 h; int rv; - WORD selector; + UINT32 selector; if (CPU_STAT_PM && !CPU_STAT_VM86) { PREPART_REG32_EA(op, selector, out, 5, 11); - rv = parse_selector(&sel, selector); + rv = parse_selector(&sel, (UINT16)selector); if (rv < 0) { CPU_FLAGL &= ~Z_FLAG; return; } if (sel.desc.s) { - if (!(sel.desc.u.seg.c && !sel.desc.u.seg.ec) - && ((sel.desc.dpl < CPU_STAT_CPL) || (sel.desc.dpl < sel.rpl))) { - CPU_FLAGL &= ~Z_FLAG; - return; + /* code or data segment */ + if (!(sel.desc.u.seg.c && sel.desc.u.seg.ec)) { + /* not conforming code segment */ + if ((sel.desc.dpl < CPU_STAT_CPL) + || (sel.desc.dpl < sel.rpl)) { + CPU_FLAGL &= ~Z_FLAG; + return; + } } } else { + /* system segment */ switch (sel.desc.type) { case CPU_SYSDESC_TYPE_TSS_16: case CPU_SYSDESC_TYPE_LDT: @@ -611,7 +626,8 @@ LAR_GdEw(void) } } - *out = sel.desc.h & 0x00ffff00; /* 0x00fxff00, x? */ + h = cpu_kmemoryread_d(sel.addr + 4); + *out = h & 0x00ffff00; /* 0x00fxff00, x? */ CPU_FLAGL |= Z_FLAG; return; } @@ -623,10 +639,10 @@ void LSL_GwEw(void) { selector_t sel; - WORD *out; - DWORD op; + UINT16 *out; + UINT32 op; int rv; - WORD selector; + UINT16 selector; if (CPU_STAT_PM && !CPU_STAT_VM86) { PREPART_REG16_EA(op, selector, out, 5, 11); @@ -638,12 +654,17 @@ LSL_GwEw(void) } if (sel.desc.s) { - if (!(sel.desc.u.seg.c && !sel.desc.u.seg.ec) - && ((sel.desc.dpl < CPU_STAT_CPL) || (sel.desc.dpl < sel.rpl))) { - CPU_FLAGL &= ~Z_FLAG; - return; + /* code or data segment */ + if (!(sel.desc.u.seg.c && sel.desc.u.seg.ec)) { + /* not conforming code segment */ + if ((sel.desc.dpl < CPU_STAT_CPL) + || (sel.desc.dpl < sel.rpl)) { + CPU_FLAGL &= ~Z_FLAG; + return; + } } } else { + /* system segment */ switch (sel.desc.type) { case CPU_SYSDESC_TYPE_TSS_16: case CPU_SYSDESC_TYPE_LDT: @@ -658,7 +679,7 @@ LSL_GwEw(void) } } - *out = (WORD)sel.desc.u.seg.limit; + *out = (UINT16)sel.desc.u.seg.limit; CPU_FLAGL |= Z_FLAG; return; } @@ -670,27 +691,32 @@ void LSL_GdEw(void) { selector_t sel; - DWORD *out; - DWORD op; + UINT32 *out; + UINT32 op; int rv; - WORD selector; + UINT32 selector; if (CPU_STAT_PM && !CPU_STAT_VM86) { PREPART_REG32_EA(op, selector, out, 5, 11); - rv = parse_selector(&sel, selector); + rv = parse_selector(&sel, (UINT16)selector); if (rv < 0) { CPU_FLAGL &= ~Z_FLAG; return; } if (sel.desc.s) { - if (!(sel.desc.u.seg.c && !sel.desc.u.seg.ec) - && ((CPU_STAT_CPL > sel.desc.dpl) || (sel.rpl > sel.desc.dpl))) { - CPU_FLAGL &= ~Z_FLAG; - return; + /* code or data segment */ + if (!(sel.desc.u.seg.c && sel.desc.u.seg.ec)) { + /* not conforming code segment */ + if ((sel.desc.dpl < CPU_STAT_CPL) + || (sel.desc.dpl < sel.rpl)) { + CPU_FLAGL &= ~Z_FLAG; + return; + } } } else { + /* system segment */ switch (sel.desc.type) { case CPU_SYSDESC_TYPE_TSS_16: case CPU_SYSDESC_TYPE_LDT: @@ -714,12 +740,12 @@ LSL_GdEw(void) } void -VERR_Ew(DWORD op) +VERR_Ew(UINT32 op) { selector_t sel; - DWORD madr; + UINT32 madr; int rv; - WORD selector; + UINT16 selector; if (CPU_STAT_PM && !CPU_STAT_VM86) { if (op >= 0xc0) { @@ -742,17 +768,21 @@ VERR_Ew(DWORD op) CPU_FLAGL &= ~Z_FLAG; return; } - /* non-conforming code segment && (CPL > DPL || RPL > DPL) */ - if ((sel.desc.u.seg.c && !sel.desc.u.seg.ec) - && ((CPU_STAT_CPL > sel.desc.dpl) || (sel.rpl > sel.desc.dpl))) { - CPU_FLAGL &= ~Z_FLAG; - return; + /* not conforming code segment && (CPL > DPL || RPL > DPL) */ + if (!(sel.desc.u.seg.c && sel.desc.u.seg.ec)) { + /* not conforming code segment */ + if ((sel.desc.dpl < CPU_STAT_CPL) + || (sel.desc.dpl < sel.rpl)) { + CPU_FLAGL &= ~Z_FLAG; + return; + } } /* code segment is not readable */ if (sel.desc.u.seg.c && !sel.desc.u.seg.wr) { CPU_FLAGL &= ~Z_FLAG; return; } + CPU_FLAGL |= Z_FLAG; return; } @@ -761,12 +791,12 @@ VERR_Ew(DWORD op) } void -VERW_Ew(DWORD op) +VERW_Ew(UINT32 op) { selector_t sel; - DWORD madr; + UINT32 madr; int rv; - WORD selector; + UINT16 selector; if (CPU_STAT_PM && !CPU_STAT_VM86) { if (op >= 0xc0) { @@ -799,6 +829,7 @@ VERW_Ew(DWORD op) CPU_FLAGL &= ~Z_FLAG; return; } + CPU_FLAGL |= Z_FLAG; return; } @@ -809,15 +840,59 @@ VERW_Ew(DWORD op) void MOV_DdRd(void) { +#if 1 + UINT32 op; + UINT32 src; + int idx; + CPU_WORKCLOCK(11); + GET_PCBYTE(op); + if (op >= 0xc0) { + if (CPU_STAT_PM && (CPU_STAT_VM86 || CPU_STAT_CPL != 0)) { + TRACEOUT(("MOV_DdRd: VM86(%s) or CPL(%d) != 0", CPU_STAT_VM86 ? "true" : "false", CPU_STAT_CPL)); + EXCEPTION(GP_EXCEPTION, 0); + } + + src = *(reg32_b20[op]); + idx = (op >> 3) & 7; + CPU_STATSAVE.cpu_regs.dr[idx] = src; + + TRACEOUT(("MOV_DdRd: %04x:%08x: dr%d: 0x%08x <- %s", CPU_CS, CPU_PREV_EIP, idx, src, reg32_str[op & 7])); + return; + } + EXCEPTION(UD_EXCEPTION, 0); +#else ia32_panic("MOV_DdRd: not implemented yet!"); +#endif } void MOV_RdDd(void) { +#if 1 + UINT32 *out; + UINT32 op; + int idx; + + CPU_WORKCLOCK(11); + GET_PCBYTE(op); + if (op >= 0xc0) { + if (CPU_STAT_PM && (CPU_STAT_VM86 || CPU_STAT_CPL != 0)) { + TRACEOUT(("MOV_RdDd: VM86(%s) or CPL(%d) != 0", CPU_STAT_VM86 ? "true" : "false", CPU_STAT_CPL)); + EXCEPTION(GP_EXCEPTION, 0); + } + out = reg32_b20[op]; + idx = (op >> 3) & 7; + *out = CPU_STATSAVE.cpu_regs.dr[idx]; + + TRACEOUT(("MOV_RdDd: %04x:%08x: dr%d: 0x%08x -> %s", CPU_CS, CPU_PREV_EIP, idx, *out, reg32_str[op & 7])); + return; + } + EXCEPTION(UD_EXCEPTION, 0); +#else ia32_panic("MOV_DdRd: not implemented yet!"); +#endif } void @@ -845,9 +920,12 @@ WBINVD(void) } void -INVLPG(DWORD op) +INVLPG(UINT32 op) { - DWORD madr; + descriptor_t *sd; + UINT32 madr; + int idx; + int exc; if (CPU_STAT_PM && (CPU_STAT_VM86 || CPU_STAT_CPL != 0)) { VERBOSE(("INVLPG: VM86(%s) or CPL(%d) != 0", CPU_STAT_VM86 ? "true" : "false", CPU_STAT_CPL)); @@ -856,11 +934,44 @@ INVLPG(DWORD op) if (op < 0xc0) { CPU_WORKCLOCK(11); - madr = get_ea(op); - tlb_flush_page(madr); - return; + madr = calc_ea_dst(op); + + idx = CPU_INST_SEGREG_INDEX; + sd = &CPU_STAT_SREG(idx); + if (!sd->valid) { + exc = GP_EXCEPTION; + goto err; + } + switch (sd->type) { + case 4: case 5: case 6: case 7: + if (madr <= sd->u.seg.limit) { + if (idx == CPU_SS_INDEX) + exc = SS_EXCEPTION; + else + exc = GP_EXCEPTION; + goto err; + } + break; + + default: + if (madr > sd->u.seg.limit) { + if (idx == CPU_SS_INDEX) + exc = SS_EXCEPTION; + else + exc = GP_EXCEPTION; + goto err; + } + break; + } + tlb_flush_page(sd->u.seg.segbase + madr); } - EXCEPTION(UD_EXCEPTION, 0); + return; + +err: +#if 0 /* XXX */ + EXCEPTION(exc, 0); +#endif + return; } void @@ -881,6 +992,7 @@ HLT(void) CPU_HALT(); CPU_EIP--; + CPU_STAT_HLT = 1; } void