--- np2/i386c/ia32/interface.c	2004/03/10 23:01:08	1.19
+++ np2/i386c/ia32/interface.c	2005/03/05 16:47:04	1.23
@@ -1,4 +1,4 @@
-/*	$Id: interface.c,v 1.19 2004/03/10 23:01:08 yui Exp $	*/
+/*	$Id: interface.c,v 1.23 2005/03/05 16:47:04 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -30,10 +30,13 @@
 #include "compiler.h"
 #include "cpu.h"
 #include "ia32.mcr"
+#if defined(USE_FPU)
+#include "instructions/fpu/fp.h"
+#endif
 
 #include "pccore.h"
 #include "iocore.h"
-#include "dmap.h"
+#include "dmax86.h"
 #include "bios.h"
 #if defined(IA32_REBOOT_ON_PANIC)
 #include "pccore.h"
@@ -50,9 +53,11 @@ ia32_initreg(void)
 	CPU_EDX = (CPU_FAMILY << 8) | (CPU_MODEL << 4) | CPU_STEPPING;
 	CPU_EFLAG = 2;
 	CPU_CR0 = CPU_CR0_CD | CPU_CR0_NW | CPU_CR0_ET;
-#ifndef USE_FPU
+#if defined(USE_FPU)
 	CPU_CR0 |= CPU_CR0_EM | CPU_CR0_NE;
 	CPU_CR0 &= ~CPU_CR0_MP;
+#else
+	CPU_CR0 |= CPU_CR0_ET;
 #endif
 	CPU_MXCSR = 0x1f80;
 	CPU_GDTR_LIMIT = 0xffff;
@@ -76,6 +81,9 @@ ia32_initreg(void)
 	CPU_ADRSMASK = 0x000fffff;
 
 	tlb_init();
+#if defined(USE_FPU)
+	fpu_init();
+#endif
 }
 
 void
@@ -95,6 +103,16 @@ ia32shut(void)
 }
 
 void
+ia32a20enable(BOOL enable)
+{
+#if (CPU_FAMILY == 3)
+	CPU_ADRSMASK = (enable)?0x00ffffff:0x00ffffff;
+#else
+	CPU_ADRSMASK = (enable)?0xffffffff:0x00ffffff;
+#endif
+}
+
+void
 ia32(void)
 {
 	int rv;
@@ -121,7 +139,7 @@ ia32(void)
 	do {
 		exec_1step();
 		if (dmac.working) {
-			dmap();
+			dmax86();
 		}
 	} while (CPU_REMCLOCK > 0);
 #else
@@ -132,12 +150,12 @@ ia32(void)
 				CPU_DR6 |= CPU_DR6_BS;
 				INTERRUPT(1, TRUE, FALSE, 0);
 			}
-			dmap();
+			dmax86();
 		} while (CPU_REMCLOCK > 0);
 	} else if (dmac.working) {
 		do {
 			exec_1step();
-			dmap();
+			dmax86();
 		} while (CPU_REMCLOCK > 0);
 	} else {
 		do {
@@ -179,7 +197,7 @@ ia32_step(void)
 		}
 #endif
 		if (dmac.working) {
-			dmap();
+			dmax86();
 		}
 	} while (CPU_REMCLOCK > 0);
 }
@@ -271,7 +289,9 @@ ia32_bioscall(void)
 		adrs = (CPU_EIP - 1) + CPU_STAT_CS_BASE;
 #endif
 		if ((adrs >= 0xf8000) && (adrs < 0x100000)) {
-			biosfunc(adrs);
+			if (biosfunc(adrs)) {
+				CPU_PREFETCH_CLEAR();
+			}
 			if (!CPU_STAT_PM || CPU_STAT_VM86) {
 				CPU_SET_SEGREG(CPU_ES_INDEX, CPU_ES);
 				CPU_SET_SEGREG(CPU_CS_INDEX, CPU_CS);