--- np2/i386c/ia32/ctrlxfer.c	2004/01/26 15:23:21	1.4
+++ np2/i386c/ia32/ctrlxfer.c	2004/02/05 16:43:44	1.8
@@ -1,4 +1,4 @@
-/*	$Id: ctrlxfer.c,v 1.4 2004/01/26 15:23:21 monaka Exp $	*/
+/*	$Id: ctrlxfer.c,v 1.8 2004/02/05 16:43:44 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -34,8 +34,6 @@
 #include "ctrlxfer.h"
 
 
-static void check_segreg(void);
-
 /*------------------------------------------------------------------------------
  * JMPfar_pm
  */
@@ -562,37 +560,33 @@ static void
 CALLfar_pm_call_gate_same_privilege(selector_t *callgate_sel, selector_t *cs_sel)
 {
 	DWORD sp;
-	DWORD old_eip;
-	WORD old_cs;
+	DWORD new_ip;
 
 	VERBOSE(("CALLfar_pm: SAME-PRIVILEGE"));
 
-	/* save register */
-	old_cs = CPU_CS;
-	old_eip = CPU_EIP;
-
 	if (CPU_STAT_SS32) {
 		sp = CPU_ESP;
 	} else {
 		sp = CPU_SP;
 	}
+	new_ip = callgate_sel->desc.u.gate.offset;
 
 	if (callgate_sel->desc.type == CPU_SYSDESC_TYPE_CALL_32) {
 		CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 8);
 
-		load_cs(cs_sel->selector, &cs_sel->desc, CPU_STAT_CPL);
-		SET_EIP(callgate_sel->desc.u.gate.offset);
+		PUSH0_32(CPU_CS);
+		PUSH0_32(CPU_EIP);
 
-		PUSH0_32(old_cs);
-		PUSH0_32(old_eip);
+		load_cs(cs_sel->selector, &cs_sel->desc, CPU_STAT_CPL);
+		SET_EIP(new_ip);
 	} else {
 		CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 4);
 
-		load_cs(cs_sel->selector, &cs_sel->desc, CPU_STAT_CPL);
-		SET_EIP(callgate_sel->desc.u.gate.offset);
+		PUSH0_16(CPU_CS);
+		PUSH0_16(CPU_IP);
 
-		PUSH0_16(old_cs);
-		PUSH0_16(old_eip);
+		load_cs(cs_sel->selector, &cs_sel->desc, CPU_STAT_CPL);
+		SET_EIP(new_ip);
 	}
 }
 
@@ -680,7 +674,11 @@ CALLfar_pm_call_gate_more_privilege(sele
 		}
 
 		load_ss(ss_sel.selector, &ss_sel.desc, ss_sel.desc.dpl);
-		CPU_ESP = tss_esp;
+		if (CPU_STAT_SS32) {
+			CPU_ESP = tss_esp;
+		} else {
+			CPU_SP = (WORD)tss_esp;
+		}
 
 		load_cs(cs_sel->selector, &cs_sel->desc, cs_sel->desc.dpl);
 		SET_EIP(callgate_sel->desc.u.gate.offset);
@@ -706,7 +704,11 @@ CALLfar_pm_call_gate_more_privilege(sele
 		}
 
 		load_ss(ss_sel.selector, &ss_sel.desc, ss_sel.desc.dpl);
-		CPU_ESP = tss_esp;
+		if (CPU_STAT_SS32) {
+			CPU_ESP = tss_esp;
+		} else {
+			CPU_SP = (WORD)tss_esp;
+		}
 
 		load_cs(cs_sel->selector, &cs_sel->desc, cs_sel->desc.dpl);
 		SET_EIP(callgate_sel->desc.u.gate.offset);
