--- np2/i286x/i286x.cpp	2004/01/29 09:41:50	1.19
+++ np2/i286x/i286x.cpp	2004/08/03 10:11:37	1.22
@@ -343,7 +343,7 @@ LABEL void removeprefix(void) {
 I286 _reserved(void) {
 
 		__asm {
-				inc		si						// 01/08/31
+//				inc		si						// 01/08/31
 				INT_NUM(6)
 		}
 }
@@ -448,7 +448,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
@@ -661,7 +661,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
@@ -790,7 +790,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
@@ -1695,7 +1695,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)
@@ -2498,7 +2498,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
@@ -2714,10 +2714,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
 		}
 }
 
@@ -2867,10 +2874,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
@@ -2887,10 +2892,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
@@ -2907,10 +2910,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
@@ -2930,10 +2931,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
@@ -2972,10 +2971,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
@@ -2988,10 +2985,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
@@ -3034,10 +3029,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
@@ -3052,10 +3045,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
@@ -3379,13 +3370,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)
 		}
 }
 
@@ -3408,14 +3403,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)
+
 		}
 }
 
@@ -3567,12 +3567,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
 		}
 }
 
@@ -3590,13 +3595,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
 		}
 }
 
@@ -3650,7 +3660,8 @@ I286 _into(void) {								// CE: into
 				GET_NEXTPRE1
 				ret
 
-		intovf:	INT_NUM(4)
+		intovf:	inc		si											// ver0.80
+				INT_NUM(4)
 		}
 }
 
@@ -4095,10 +4106,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
 		}
 }
 
@@ -4331,7 +4349,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
@@ -4655,7 +4673,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
@@ -4979,7 +4997,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