--- np2/i286c/i286c.c	2003/12/26 02:02:09	1.18
+++ np2/i286c/i286c.c	2005/03/05 06:02:29	1.27
@@ -4,8 +4,11 @@
 #include	"v30patch.h"
 #include	"pccore.h"
 #include	"iocore.h"
-#include	"dmap.h"
+#include	"dmax86.h"
 #include	"i286c.mcr"
+#if defined(ENABLE_TRAP)
+#include	"steptrap.h"
+#endif
 
 
 	I286CORE	i286core;
@@ -94,9 +97,9 @@ const UINT8 iflags[512] = {					// Z_FLA
 
 void i286c_initialize(void) {
 
+#if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2)
 	UINT	i;
-	UINT	bit;
-	REG8	f;
+#endif
 
 #if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2)
 	for (i=0; i<0x100; i++) {
@@ -124,6 +127,8 @@ void i286c_initialize(void) {
 
 #if !defined(MEMOPTIMIZE)
 	for (i=0; i<0x10000; i++) {
+		REG8 f;
+		UINT bit;
 		f = P_FLAG;
 		for (bit=0x80; bit; bit>>=1) {
 			if (i & bit) {
@@ -143,40 +148,80 @@ void i286c_initialize(void) {
 	i286cea_initialize();
 #endif
 	v30cinit();
+	ZeroMemory(&i286core, sizeof(i286core));
 }
 
-void i286c_reset(void) {
+void i286c_deinitialize(void) {
+
+	if (CPU_EXTMEM) {
+		_MFREE(CPU_EXTMEM);
+		CPU_EXTMEM = NULL;
+		CPU_EXTMEMSIZE = 0;
+	}
+}
+
+static void i286c_initreg(void) {
 
-	ZeroMemory(&I286_STAT, sizeof(I286_STAT));
 	I286_CS = 0xf000;
 	CS_BASE = 0xf0000;
 	I286_IP = 0xfff0;
 	I286_ADRSMASK = 0xfffff;
 }
 
+void i286c_reset(void) {
+
+	ZeroMemory(&i286core.s, sizeof(i286core.s));
+	i286c_initreg();
+}
+
 void i286c_shut(void) {
 
-	I286_MSW = 0;
+	ZeroMemory(&i286core.s, offsetof(I286STAT, cpu_type));
+	i286c_initreg();
+}
 
-	I286_ES = 0;
-	I286_CS = 0xf000;
-	I286_SS = 0;
-	I286_DS = 0;
+void i286c_setextsize(UINT32 size) {
 
-	ES_BASE = 0;
-	CS_BASE = 0xf0000;
-	SS_BASE = 0;
-	DS_BASE = 0;
-	SS_FIX = 0;
-	DS_FIX = 0;
+	if (CPU_EXTMEMSIZE != size) {
+		if (CPU_EXTMEM) {
+			_MFREE(CPU_EXTMEM);
+			CPU_EXTMEM = NULL;
+		}
+		if (size) {
+			CPU_EXTMEM = (UINT8 *)_MALLOC(size + 16, "EXTMEM");
+			if (CPU_EXTMEM == NULL) {
+				size = 0;
+			}
+		}
+		CPU_EXTMEMSIZE = size;
+	}
+	i286core.e.ems[0] = mem + 0xc0000;
+	i286core.e.ems[1] = mem + 0xc4000;
+	i286core.e.ems[2] = mem + 0xc8000;
+	i286core.e.ems[3] = mem + 0xcc000;
+}
 
-	I286_IP = 0xfff0;
-	I286_ADRSMASK = 0xfffff;
+void i286c_setemm(UINT frame, UINT32 addr) {
+
+	UINT8	*ptr;
+
+	frame &= 3;
+	if (addr < USE_HIMEM) {
+		ptr = mem + addr;
+	}
+	else if ((addr - 0x100000 + 0x4000) <= CPU_EXTMEMSIZE) {
+		ptr = CPU_EXTMEM + (addr - 0x100000);
+	}
+	else {
+		ptr = mem + 0xc0000 + (frame << 14);
+	}
+	i286core.e.ems[frame] = ptr;
 }
 
+
 void CPUCALL i286c_intnum(UINT vect, REG16 IP) {
 
-const BYTE	*ptr;
+const UINT8	*ptr;
 
 	REGPUSH0(REAL_FLAGREG)
 	REGPUSH0(I286_CS)
@@ -195,7 +240,7 @@ const BYTE	*ptr;
 void CPUCALL i286c_interrupt(REG8 vect) {
 
 	UINT	op;
-const BYTE	*ptr;
+const UINT8	*ptr;
 
 	op = i286_memoryread(I286_IP + CS_BASE);
 	if (op == 0xf4) {							// hlt
@@ -221,23 +266,32 @@ void i286c(void) {
 
 	if (I286_TRAP) {
 		do {
+#if defined(ENABLE_TRAP)
+			steptrap(CPU_CS, CPU_IP);
+#endif
 			GET_PCBYTE(opcode);
 			i286op[opcode]();
 			if (I286_TRAP) {
 				i286c_interrupt(1);
 			}
-			dmap_i286();
+			dmax86();
 		} while(I286_REMCLOCK > 0);
 	}
 	else if (dmac.working) {
 		do {
+#if defined(ENABLE_TRAP)
+			steptrap(CPU_CS, CPU_IP);
+#endif
 			GET_PCBYTE(opcode);
 			i286op[opcode]();
-			dmap_i286();
+			dmax86();
 		} while(I286_REMCLOCK > 0);
 	}
 	else {
 		do {
+#if defined(ENABLE_TRAP)
+			steptrap(CPU_CS, CPU_IP);
+#endif
 			GET_PCBYTE(opcode);
 			i286op[opcode]();
 		} while(I286_REMCLOCK > 0);
@@ -258,29 +312,14 @@ void i286c_step(void) {
 	if (I286_OV) {
 		I286_FLAG |= (O_FLAG);
 	}
-	dmap_i286();
-}
-
-
-UINT32 i286c_selector(UINT sel) {
-
-	I286DTR	*dtr;
-	UINT32	addr;
-	UINT32	ret;
-
-	dtr = (sel & 4)?&I286_LDTRC:&I286_GDTR;
-	addr = (dtr->base24 << 16) + dtr->base + (sel & (~7));
-	ret = i286_memoryread_w(addr+2);
-	ret += i286_memoryread(addr+4) << 16;
-	TRACEOUT(("PE - select %.4x %.8x", sel, ret));
-	return(ret);
+	dmax86();
 }
 
 
 // ---- test
 
 #if defined(I286C_TEST)
-BYTE BYTESZPF(UINT r) {
+UINT8 BYTESZPF(UINT r) {
 
 	if (r & (~0xff)) {
 		TRACEOUT(("BYTESZPF bound error: %x", r));
@@ -288,7 +327,7 @@ BYTE BYTESZPF(UINT r) {
 	return(iflags[r & 0xff]);
 }
 
-BYTE BYTESZPCF(UINT r) {
+UINT8 BYTESZPCF(UINT r) {
 
 	if (r & (~0x1ff)) {
 		TRACEOUT(("BYTESZPCF bound error: %x", r));
@@ -296,10 +335,10 @@ BYTE BYTESZPCF(UINT r) {
 	return(iflags[r & 0x1ff]);
 }
 
-BYTE WORDSZPF(UINT32 r) {
+UINT8 WORDSZPF(UINT32 r) {
 
-	BYTE	f1;
-	BYTE	f2;
+	UINT8	f1;
+	UINT8	f2;
 
 	if (r & (~0xffff)) {
 		TRACEOUT(("WORDSZPF bound error: %x", r));
@@ -314,10 +353,10 @@ BYTE WORDSZPF(UINT32 r) {
 	return(f1);
 }
 
-BYTE WORDSZPCF(UINT32 r) {
+UINT8 WORDSZPCF(UINT32 r) {
 
-	BYTE	f1;
-	BYTE	f2;
+	UINT8	f1;
+	UINT8	f2;
 
 	if ((r & 0xffff0000) && (!(r & 0x00010000))) {
 		TRACEOUT(("WORDSZPCF bound error: %x", r));