@@ -840,11 +842,12 @@ CALLfar_pm_tss(selector_t *tss_sel)
 void
 RETfar_pm(DWORD nbytes)
 {
-	selector_t ret_sel, ss_sel;
+	selector_t ret_sel, ss_sel, temp_sel;
 	DWORD sp;
 	DWORD new_ip, new_sp;
 	WORD new_cs, new_ss;
 	int rv;
+	int i;
 
 	VERBOSE(("RETfar_pm: old EIP = %04x:%08x, ESP = %04x:%08x, nbytes = %d", CPU_CS, CPU_PREV_EIP, CPU_SS, CPU_ESP, nbytes));
 
@@ -981,10 +984,55 @@ RETfar_pm(DWORD nbytes)
 		SET_EIP(new_ip);
 
 		load_ss(ss_sel.selector, &ss_sel.desc, ret_sel.rpl);
-		CPU_ESP = new_sp + nbytes;
+		if (CPU_STAT_SS32) {
+			CPU_ESP = new_sp + nbytes;
+		} else {
+			CPU_SP = new_sp + nbytes;
+		}
 
 		/* check segment register */
-		check_segreg();
+		for (i = 0; i < CPU_SEGREG_NUM; i++) {
+			descriptor_t *dp;
+			BOOL valid;
+
+			dp = &CPU_STAT_SREG(i);
+			if ((!dp->u.seg.c || !dp->u.seg.ec)
+			 && (CPU_STAT_SREG(i).dpl < CPU_STAT_CPL)) {
+				/* segment register is invalid */
+				CPU_REGS_SREG(i) = 0;
+				CPU_STAT_SREG_CLEAR(i);
+				continue;
+			}
+
+			rv = parse_selector(&temp_sel, CPU_REGS_SREG(i));
+			if (rv < 0) {
+				/* segment register is invalid */
+				CPU_REGS_SREG(i) = 0;
+				CPU_STAT_SREG_CLEAR(i);
+				continue;
+			}
+
+			valid = TRUE;
+			if (!temp_sel.desc.s) {
+				/* system segment */
+				valid = FALSE;
+			}
+			if (temp_sel.desc.u.seg.c && !temp_sel.desc.u.seg.wr) {
+				/* execute-only code segment */
+				valid = FALSE;
+			}
+			if (!temp_sel.desc.u.seg.c || !temp_sel.desc.u.seg.ec) {
+				if (CPU_STAT_CPL > temp_sel.desc.dpl) {
+					valid = FALSE;
+				}
+			}
+
+			if (!valid) {
+				/* segment register is invalid */
+				CPU_REGS_SREG(i) = 0;
+				CPU_STAT_SREG(i).valid = 0;
+			}
+		}
 	}
 
 	VERBOSE(("RETfar_pm: new EIP = %04x:%08x, ESP = %04x:%08x", CPU_CS, CPU_EIP, CPU_SS, CPU_ESP));
@@ -994,19 +1042,15 @@ RETfar_pm(DWORD nbytes)
 /*------------------------------------------------------------------------------
  * IRET_pm
  */
-
-#undef	IA32_RETURN_FROM_VM86
-
 static void IRET_pm_nested_task(void);
 static void IRET_pm_return_to_vm86(DWORD new_ip, DWORD new_cs, DWORD new_flags);
-#if defined(IA32_RETURN_FROM_VM86)
 static void IRET_pm_return_from_vm86(DWORD new_ip, DWORD new_cs, DWORD new_flags);
