--- np2/i386c/ia32/task.c	2004/03/23 15:29:34	1.18
+++ np2/i386c/ia32/task.c	2008/01/25 18:12:13	1.22
@@ -1,4 +1,4 @@
-/*	$Id: task.c,v 1.18 2004/03/23 15:29:34 monaka Exp $	*/
+/*	$Id: task.c,v 1.22 2008/01/25 18:12:13 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -12,8 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -225,8 +223,8 @@ task_switch(selector_t *task_sel, task_s
 
 	if (CPU_STAT_PAGING) {
 		/* task state paging check */
-		paging_check(cur_base, CPU_TR_DESC.u.seg.limit, CPU_PAGE_WRITE_DATA, CPU_MODE_SUPERVISER);
-		paging_check(task_base, task_sel->desc.u.seg.limit, CPU_PAGE_WRITE_DATA, CPU_MODE_SUPERVISER);
+		paging_check(cur_base, CPU_TR_DESC.u.seg.limit, CPU_PAGE_WRITE_DATA|CPU_MODE_SUPERVISER);
+		paging_check(task_base, task_sel->desc.u.seg.limit, CPU_PAGE_WRITE_DATA|CPU_MODE_SUPERVISER);
 	}
 
 	/* load task state */
@@ -416,7 +414,6 @@ task_switch(selector_t *task_sel, task_s
 
 	/* set new EIP, GPR */
 	CPU_PREV_EIP = CPU_EIP = eip;
-	CPU_PREFETCH_CLEAR();
 	for (i = 0; i < CPU_REG_NUM; i++) {
 		CPU_REGS_DWORD(i) = regs[i];
 	}
@@ -426,20 +423,7 @@ task_switch(selector_t *task_sel, task_s
 	}
 
 	/* set new EFLAGS */
-#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION)
-	CPU_EFLAG = new_flags;
-	CPU_OV = CPU_FLAG & O_FLAG;
-	CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG);
-	if ((old_flags ^ CPU_EFLAG) & VM_FLAG) {
-		if (CPU_EFLAG & VM_FLAG) {
-			change_vm(1);
-		} else {
-			change_vm(0);
-		}
-	}
-#else
 	set_eflags(new_flags, I_FLAG|IOPL_FLAG|RF_FLAG|VM_FLAG|VIF_FLAG|VIP_FLAG);
-#endif
 
 	/* I/O deny bitmap */
 	if (!task16) {