--- np2/i386c/ia32/interface.c	2004/02/04 13:24:35	1.10
+++ np2/i386c/ia32/interface.c	2004/03/06 18:07:37	1.15
@@ -1,4 +1,4 @@
-/*	$Id: interface.c,v 1.10 2004/02/04 13:24:35 monaka Exp $	*/
+/*	$Id: interface.c,v 1.15 2004/03/06 18:07:37 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -31,6 +31,8 @@
 #include "cpu.h"
 #include "ia32.mcr"
 
+#include "pccore.h"
+#include "iocore.h"
 #include "dmap.h"
 #include "bios.h"
 #if defined(IA32_REBOOT_ON_PANIC)
@@ -38,11 +40,12 @@
 #endif
 
 
-static void ia32_initreg(void) {
-
+void
+ia32_initreg(void)
+{
 	int i;
 
-	CPU_STATSAVE.cpu_inst_default.seg_base = (DWORD)-1;
+	CPU_STATSAVE.cpu_inst_default.seg_base = (UINT32)-1;
 
 	CPU_EDX = (CPU_FAMILY << 8) | (CPU_MODEL << 4) | CPU_STEPPING;
 	CPU_EFLAG = 2;
@@ -71,6 +74,8 @@ static void ia32_initreg(void) {
 	CPU_SET_SEGREG(CPU_CS_INDEX, 0xf000);
 	CPU_EIP = 0xfff0;
 	CPU_ADRSMASK = 0x000fffff;
+
+	tlb_init();
 }
 
 void
@@ -112,69 +117,24 @@ ia32(void)
 		break;
 	}
 
-	do {
-		exec_1step();
-	} while (CPU_REMCLOCK > 0);
-}
-
-void
-ia32withtrap(void)
-{
-	int rv;
-
-	rv = sigsetjmp(exec_1step_jmpbuf, 1);
-	switch (rv) {
-	case 0:
-		break;
-
-	case 1:
-		VERBOSE(("ia32withtrap: return from exception"));
-		break;
-
-	case 2:
-		VERBOSE(("ia32withtrap: return from panic"));
-		return;
-
-	default:
-		VERBOSE(("ia32withtrap: return from unknown cause"));
-		break;
-	}
-
-	do {
-		exec_1step();
-		if (CPU_TRAP) {
-			ia32_interrupt(1);
-		}
-	} while (CPU_REMCLOCK > 0);
-}
-
-void
-ia32withdma(void)
-{
-	int rv;
-
-	rv = sigsetjmp(exec_1step_jmpbuf, 1);
-	switch (rv) {
-	case 0:
-		break;
-
-	case 1:
-		VERBOSE(("ia32withdma: return from exception"));
-		break;
-
-	case 2:
-		VERBOSE(("ia32withdma: return from panic"));
-		return;
-
-	default:
-		VERBOSE(("ia32withdma: return from unknown cause"));
-		break;
+	if (CPU_TRAP) {
+		do {
+			exec_1step();
+			if (CPU_TRAP) {
+				ia32_interrupt(1);
+			}
+			dmap_i286();
+		} while (CPU_REMCLOCK > 0);
+	} else if (dmac.working) {
+		do {
+			exec_1step();
+			dmap_i286();
+		} while (CPU_REMCLOCK > 0);
+	} else {
+		do {
+			exec_1step();
+		} while (CPU_REMCLOCK > 0);
 	}
-
-	do {
-		exec_1step();
-		dmap_i286();
-	} while (CPU_REMCLOCK > 0);
 }
 
 void
@@ -210,7 +170,7 @@ ia32_step(void)
 }
 
 void CPUCALL
-ia32_interrupt(BYTE vect)
+ia32_interrupt(int vect)
 {
 
 	INTERRUPT(vect, 0, 0, 0);
@@ -279,10 +239,10 @@ ia32_printf(const char *str, ...)
 void
 ia32_bioscall(void)
 {
-	DWORD adrs;
+	UINT32 adrs;
 
 	if (!CPU_STAT_PM || CPU_STAT_VM86) {
-		adrs = (CPU_EIP - 1) + CPU_STAT_SREGBASE(CPU_CS_INDEX);
+		adrs = (CPU_EIP - 1) + CPU_STAT_CS_BASE;
 		if ((adrs >= 0xf8000) && (adrs < 0x100000)) {
 			biosfunc(adrs);
 			if (!CPU_STAT_PM || CPU_STAT_VM86) {