-#endif	/* IA32_RETURN_FROM_VM86 */
 
 void
 IRET_pm(void)
 {
 	selector_t iret_sel, ss_sel;
+	descriptor_t *dp;
 	DWORD sp;
 	DWORD stacksize;	/* for RETURN-TO-SAME-PRIVILEGE-LEVEL */
 	DWORD mask = 0;
@@ -1014,10 +1058,11 @@ IRET_pm(void)
 	WORD new_cs, new_ss;
 	int old_cpl;
 	int rv;
+	int i;
 
 	VERBOSE(("IRET_pm: old EIP = %04x:%08x, old ESP = %04x:%08x", CPU_CS, CPU_PREV_EIP, CPU_SS, CPU_ESP));
 
-	if (CPU_EFLAG & NT_FLAG) {
+	if (!(CPU_EFLAG & VM_FLAG) && (CPU_EFLAG & NT_FLAG)) {
 		/* TASK-RETURN: PE=1, VM=0, NT=1 */
 		IRET_pm_nested_task();
 		VERBOSE(("IRET_pm: new EIP = %04x:%08x, new ESP = %04x:%08x", CPU_CS, CPU_EIP, CPU_SS, CPU_ESP));
@@ -1043,7 +1088,6 @@ IRET_pm(void)
 	}
 	VERBOSE(("IRET_pm: new_ip = %08x, new_cs = %04x, new_eflags = %08x", new_ip, new_cs, new_flags));
 
-#ifdef	IA32_RETURN_FROM_VM86
 	if (CPU_EFLAG & VM_FLAG) {
 		/* RETURN-FROM-VIRTUAL-8086-MODE */
 		IRET_pm_return_from_vm86(new_ip, new_cs, new_flags);
@@ -1051,7 +1095,6 @@ IRET_pm(void)
 		CPU_STAT_NERROR = 0;
 		return;
 	}
-#endif	/* IA32_RETURN_FROM_VM86 */
 
 	if (new_flags & VM_FLAG) {
 		/* RETURN-TO-VIRTUAL-8086-MODE */
@@ -1168,12 +1211,6 @@ IRET_pm(void)
 		EXCEPTION(GP_EXCEPTION, 0);
 	}
 
-	/* set new register */
-	old_cpl = CPU_STAT_CPL;
-	load_cs(iret_sel.selector, &iret_sel.desc, iret_sel.rpl);
-	SET_EIP(new_ip);
-
-	/* set new eflags */
 	mask = 0;
 	if (CPU_INST_OP32)
 		mask |= RF_FLAG;
@@ -1185,15 +1222,36 @@ IRET_pm(void)
 			mask |= VM_FLAG|VIF_FLAG|VIP_FLAG;
 		}
 	}
