--- np2/i286x/i286x.cpp	2004/01/05 05:04:53	1.14
+++ np2/i286x/i286x.cpp	2004/01/25 05:41:29	1.16
@@ -57,6 +57,15 @@ void i286x_initialize(void) {
 	v30xinit();
 }
 
+void i286x_deinitialize(void) {
+
+	if (CPU_EXTMEM) {
+		_MFREE(CPU_EXTMEM);
+		CPU_EXTMEM = NULL;
+		CPU_EXTMEMSIZE = 0;
+	}
+}
+
 static void i286x_initreg(void) {
 
 	I286_CS = 0xf000;
@@ -78,6 +87,41 @@ void i286x_shut(void) {
 	i286x_initreg();
 }
 
+void i286x_setextsize(UINT32 size) {
+
+	if (CPU_EXTMEMSIZE != size) {
+		_MFREE(CPU_EXTMEM);
+		if (size) {
+			CPU_EXTMEM = (BYTE *)_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;
+}
+
+void i286x_setemm(UINT frame, UINT32 addr) {
+
+	BYTE	*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;
+}
+
 
 LABEL void i286x_resetprefetch(void) {
 
@@ -400,9 +444,9 @@ I286 pop_es(void) {								// 07: pop es
 		__asm {
 				I286CLOCK(5)
 				REGPOP(I286_ES)
+				movzx	eax, ax
 				test	I286_MSW, MSW_PE
 				jne		short pop_es_pe
-				movzx	eax, ax
 				shl		eax, 4					// make segreg
 pop_es_base:	mov		ES_BASE, eax
 				GET_NEXTPRE1
@@ -613,9 +657,9 @@ I286 pop_ss(void) {								// 17: pop ss
 		__asm {
 				I286CLOCK(5)
 				REGPOP(I286_SS)
+				movzx	eax, ax
 				test	I286_MSW, MSW_PE
 				jne		short pop_ss_pe
-				movzx	eax, ax
 				shl		eax, 4					// make segreg
 pop_ss_base:	mov		SS_BASE, eax
 				mov		SS_FIX, eax
@@ -742,9 +786,9 @@ I286 pop_ds(void) {								// 1F: pop ds
 		__asm {
 				I286CLOCK(5)
 				REGPOP(I286_DS)
+				movzx	eax, ax
 				test	I286_MSW, MSW_PE
 				jne		short pop_ds_pe
-				movzx	eax, ax
 				shl		eax, 4					// make segreg
 pop_ds_base:	mov		DS_BASE, eax
 				mov		DS_FIX, eax
@@ -2450,9 +2494,9 @@ I286 mov_seg_ea(void) {							// 8E: mov
 				call	i286_memoryread_w
 		segset:
 				mov		word ptr I286_SEGREG[ebp], ax
+				movzx	eax, ax
 				test	I286_MSW, MSW_PE
 				jne		short mov_seg_pe
-				movzx	eax, ax
 				shl		eax, 4					// make segreg
 mov_seg_base:	mov		SEG_BASE[ebp*2], eax
 				sub		ebp, 2*2