--- np2/i286x/i286x.cpp	2004/01/10 17:24:01	1.15
+++ np2/i286x/i286x.cpp	2005/04/04 11:50:59	1.28
@@ -11,12 +11,16 @@
 #include	"i286xea.mcr"
 #include	"v30patch.h"
 #include	"bios.h"
-#include	"dmap.h"
+#include	"dmax86.h"
+#if defined(ENABLE_TRAP)
+#include	"steptrap.h"
+#include	"inttrap.h"
+#endif
 
 
 	I286CORE	i286core;
 
-const BYTE iflags[256] = {					// Z_FLAG, S_FLAG, P_FLAG
+const UINT8 iflags[256] = {					// Z_FLAG, S_FLAG, P_FLAG
 			0x44, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x00,
 			0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04,
 			0x00, 0x04, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04,
@@ -57,6 +61,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 +91,44 @@ void i286x_shut(void) {
 	i286x_initreg();
 }
 
+void i286x_setextsize(UINT32 size) {
+
+	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;
+}
+
+void i286x_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;
+}
+
 
 LABEL void i286x_resetprefetch(void) {
 
@@ -91,7 +142,7 @@ LABEL void i286x_resetprefetch(void) {
 	}
 }
 
-LABEL void __fastcall i286x_interrupt(BYTE vect) {
+LABEL void __fastcall i286x_interrupt(UINT8 vect) {
 
 	__asm {
 				pushad
@@ -217,7 +268,13 @@ LABEL void i286x(void) {
 				cmp		dmac.working, 0
 				jne		short i286_dma_mnlp
 
-i286_mnlp:		movzx	eax, bl
+i286_mnlp:
+#if defined(ENABLE_TRAP)
+				mov		edx, esi
+				movzx	ecx, I286_CS
+				call	steptrap
+#endif
+				movzx	eax, bl
 				call	i286op[eax*4]
 				cmp		I286_REMCLOCK, 0
 				jg		i286_mnlp
@@ -227,9 +284,15 @@ i286_mnlp:		movzx	eax, bl
 				ret
 
 				align	16
-i286_dma_mnlp:	movzx	eax, bl
+i286_dma_mnlp:
+#if defined(ENABLE_TRAP)
+				mov		edx, esi
+				movzx	ecx, I286_CS
+				call	steptrap
+#endif
+				movzx	eax, bl
 				call	i286op[eax*4]
-				call	dmap_i286
+				call	dmax86
 				cmp		I286_REMCLOCK, 0
 				jg		i286_dma_mnlp
 				mov		dword ptr (i286core.s.prefetchque), ebx
@@ -238,7 +301,13 @@ i286_dma_mnlp:	movzx	eax, bl
 				ret
 
 				align	16
-i286_trapping:	movzx	eax, bl
+i286_trapping:
+#if defined(ENABLE_TRAP)
+				mov		edx, esi
+				movzx	ecx, I286_CS
+				call	steptrap
+#endif
+				movzx	eax, bl
 				call	i286op[eax*4]
 				cmp		I286_TRAP, 0
 				je		i286notrap
@@ -260,6 +329,12 @@ LABEL void i286x_step(void) {
 				mov		ebx, dword ptr (i286core.s.prefetchque)
 				movzx	esi, I286_IP
 
+#if defined(ENABLE_TRAP)
+				mov		edx, esi
+				movzx	ecx, I286_CS
+				call	steptrap
+#endif
+
 				movzx	eax, bl
 				call	i286op[eax*4]
 
@@ -271,7 +346,7 @@ nexts:
 				mov		dword ptr (i286core.s.prefetchque), ebx
 				mov		I286_IP, si
 
-				call	dmap_i286
+				call	dmax86
 				popad
 				ret
 		}
@@ -296,7 +371,7 @@ LABEL void removeprefix(void) {
 I286 _reserved(void) {
 
 		__asm {
-				inc		si						// 01/08/31
+//				inc		si						// 01/08/31
 				INT_NUM(6)
 		}
 }
@@ -401,7 +476,7 @@ I286 pop_es(void) {								// 07: pop es
 				I286CLOCK(5)
 				REGPOP(I286_ES)
 				movzx	eax, ax
-				test	I286_MSW, MSW_PE
+				test	byte ptr (I286_MSW), MSW_PE
 				jne		short pop_es_pe
 				shl		eax, 4					// make segreg
 pop_es_base:	mov		ES_BASE, eax
@@ -614,7 +689,7 @@ I286 pop_ss(void) {								// 17: pop ss
 				I286CLOCK(5)
 				REGPOP(I286_SS)
 				movzx	eax, ax
-				test	I286_MSW, MSW_PE
+				test	byte ptr (I286_MSW), MSW_PE
 				jne		short pop_ss_pe
 				shl		eax, 4					// make segreg
 pop_ss_base:	mov		SS_BASE, eax
@@ -743,7 +818,7 @@ I286 pop_ds(void) {								// 1F: pop ds
 				I286CLOCK(5)
 				REGPOP(I286_DS)
 				movzx	eax, ax
-				test	I286_MSW, MSW_PE
+				test	byte ptr (I286_MSW), MSW_PE
 				jne		short pop_ds_pe
 				shl		eax, 4					// make segreg
 pop_ds_base:	mov		DS_BASE, eax
@@ -1648,7 +1723,7 @@ I286 _arpl(void) {
 				xor		eax, eax
 				cmp		bh, 0c0h
 				setc	al
-				add		si, ax
+		//		add		si, ax
 				add		eax, 10
 				I286CLOCK(eax)
 				INT_NUM(6)
@@ -2451,7 +2526,7 @@ I286 mov_seg_ea(void) {							// 8E: mov
 		segset:
 				mov		word ptr I286_SEGREG[ebp], ax
 				movzx	eax, ax
-				test	I286_MSW, MSW_PE
+				test	byte ptr (I286_MSW), MSW_PE
 				jne		short mov_seg_pe
 				shl		eax, 4					// make segreg
 mov_seg_base:	mov		SEG_BASE[ebp*2], eax
@@ -2667,10 +2742,17 @@ I286 call_far(void) {							// 9A: call 
 				mov		si, bx
 				shr		ebx, 16
 				mov		I286_CS, bx
+				test	byte ptr (I286_MSW), MSW_PE
+				jne		short call_far_pe
 				shl		ebx, 4
 				mov		CS_BASE, ebx
-				RESET_XPREFETCH
+call_far_base:	RESET_XPREFETCH
 				ret
+
+call_far_pe:	mov		eax, ebx
+				call	i286x_selector
+				mov		CS_BASE, eax
+				jmp		short call_far_base
 		}
 }
 
@@ -2714,14 +2796,12 @@ I286 _popf(void) {								// 9D: popf
 				je		irqcheck				// fast_intr
 				test	ah, 2
 				je		nextop
-				cmp		pic.ext_irq, 0
-				jne		nextop
-				mov		al, pic.pi[0].imr
-				mov		ah, pic.pi[1].imr
+				mov		al, pic.pi[0 * (type _PICITEM)].imr
+				mov		ah, pic.pi[1 * (type _PICITEM)].imr
 				not		ax
-				test	al, pic.pi[0].irr
+				test	al, pic.pi[0 * (type _PICITEM)].irr
 				jne		irqcheck
-				test	ah, pic.pi[1].irr
+				test	ah, pic.pi[1 * (type _PICITEM)].irr
 				jne		irqcheck
 nextop:			ret
 
@@ -2822,10 +2902,8 @@ I286 _movsb(void) {								// A4: movsb
 				add		ecx, DS_FIX
 				call	i286_memoryread
 				mov		dl, al
-				movzx	ecx, I286_ES
-				shl		ecx, 4
-				movzx	eax, I286_DI
-				add		ecx, eax
+				movzx	ecx, I286_DI
+				add		ecx, ES_BASE
 				STRING_DIR
 				add		I286_SI, ax
 				add		I286_DI, ax
@@ -2842,10 +2920,8 @@ I286 _movsw(void) {								// A5: movsw
 				add		ecx, DS_FIX
 				call	i286_memoryread_w
 				mov		dx, ax
-				movzx	ecx, I286_ES
-				shl		ecx, 4
-				movzx	eax, I286_DI
-				add		ecx, eax
+				movzx	ecx, I286_DI
+				add		ecx, ES_BASE
 				STRING_DIRx2
 				add		I286_SI, ax
 				add		I286_DI, ax
@@ -2862,10 +2938,8 @@ I286 _cmpsb(void) {								// A6: cmpsb
 				add		ecx, DS_FIX
 				call	i286_memoryread
 				mov		dl, al
-				movzx	ecx, I286_ES
-				shl		ecx, 4
-				movzx	eax, I286_DI
-				add		ecx, eax
+				movzx	ecx, I286_DI
+				add		ecx, ES_BASE
 				call	i286_memoryread
 				cmp		dl, al
 				FLAG_STORE_OF
@@ -2885,10 +2959,8 @@ I286 _cmpsw(void) {								// A7: cmpsw
 				add		ecx, DS_FIX
 				call	i286_memoryread_w
 				mov		edx, eax
-				movzx	ecx, I286_ES
-				shl		ecx, 4
-				movzx	eax, I286_DI
-				add		ecx, eax
+				movzx	ecx, I286_DI
+				add		ecx, ES_BASE
 				call	i286_memoryread_w
 				cmp		dx, ax
 				FLAG_STORE_OF
@@ -2927,10 +2999,8 @@ I286 _stosb(void) {								// AA: stosb
 		__asm {
 				GET_NEXTPRE1
 				I286CLOCK(3)
-				movzx	ecx, I286_ES
-				shl		ecx, 4
-				movzx	eax, I286_DI
-				add		ecx, eax
+				movzx	ecx, I286_DI
+				add		ecx, ES_BASE
 				STRING_DIR
 				add		I286_DI, ax
 				mov		dl, I286_AL
@@ -2943,10 +3013,8 @@ I286 _stosw(void) {								// AB: stosw
 		__asm {
 				GET_NEXTPRE1
 				I286CLOCK(3)
-				movzx	ecx, I286_ES
-				shl		ecx, 4
-				movzx	eax, I286_DI
-				add		ecx, eax
+				movzx	ecx, I286_DI
+				add		ecx, ES_BASE
 				STRING_DIRx2
 				add		I286_DI, ax
 				mov		dx, I286_AX
@@ -2989,10 +3057,8 @@ I286 _scasb(void) {								// AE: scasb
 		__asm {
 				GET_NEXTPRE1
 				I286CLOCK(7)
-				movzx	ecx, I286_ES
-				shl		ecx, 4
-				movzx	eax, I286_DI
-				add		ecx, eax
+				movzx	ecx, I286_DI
+				add		ecx, ES_BASE
 				call	i286_memoryread
 				cmp		I286_AL, al
 				FLAG_STORE_OF
@@ -3007,10 +3073,8 @@ I286 _scasw(void) {								// AF: scasw
 		__asm {
 				GET_NEXTPRE1
 				I286CLOCK(7)
-				movzx	ecx, I286_ES
-				shl		ecx, 4
-				movzx	eax, I286_DI
-				add		ecx, eax
+				movzx	ecx, I286_DI
+				add		ecx, ES_BASE
 				call	i286_memoryread_w
 				cmp		I286_AX, ax
 				FLAG_STORE_OF
@@ -3334,13 +3398,17 @@ I286 les_r16_ea(void) {							// C4: les
 				lea		ecx, [edi + ebp]
 				call	i286_memoryread_w
 				mov		I286_ES, ax
-				and		eax, 0000ffffh
+				movzx	eax, ax
+				test	byte ptr (I286_MSW), MSW_PE
+				jne		short les_pe
 				shl		eax, 4					// make segreg
-				mov		ES_BASE, eax
+les_base:		mov		ES_BASE, eax
 				ret
-				align	4
-		src_register:
-				INT_NUM(6)
+
+les_pe:			push	offset les_base
+				jmp		i286x_selector
+
+src_register:	INT_NUM(6)
 		}
 }
 
@@ -3363,14 +3431,19 @@ I286 lds_r16_ea(void) {							// C5: lds
 				lea		ecx, [edi + ebp]
 				call	i286_memoryread_w
 				mov		I286_DS, ax
-				and		eax, 0000ffffh
+				movzx	eax, ax
+				test	byte ptr (I286_MSW), MSW_PE
+				jne		short lds_pe
 				shl		eax, 4					// make segreg
-				mov		DS_BASE, eax
+lds_base:		mov		DS_BASE, eax
 				mov		DS_FIX, eax
 				ret
-				align	16
-		src_register:
-				INT_NUM(6)
+
+lds_pe:			push	offset lds_base
+				jmp		i286x_selector
+
+src_register:	INT_NUM(6)
+
 		}
 }
 
@@ -3386,7 +3459,7 @@ I286 mov_ea8_data8(void) {						// C6: m
 				bt		bp, 2
 				rcl		ebp, 1
 				and		ebp, 7
-				GET_NEXTPRE2
+				GET_NEXTPRE3
 				mov		byte ptr I286_REG[ebp], dh
 				ret
 				align	16
@@ -3442,7 +3515,7 @@ I286 _enter(void) {								// C8: enter 
 				je		enter0
 				dec		eax
 				je		enter1
-				lea		ecx, [eax*4 + 12]
+				lea		ecx, [eax*4 + 12 + 4]
 				I286CLOCK(ecx)
 				push	ebx
 				movzx	ebx, I286_BP
@@ -3522,12 +3595,17 @@ I286 ret_far_data16(void) {						// CA: 
 				lea		ecx, [edi + ebp]
 				call	i286_memoryread_w
 				mov		I286_CS, ax
-				and		eax, 0000ffffh
+				movzx	eax, ax
+				test	byte ptr (I286_MSW), MSW_PE
+				jne		short ret_far16_pe
 				shl		eax, 4					// make segreg
-				mov		CS_BASE, eax
+ret_far16_base:	mov		CS_BASE, eax
 				add		I286_SP, 4
 				RESET_XPREFETCH
 				ret
+
+ret_far16_pe:	push	offset ret_far16_base
+				jmp		i286x_selector
 		}
 }
 
@@ -3545,13 +3623,18 @@ I286 ret_far(void) {							// CB: ret fa
 				add		bx, 2
 				call	i286_memoryread_w
 				mov		I286_CS, ax
-				and		eax, 0000ffffh
+				movzx	eax, ax
+				test	byte ptr (I286_MSW), MSW_PE
+				jne		short ret_far_pe
 				shl		eax, 4					// make segreg
-				mov		CS_BASE, eax
+ret_far_base:	mov		CS_BASE, eax
 				mov		ebp, eax
 				mov		I286_SP, bx
 				RESET_XPREFETCH
 				ret
+
+ret_far_pe:		push	offset ret_far_base
+				jmp		i286x_selector
 		}
 }
 
@@ -3580,6 +3663,13 @@ I286 int_data8(void) {							// CD: int 
 				lea		ecx, [edi + ebp]
 				mov		dx, I286_CS
 				call	i286_memorywrite_w
+#if defined(ENABLE_TRAP)
+				movzx	eax, bh
+				push	eax
+				lea		edx, [esi - 1]
+				movzx	ecx, I286_CS
+				call	softinttrap
+#endif
 				movzx	eax, bh
 				sub		bp, 2
 				mov		I286_SP, bp
@@ -3605,14 +3695,14 @@ I286 _into(void) {								// CE: into
 				GET_NEXTPRE1
 				ret
 
-		intovf:	INT_NUM(4)
+		intovf:	inc		si											// ver0.80
+				INT_NUM(4)
 		}
 }
 
 I286 _iret(void) {								// CF: iret
 
 		__asm {
-				call	extirq_pop
 				I286CLOCK(31)
 				mov		edi, SS_BASE
 				movzx	ebx, I286_SP
@@ -3642,14 +3732,12 @@ I286 _iret(void) {								// CF: iret
 				jne		irqcheck
 				test	I286_FLAG, I_FLAG
 				je		nextop
-				cmp		pic.ext_irq, 0
-				jne		nextop
-				mov		al, pic.pi[0].imr
-				mov		ah, pic.pi[1].imr
+				mov		al, pic.pi[0 * (type _PICITEM)].imr
+				mov		ah, pic.pi[1 * (type _PICITEM)].imr
 				not		ax
-				test	al, pic.pi[0].irr
+				test	al, pic.pi[0 * (type _PICITEM)].irr
 				jne		irqcheck
-				test	ah, pic.pi[1].irr
+				test	ah, pic.pi[1 * (type _PICITEM)].irr
 				jne		irqcheck
 nextop:			ret
 
@@ -4053,10 +4141,17 @@ I286 jmp_far(void) {							// EA: jmp fa
 				mov		si, bx
 				shr		ebx, 16
 				mov		I286_CS, bx
+				test	byte ptr (I286_MSW), MSW_PE
+				jne		short jmp_far_pe
 				shl		ebx, 4					// make segreg
 				mov		CS_BASE, ebx
-				RESET_XPREFETCH
+jmp_far_base:	RESET_XPREFETCH
 				ret
+
+jmp_far_pe:		mov		eax, ebx
+				call	i286x_selector
+				mov		CS_BASE, eax
+				jmp		short jmp_far_base
 		}
 }
 
@@ -4226,14 +4321,12 @@ I286 _sti(void) {								// FB: sti
 				setne	I286_TRAP
 
 				jne		nextopandexit			// fast_intr
-				cmp		pic.ext_irq, 0
-				jne		jmp_nextop
-				mov		al, pic.pi[0].imr
-				mov		ah, pic.pi[1].imr
+				mov		al, pic.pi[0 * (type _PICITEM)].imr
+				mov		ah, pic.pi[1 * (type _PICITEM)].imr
 				not		ax
-				test	al, pic.pi[0].irr
+				test	al, pic.pi[0 * (type _PICITEM)].irr
 				jne		nextopandexit
-				test	ah, pic.pi[1].irr
+				test	ah, pic.pi[1 * (type _PICITEM)].irr
 				jne		nextopandexit
 jmp_nextop:		jmp		i286op[ebp*4]
 
@@ -4291,7 +4384,7 @@ I286 _ope0xff(void) {							// FF: 
 
 // -------------------------------------------------------------------------
 
-void (*i286op[])(void) = {
+const I286TBL i286op[256] = {
 			add_ea_r8,						// 00:	add		EA, REG8
 			add_ea_r16,						// 01:	add		EA, REG16
 			add_r8_ea,						// 02:	add		REG8, EA
@@ -4615,7 +4708,7 @@ I286 repe_segprefix_ds(void) {
 		}
 }
 
-void (*i286op_repe[])(void) = {
+const I286TBL i286op_repe[256] = {
 			add_ea_r8,						// 00:	add		EA, REG8
 			add_ea_r16,						// 01:	add		EA, REG16
 			add_r8_ea,						// 02:	add		REG8, EA
@@ -4939,7 +5032,7 @@ I286 repne_segprefix_ds(void) {
 		}
 }
 
-void (*i286op_repne[])(void) = {
+const I286TBL i286op_repne[256] = {
 			add_ea_r8,						// 00:	add		EA, REG8
 			add_ea_r16,						// 01:	add		EA, REG16
 			add_r8_ea,						// 02:	add		REG8, EA