+
+	/* set new register */
+	old_cpl = CPU_STAT_CPL;
+	load_cs(iret_sel.selector, &iret_sel.desc, iret_sel.rpl);
+	SET_EIP(new_ip);
 	set_eflags(new_flags, mask);
 
 	if (iret_sel.rpl > old_cpl) {
 		/* RETURN-OUTER-PRIVILEGE-LEVEL */
+
 		load_ss(ss_sel.selector, &ss_sel.desc, iret_sel.rpl);
-		CPU_ESP = new_sp;
+		if (CPU_STAT_SS32) {
+			CPU_ESP = new_sp;
+		} else {
+			CPU_SP = new_sp;
+		}
 
 		/* check segment register */
-		check_segreg();
+		for (i = 0; i < CPU_SEGREG_NUM; i++) {
+			if ((i != CPU_CS_INDEX) && (i != CPU_SS_INDEX)) {
+				dp = &CPU_STAT_SREG(i);
+				if ((!dp->u.seg.c || !dp->u.seg.ec)
+				 && (CPU_STAT_SREG(i).dpl < CPU_STAT_CPL)) {
+					/* segment register is invalid */
+					CPU_REGS_SREG(i) = 0;
+					CPU_STAT_SREG_CLEAR(i);
+					continue;
+				}
+			}
+		}
 	} else {
 		/* RETURN-TO-SAME-PRIVILEGE-LEVEL */
 		if (CPU_STAT_SS32) {
@@ -1213,30 +1271,26 @@ IRET_pm(void)
 static void
 IRET_pm_nested_task(void)
 {
-	selector_t iret_sel;
+	selector_t tss_sel;
 	int rv;
-	WORD new_cs;
+	WORD new_tss;
 
 	VERBOSE(("IRET_pm: TASK-RETURN: PE=1, VM=0, NT=1"));
 
-	if (CPU_STAT_VM86) {
-		ia32_panic("IRET_pm: VM86");
-	}
-
-	new_cs = get_link_selector_from_tss();
-	rv = parse_selector(&iret_sel, new_cs);
-	if (rv < 0 || iret_sel.ldt) {
-		VERBOSE(("IRET_pm: parse_selector (selector = %04x, rv = %d)", iret_sel.selector, rv));
-		EXCEPTION(GP_EXCEPTION, iret_sel.idx);
+	new_tss = get_link_selector_from_tss();
+	rv = parse_selector(&tss_sel, new_tss);
+	if (rv < 0 || tss_sel.ldt) {
+		VERBOSE(("IRET_pm: parse_selector (selector = %04x, rv = %d, %cDT)", tss_sel.selector, rv, tss_sel.ldt ? 'L' : 'G'));
+		EXCEPTION(GP_EXCEPTION, tss_sel.idx);
 	}
 
 	/* check system segment */
-	if (iret_sel.desc.s) {
-		VERBOSE(("IRET_pm: task segment is %d segment", iret_sel.desc.u.seg.c ? "code" : "data"));
-		EXCEPTION(GP_EXCEPTION, iret_sel.idx);
+	if (tss_sel.desc.s) {
+		VERBOSE(("IRET_pm: task segment is %d segment", tss_sel.desc.u.seg.c ? "code" : "data"));
+		EXCEPTION(GP_EXCEPTION, tss_sel.idx);
 	}
 
-	switch (iret_sel.desc.type) {
+	switch (tss_sel.desc.type) {
 	case CPU_SYSDESC_TYPE_TSS_BUSY_16:
 	case CPU_SYSDESC_TYPE_TSS_BUSY_32:
 		break;
@@ -1246,18 +1300,18 @@ IRET_pm_nested_task(void)
 		VERBOSE(("IRET_pm: task is not busy"));
 		/*FALLTHROUGH*/
 	default:
-		VERBOSE(("IRET_pm: invalid descriptor type (type = %d)", iret_sel.desc.type));
-		EXCEPTION(GP_EXCEPTION, iret_sel.idx);
+		VERBOSE(("IRET_pm: invalid descriptor type (type = %d)", tss_sel.desc.type));
+		EXCEPTION(GP_EXCEPTION, tss_sel.idx);
 		break;
 	}
 
 	/* not present */
-	if (selector_is_not_present(&iret_sel)) {
+	if (selector_is_not_present(&tss_sel)) {
 		VERBOSE(("IRET_pm: tss segment is not present"));
-		EXCEPTION(NP_EXCEPTION, iret_sel.idx);
+		EXCEPTION(NP_EXCEPTION, tss_sel.idx);
 	}
 
-	task_switch(&iret_sel, TASK_SWITCH_IRET);
+	task_switch(&tss_sel, TASK_SWITCH_IRET);
 }
 
 /*---
@@ -1305,7 +1359,6 @@ IRET_pm_return_to_vm86(DWORD new_ip, DWO
 	SET_EIP(new_ip);
 }
 
-#ifdef	IA32_RETURN_FROM_VM86
 /*---
  * IRET_pm: VM_FLAG
  */
@@ -1338,52 +1391,3 @@ IRET_pm_return_from_vm86(DWORD new_ip, D
 	VERBOSE(("IRET_pm: trap to virtual-8086 monitor: VM=1, IOPL<3"));
 	EXCEPTION(GP_EXCEPTION, 0);
 }
-#endif	/* IA32_RETURN_FROM_VM86 */
-
-
-/*-----
- * Misc.
- */
-static void
-check_segreg(void)
-{
-	selector_t temp_sel;
-	BOOL valid;
-	int rv;
-	int i;
-
-	/* check segment register */
-	for (i = 0; i < CPU_SEGREG_NUM; i++) {
-		if (i == CPU_CS_INDEX || i == CPU_SS_INDEX)
-			continue;
-
-		rv = parse_selector(&temp_sel, CPU_REGS_SREG(i));
-		if (rv < 0) {
-			/* segment register is invalid */
-			CPU_REGS_SREG(i) = 0;
-			CPU_STAT_SREG(i).valid = 0;
-			continue;
-		}
-
-		valid = TRUE;
-		if (!temp_sel.desc.s) {
-			/* system segment */
-			valid = FALSE;
-		}
-		if (temp_sel.desc.u.seg.c && !temp_sel.desc.u.seg.wr) {
-			/* execute-only code segment */
-			valid = FALSE;
-		}
-		if (!temp_sel.desc.u.seg.c || !temp_sel.desc.u.seg.ec) {
-			if (CPU_STAT_CPL > temp_sel.desc.dpl) {
-				valid = FALSE;
-			}
-		}
-
-		if (!valid) {
-			/* segment register is invalid */
-			CPU_REGS_SREG(i) = 0;
-			CPU_STAT_SREG(i).valid = 0;
-		}
-	}
-}