--- np2/i386c/ia32/ctrlxfer.c	2004/02/09 16:12:07	1.10
+++ np2/i386c/ia32/ctrlxfer.c	2004/02/20 16:09:04	1.15
@@ -1,4 +1,4 @@
-/*	$Id: ctrlxfer.c,v 1.10 2004/02/09 16:12:07 monaka Exp $	*/
+/*	$Id: ctrlxfer.c,v 1.15 2004/02/20 16:09:04 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -37,13 +37,13 @@
 /*------------------------------------------------------------------------------
  * JMPfar_pm
  */
-static void JMPfar_pm_code_segment(selector_t *jmp_sel, DWORD new_ip);
-static void JMPfar_pm_call_gate(selector_t *jmp_sel);
-static void JMPfar_pm_task_gate(selector_t *jmp_sel);
-static void JMPfar_pm_tss(selector_t *jmp_sel);
+static void JMPfar_pm_code_segment(selector_t *cs_sel, UINT32 new_ip);
+static void JMPfar_pm_call_gate(selector_t *callgate_sel);
+static void JMPfar_pm_task_gate(selector_t *taskgate_sel);
+static void JMPfar_pm_tss(selector_t *tss_sel);
 
 void
-JMPfar_pm(WORD selector, DWORD new_ip)
+JMPfar_pm(UINT16 selector, UINT32 new_ip)
 {
 	selector_t jmp_sel;
 	int rv;
@@ -106,7 +106,7 @@ JMPfar_pm(WORD selector, DWORD new_ip)
  * JMPfar: code segment
  */
 static void
-JMPfar_pm_code_segment(selector_t *cs_sel, DWORD new_ip)
+JMPfar_pm_code_segment(selector_t *cs_sel, UINT32 new_ip)
 {
 
 	VERBOSE(("JMPfar_pm: CODE-SEGMENT"));
@@ -318,13 +318,13 @@ JMPfar_pm_tss(selector_t *tss_sel)
 /*------------------------------------------------------------------------------
  * CALLfar_pm
  */
-static void CALLfar_pm_code_segment(selector_t *call_sel, DWORD new_ip);
-static void CALLfar_pm_call_gate(selector_t *call_sel);
-static void CALLfar_pm_task_gate(selector_t *call_sel);
-static void CALLfar_pm_tss(selector_t *call_sel);
+static void CALLfar_pm_code_segment(selector_t *cs_sel, UINT32 new_ip);
+static void CALLfar_pm_call_gate(selector_t *callgate_sel);
+static void CALLfar_pm_task_gate(selector_t *taskgate_sel);
+static void CALLfar_pm_tss(selector_t *tss_sel);
 
 void
-CALLfar_pm(WORD selector, DWORD new_ip)
+CALLfar_pm(UINT16 selector, UINT32 new_ip)
 {
 	selector_t call_sel;
 	int rv;
@@ -387,9 +387,9 @@ CALLfar_pm(WORD selector, DWORD new_ip)
  * CALLfar_pm: code segment
  */
 static void
-CALLfar_pm_code_segment(selector_t *cs_sel, DWORD new_ip)
+CALLfar_pm_code_segment(selector_t *cs_sel, UINT32 new_ip)
 {
-	DWORD sp;
+	UINT32 sp;
 
 	VERBOSE(("CALLfar_pm: CODE-SEGMENT"));
 
@@ -531,7 +531,7 @@ CALLfar_pm_call_gate(selector_t *callgat
 static void
 CALLfar_pm_call_gate_same_privilege(selector_t *callgate_sel, selector_t *cs_sel)
 {
-	DWORD sp;
+	UINT32 sp;
 
 	VERBOSE(("CALLfar_pm: SAME-PRIVILEGE"));
 
@@ -566,12 +566,12 @@ CALLfar_pm_call_gate_same_privilege(sele
 static void
 CALLfar_pm_call_gate_more_privilege(selector_t *callgate_sel, selector_t *cs_sel)
 {
-	DWORD param[32];	/* copy param */
+	UINT32 param[32];	/* copy param */
 	selector_t ss_sel;
-	DWORD old_eip, old_esp;
-	DWORD new_esp;
-	WORD old_cs, old_ss;
-	WORD new_ss;
+	UINT32 old_eip, old_esp;
+	UINT32 new_esp;
+	UINT16 old_cs, old_ss;
+	UINT16 new_ss;
 	int param_count;
 	int i;
 	int rv;
@@ -643,7 +643,7 @@ CALLfar_pm_call_gate_more_privilege(sele
 		if (CPU_STAT_SS32) {
 			CPU_ESP = new_esp;
 		} else {
-			CPU_SP = new_esp;
+			CPU_SP = (UINT16)new_esp;
 		}
 
 		load_cs(cs_sel->selector, &cs_sel->desc, cs_sel->desc.dpl);
@@ -673,7 +673,7 @@ CALLfar_pm_call_gate_more_privilege(sele
 		if (CPU_STAT_SS32) {
 			CPU_ESP = new_esp;
 		} else {
-			CPU_SP = new_esp;
+			CPU_SP = (UINT16)new_esp;
 		}
 
 		load_cs(cs_sel->selector, &cs_sel->desc, cs_sel->desc.dpl);
@@ -786,12 +786,12 @@ CALLfar_pm_tss(selector_t *tss_sel)
  */
 
 void
-RETfar_pm(DWORD nbytes)
+RETfar_pm(UINT nbytes)
 {
 	selector_t cs_sel, ss_sel, temp_sel;
-	DWORD sp;
-	DWORD new_ip, new_sp;
-	WORD new_cs, new_ss;
+	UINT32 sp;
+	UINT32 new_ip, new_sp;
+	UINT16 new_cs, new_ss;
 	int rv;
 	int i;
 
@@ -863,7 +863,7 @@ RETfar_pm(DWORD nbytes)
 		if (CPU_STAT_SS32) {
 			CPU_ESP += nbytes;
 		} else {
-			CPU_SP += nbytes;
+			CPU_SP += (UINT16)nbytes;
 		}
 
 		load_cs(cs_sel.selector, &cs_sel.desc, CPU_STAT_CPL);
@@ -933,7 +933,7 @@ RETfar_pm(DWORD nbytes)
 		if (CPU_STAT_SS32) {
 			CPU_ESP = new_sp + nbytes;
 		} else {
-			CPU_SP = new_sp + nbytes;
+			CPU_SP = (UINT16)(new_sp + nbytes);
 		}
 
 		/* check segment register */
@@ -989,19 +989,18 @@ RETfar_pm(DWORD nbytes)
  * IRET_pm
  */
 static void IRET_pm_nested_task(void);
-static void IRET_pm_protected_mode_return(DWORD new_cs, DWORD new_ip, DWORD new_flags);
-static void IRET_pm_protected_mode_return_same_privilege(selector_t *cs_sel, DWORD new_ip, DWORD new_flags);
-static void IRET_pm_protected_mode_return_outer_privilege(selector_t *cs_sel, DWORD new_ip, DWORD new_flags);
-static void IRET_pm_return_to_vm86(DWORD new_cs, DWORD new_ip, DWORD new_flags);
-static void IRET_pm_return_from_vm86(DWORD new_cs, DWORD new_ip, DWORD new_flags);
+static void IRET_pm_protected_mode_return(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);
+static void IRET_pm_protected_mode_return_same_privilege(selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags);
+static void IRET_pm_protected_mode_return_outer_privilege(selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags);
+static void IRET_pm_return_to_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);
+static void IRET_pm_return_from_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);
 
 void
 IRET_pm(void)
 {
-	DWORD sp;
-	DWORD new_ip, new_flags;
-	WORD new_cs;
-	int rv;
+	UINT32 sp;
+	UINT32 new_ip, new_flags;
+	UINT16 new_cs;
 
 	VERBOSE(("IRET_pm: old EIP = %04x:%08x, ESP = %04x:%08x", CPU_CS, CPU_PREV_EIP, CPU_SS, CPU_ESP));
 
@@ -1050,8 +1049,8 @@ static void
 IRET_pm_nested_task(void)
 {
 	selector_t tss_sel;
+	UINT16 new_tss;
 	int rv;
-	WORD new_tss;
 
 	VERBOSE(("IRET_pm: TASK-RETURN: PE=1, VM=0, NT=1"));
 
@@ -1065,7 +1064,7 @@ IRET_pm_nested_task(void)
 
 	/* check system segment */
 	if (tss_sel.desc.s) {
-		VERBOSE(("IRET_pm: task segment is %d segment", tss_sel.desc.u.seg.c ? "code" : "data"));
+		VERBOSE(("IRET_pm: task segment is %s segment", tss_sel.desc.u.seg.c ? "code" : "data"));
 		EXCEPTION(GP_EXCEPTION, tss_sel.idx);
 	}
 
@@ -1097,7 +1096,7 @@ IRET_pm_nested_task(void)
  * IRET_pm: PROTECTED-MODE-RETURN
  */
 static void
-IRET_pm_protected_mode_return(DWORD new_cs, DWORD new_ip, DWORD new_flags)
+IRET_pm_protected_mode_return(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)
 {
 	selector_t cs_sel;
 	int rv;
@@ -1148,10 +1147,10 @@ IRET_pm_protected_mode_return(DWORD new_
  * IRET_pm: SAME-PRIVILEGE
  */
 static void
-IRET_pm_protected_mode_return_same_privilege(selector_t *cs_sel, DWORD new_ip, DWORD new_flags)
+IRET_pm_protected_mode_return_same_privilege(selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags)
 {
-	DWORD mask;
-	DWORD stacksize;
+	UINT32 mask;
+	UINT stacksize;
 
 	VERBOSE(("IRET_pm: RETURN-TO-SAME-PRIVILEGE-LEVEL"));
 
@@ -1172,6 +1171,11 @@ IRET_pm_protected_mode_return_same_privi
 			mask |= VM_FLAG|VIF_FLAG|VIP_FLAG;
 		}
 	}
+	if (CPU_INST_OP32) {
+		stacksize = 12;
+	} else {
+		stacksize = 6;
+	}
 
 	/* set new register */
 	load_cs(cs_sel->selector, &cs_sel->desc, CPU_STAT_CPL);
@@ -1179,15 +1183,10 @@ IRET_pm_protected_mode_return_same_privi
 
 	set_eflags(new_flags, mask);
 
-	if (CPU_INST_OP32) {
-		stacksize = 12;
-	} else {
-		stacksize = 6;
-	}
 	if (CPU_STAT_SS32) {
 		CPU_ESP += stacksize;
 	} else {
-		CPU_SP += stacksize;
+		CPU_SP += (UINT16)stacksize;
 	}
 }
 
@@ -1195,14 +1194,14 @@ IRET_pm_protected_mode_return_same_privi
  * IRET_pm: OUTER-PRIVILEGE
  */
 static void
-IRET_pm_protected_mode_return_outer_privilege(selector_t *cs_sel, DWORD new_ip, DWORD new_flags)
+IRET_pm_protected_mode_return_outer_privilege(selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags)
 {
 	descriptor_t *dp;
 	selector_t ss_sel;
-	DWORD mask;
-	DWORD sp;
-	DWORD new_sp;
-	WORD new_ss;
+	UINT32 mask;
+	UINT32 sp;
+	UINT32 new_sp;
+	UINT16 new_ss;
 	int rv;
 	int i;
 
@@ -1288,7 +1287,7 @@ IRET_pm_protected_mode_return_outer_priv
 	if (CPU_STAT_SS32) {
 		CPU_ESP = new_sp;
 	} else {
-		CPU_SP = new_sp;
+		CPU_SP = (UINT16)new_sp;
 	}
 
 	/* check segment register */
@@ -1300,7 +1299,6 @@ IRET_pm_protected_mode_return_outer_priv
 				/* segment register is invalid */
 				CPU_REGS_SREG(i) = 0;
 				CPU_STAT_SREG_CLEAR(i);
-				continue;
 			}
 		}
 	}
@@ -1310,11 +1308,11 @@ IRET_pm_protected_mode_return_outer_priv
  * IRET_pm: new_flags & VM_FLAG
  */
 static void
-IRET_pm_return_to_vm86(DWORD new_cs, DWORD new_ip, DWORD new_flags)
+IRET_pm_return_to_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)
 {
-	WORD segsel[CPU_SEGREG_NUM];
-	DWORD sp;
-	DWORD new_sp;
+	UINT16 segsel[CPU_SEGREG_NUM];
+	UINT32 sp;
+	UINT32 new_sp;
 	int i;
 
 	VERBOSE(("IRET_pm: Interrupt procedure was in virtual-8086 mode: PE=1, VM=1 in flags image"));
@@ -1339,7 +1337,7 @@ IRET_pm_return_to_vm86(DWORD new_cs, DWO
 	segsel[CPU_DS_INDEX] = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 24);
 	segsel[CPU_FS_INDEX] = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 28);
 	segsel[CPU_GS_INDEX] = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 32);
-	segsel[CPU_CS_INDEX] = new_cs;
+	segsel[CPU_CS_INDEX] = (UINT16)new_cs;
 
 	for (i = 0; i < CPU_SEGREG_NUM; i++) {
 		CPU_REGS_SREG(i) = segsel[i];
@@ -1360,9 +1358,9 @@ IRET_pm_return_to_vm86(DWORD new_cs, DWO
  * IRET_pm: VM_FLAG
  */
 static void
-IRET_pm_return_from_vm86(DWORD new_cs, DWORD new_ip, DWORD new_flags)
+IRET_pm_return_from_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)
 {
-	DWORD stacksize;
+	UINT stacksize;
 
 	VERBOSE(("IRET_pm: virtual-8086 mode: VM=1"));
 
@@ -1376,7 +1374,7 @@ IRET_pm_return_from_vm86(DWORD new_cs, D
 		if (CPU_STAT_SS32) {
 			CPU_ESP += stacksize;
 		} else {
-			CPU_SP += stacksize;
+			CPU_SP += (UINT16)stacksize;
 		}
 
 		set_eflags(new_flags, I_FLAG|RF_FLAG);