--- np2/i386c/ia32/task.c	2011/12/23 04:16:51	1.29
+++ np2/i386c/ia32/task.c	2011/12/29 14:30:31	1.31
@@ -32,7 +32,7 @@
 #define	TSS_32_SIZE	104
 #define	TSS_32_LIMIT	(TSS_32_SIZE - 1)
 
-static void
+static void CPUCALL
 set_task_busy(UINT16 selector)
 {
 	UINT32 addr;
@@ -48,7 +48,7 @@ set_task_busy(UINT16 selector)
 	}
 }
 
-static void
+static void CPUCALL
 set_task_free(UINT16 selector)
 {
 	UINT32 addr;
@@ -64,7 +64,7 @@ set_task_free(UINT16 selector)
 	}
 }
 
-void
+void CPUCALL
 load_tr(UINT16 selector)
 {
 	selector_t task_sel;
@@ -136,7 +136,7 @@ load_tr(UINT16 selector)
 #endif
 }
 
-void
+void CPUCALL
 get_stack_pointer_from_tss(UINT pl, UINT16 *new_ss, UINT32 *new_esp)
 {
 	UINT32 tss_stack_addr;
@@ -190,7 +190,7 @@ get_backlink_selector_from_tss(void)
 	return backlink;
 }
 
-void
+void CPUCALL
 task_switch(selector_t *task_sel, task_switch_type_t type)
 {
 	UINT32 regs[CPU_REG_NUM];
@@ -201,7 +201,6 @@ task_switch(selector_t *task_sel, task_s
 	UINT16 ldtr;
 	UINT16 iobase;
 	UINT16 t;
-	int new_cpl;
 
 	selector_t cs_sel, ss_sel;
 	int rv;
@@ -491,6 +490,37 @@ task_switch(selector_t *task_sel, task_s
 
 	/* set new segment register */
 	if (!CPU_STAT_VM86) {
+		/* load CS */
+		rv = parse_selector(&cs_sel, sreg[CPU_CS_INDEX]);
+		if (rv < 0) {
+			VERBOSE(("task_switch: load CS failure (sel = 0x%04x, rv = %d)", sreg[CPU_CS_INDEX], rv));
+			EXCEPTION(TS_EXCEPTION, cs_sel.idx);
+		}
+
+		/* CS must be code segment */
+		if (SEG_IS_SYSTEM(&cs_sel.desc) || SEG_IS_DATA(&cs_sel.desc)) {
+			EXCEPTION(TS_EXCEPTION, cs_sel.idx);
+		}
+
+		/* check privilege level */
+		if (!SEG_IS_CONFORMING_CODE(&cs_sel.desc)) {
+			/* non-confirming code segment */
+			if (cs_sel.desc.dpl != cs_sel.rpl) {
+				EXCEPTION(TS_EXCEPTION, cs_sel.idx);
+			}
+		} else {
+			/* conforming code segment */
+			if (cs_sel.desc.dpl > cs_sel.rpl) {
+				EXCEPTION(TS_EXCEPTION, cs_sel.idx);
+			}
+		}
+
+		/* code segment is not present */
+		rv = selector_is_not_present(&cs_sel);
+		if (rv < 0) {
+			EXCEPTION(NP_EXCEPTION, cs_sel.idx);
+		}
+
 		/* load SS */
 		rv = parse_selector(&ss_sel, sreg[CPU_SS_INDEX]);
 		if (rv < 0) {
@@ -526,37 +556,6 @@ task_switch(selector_t *task_sel, task_s
 		LOAD_SEGREG1(CPU_FS_INDEX, sreg[CPU_FS_INDEX], TS_EXCEPTION);
 		LOAD_SEGREG1(CPU_GS_INDEX, sreg[CPU_GS_INDEX], TS_EXCEPTION);
 
-		/* load CS */
-		rv = parse_selector(&cs_sel, sreg[CPU_CS_INDEX]);
-		if (rv < 0) {
-			VERBOSE(("task_switch: load CS failure (sel = 0x%04x, rv = %d)", sreg[CPU_CS_INDEX], rv));
-			EXCEPTION(TS_EXCEPTION, cs_sel.idx);
-		}
-
-		/* CS must be code segment */
-		if (SEG_IS_SYSTEM(&cs_sel.desc) || SEG_IS_DATA(&cs_sel.desc)) {
-			EXCEPTION(TS_EXCEPTION, cs_sel.idx);
-		}
-
-		/* check privilege level */
-		if (!SEG_IS_CONFORMING_CODE(&cs_sel.desc)) {
-			/* non-confirming code segment */
-			if (cs_sel.desc.dpl != cs_sel.rpl) {
-				EXCEPTION(TS_EXCEPTION, cs_sel.idx);
-			}
-		} else {
-			/* conforming code segment */
-			if (cs_sel.desc.dpl > cs_sel.rpl) {
-				EXCEPTION(TS_EXCEPTION, cs_sel.idx);
-			}
-		}
-
-		/* code segment is not present */
-		rv = selector_is_not_present(&cs_sel);
-		if (rv < 0) {
-			EXCEPTION(NP_EXCEPTION, cs_sel.idx);
-		}
-
 		/* Now loading CS register */
 		load_cs(cs_sel.selector, &cs_sel.desc, cs_sel.rpl);
 	}