--- np2/i286a/i286aop.inc	2003/12/16 04:58:00	1.1
+++ np2/i286a/i286aop.inc	2004/07/17 20:43:02	1.12
@@ -1,13 +1,12 @@
 
-
 	MACRO
 $label	OP_EA_R8	$alu, $regclk, $memclk
 $label		EAREG8	r12
 			ldrb	r6, [r12, #CPU_REG]
 			cmp		r0, #&c0
 			bcc		$label.1
-			CPUWORK	$regclk
 			R8SRC	r0, r5
+			CPUWORK	$regclk
 			ldrb	r4, [r5, #CPU_REG]
 			$alu	r4, r6
 			strb	r1, [r5, #CPU_REG]
@@ -21,11 +20,11 @@ $label.1	CPUWORK	$memclk
 			strb	r1, [r9, r0]
 			mov		pc, r11
 $label.2	mov		r5, r0
-			bl		i286_memoryread
+			bl		i286a_memoryread
 			$alu	r0, r6
 			mov		r0, r5
 			mov		lr, r11
-			b		i286_memorywrite
+			b		i286a_memorywrite
 	MEND
 
 	MACRO
@@ -35,53 +34,50 @@ $label		EAREG16	r12
 			cmp		r0, #&c0
 			bcc		$label.1
 			CPUWORK	$regclk
-			R8SRC	r0, r5
+			R16SRC	r0, r5
 			ldrh	r4, [r5, #CPU_REG]
 			$alu	r4, r6
 			strh	r1, [r5, #CPU_REG]
 			mov		pc, r11
 $label.1	CPUWORK	$memclk
 			bl		i286a_ea
-			tst		r0, #1
-			bne		$label.2
-			cmp		r0, #I286_MEMWRITEMAX
-			bcs		$label.2
+			ACCWORD	r0, $label.2
 			ldrh	r4, [r9, r0]
 			$alu	r4, r6
 			strh	r1, [r9, r0]
 			mov		pc, r11
 $label.2	mov		r5, r0
-			bl		i286_memoryread_w
+			bl		i286a_memoryread_w
 			$alu	r0, r6
 			mov		r0, r5
 			mov		lr, r11
-			b		i286_memorywrite_w
+			b		i286a_memorywrite_w
 	MEND
 
 	MACRO
 $label	OP_R8_EA	$alu, $regclk, $memclk
-$label		REG8EA	r5, $regclk, $memclk
-			ldrb	r2, [r5, #CPU_REG]
-			$alu	r2, r0
-			strb	r1, [r5, #CPU_REG]
+$label		REG8EA	r6, $regclk, $memclk
+			ldrb	r4, [r6, #CPU_REG]
+			$alu	r4, r0
+			strb	r1, [r6, #CPU_REG]
 			mov		pc, r11
 	MEND
 
 	MACRO
 $label	OP_R16_EA	$alu, $regclk, $memclk
-$label		REG16EA	r5, $regclk, $memclk
-			ldrh	r2, [r5, #CPU_REG]
-			$alu	r2, r0
-			strh	r1, [r5, #CPU_REG]
+$label		REG16EA	r6, $regclk, $memclk
+			ldrh	r4, [r6, #CPU_REG]
+			$alu	r4, r0
+			strh	r1, [r6, #CPU_REG]
 			mov		pc, r11
 	MEND
 
 	MACRO
 $label	OP_AL_D8	$alu, $clk
 $label		CPUWORK	$clk
-			GETPC8
-			ldrb	r2, [r9, #CPU_AL]
-			$alu	r2, r0
+			GETPCF8
+			ldrb	r4, [r9, #CPU_AL]
+			$alu	r4, r0
 			strb	r1, [r9, #CPU_AL]
 			mov		pc, r11
 	MEND
@@ -90,8 +86,8 @@ $label		CPUWORK	$clk
 $label	OP_AX_D16	$alu, $clk
 $label		CPUWORK	$clk
 			GETPC16
-			ldrh	r2, [r9, #CPU_AX]
-			$alu	r2, r0
+			ldrh	r4, [r9, #CPU_AX]
+			$alu	r4, r0
 			strh	r1, [r9, #CPU_AX]
 			mov		pc, r11
 	MEND
@@ -115,7 +111,7 @@ $label.1	CPUWORK	$memclk
 			ldrb	r4, [r9, r0]
 			$alu	r4, r6
 			mov		pc, r11
-$label.2	bl		i286_memoryread
+$label.2	bl		i286a_memoryread
 			$alu	r0, r6
 			mov		pc, r11
 	MEND
@@ -127,37 +123,34 @@ $label		EAREG16	r12
 			cmp		r0, #&c0
 			bcc		$label.1
 			CPUWORK	$regclk
-			R8SRC	r0, r5
+			R16SRC	r0, r5
 			ldrh	r4, [r5, #CPU_REG]
 			$alu	r4, r6
 			mov		pc, r11
 $label.1	CPUWORK	$memclk
 			bl		i286a_ea
-			tst		r0, #1
-			bne		$label.2
-			cmp		r0, #I286_MEMWRITEMAX
-			bcs		$label.2
+			ACCWORD	r0, $label.2
 			ldrh	r4, [r9, r0]
 			$alu	r4, r6
 			mov		pc, r11
-$label.2	bl		i286_memoryread_w
+$label.2	bl		i286a_memoryread_w
 			$alu	r0, r6
 			mov		pc, r11
 	MEND
 
 	MACRO
 $label	S_R8_EA		$alu, $regclk, $memclk
-$label		REG8EA	r5, $regclk, $memclk
-			ldrb	r2, [r5, #CPU_REG]
-			$alu	r2, r0
+$label		REG8EA	r6, $regclk, $memclk
+			ldrb	r4, [r6, #CPU_REG]
+			$alu	r4, r0
 			mov		pc, r11
 	MEND
 
 	MACRO
 $label	S_R16_EA	$alu, $regclk, $memclk
-$label		REG16EA	r5, $regclk, $memclk
-			ldrh	r2, [r5, #CPU_REG]
-			$alu	r2, r0
+$label		REG16EA	r6, $regclk, $memclk
+			ldrh	r4, [r6, #CPU_REG]
+			$alu	r4, r0
 			mov		pc, r11
 	MEND
 
@@ -165,8 +158,8 @@ $label		REG16EA	r5, $regclk, $memclk
 $label	S_AL_D8		$alu, $clk
 $label		CPUWORK	$clk
 			GETPC8
-			ldrb	r2, [r9, #CPU_AL]
-			$alu	r2, r0
+			ldrb	r4, [r9, #CPU_AL]
+			$alu	r4, r0
 			mov		pc, r11
 	MEND
 
@@ -174,9 +167,61 @@ $label		CPUWORK	$clk
 $label	S_AX_D16	$alu, $clk
 $label		CPUWORK	$clk
 			GETPC16
-			ldrh	r2, [r9, #CPU_AX]
-			$alu	r2, r0
+			ldrh	r4, [r9, #CPU_AX]
+			$alu	r4, r0
+			mov		pc, r11
+	MEND
+
+
+	MACRO
+$label	OP_EA8		$alu, $regclk, $memclk
+$label		cmp		r0, #&c0
+			bcc		$label.1
+			CPUWORK	$regclk
+			R8SRC	r0, r5
+			ldrb	r4, [r5, #CPU_REG]
+			$alu	r4
+			strb	r1, [r5, #CPU_REG]
+			mov		pc, r11
+$label.1	CPUWORK	$memclk
+			bl		i286a_ea
+			cmp		r0, #I286_MEMWRITEMAX
+			bcs		$label.2
+			ldrb	r4, [r9, r0]
+			$alu	r4
+			strb	r1, [r9, r0]
+			mov		pc, r11
+$label.2	mov		r5, r0
+			bl		i286a_memoryread
+			$alu	r0
+			mov		r0, r5
+			mov		lr, r11
+			b		i286a_memorywrite
+	MEND
+
+	MACRO
+$label	OP_EA16		$alu, $regclk, $memclk
+$label		cmp		r0, #&c0
+			bcc		$label.1
+			CPUWORK	$regclk
+			R16SRC	r0, r5
+			ldrh	r4, [r5, #CPU_REG]
+			$alu	r4
+			strh	r1, [r5, #CPU_REG]
 			mov		pc, r11
+$label.1	CPUWORK	$memclk
+			bl		i286a_ea
+			ACCWORD	r0, $label.2
+			ldrh	r4, [r9, r0]
+			$alu	r4
+			strh	r1, [r9, r0]
+			mov		pc, r11
+$label.2	mov		r5, r0
+			bl		i286a_memoryread_w
+			$alu	r0
+			mov		r0, r5
+			mov		lr, r11
+			b		i286a_memorywrite_w
 	MEND
 
 
@@ -200,9 +245,9 @@ $label		CPUWORK	$clk
 
 	MACRO
 $label	XCHG_AX		$r, $clk
-$label		CPUWORK	$clk
-			ldrh	r0, [r9, #CPU_AX]
+$label		ldrh	r0, [r9, #CPU_AX]
 			ldrh	r1, [r9, $r]
+			CPUWORK	$clk
 			strh	r0, [r9, $r]
 			strh	r1, [r9, #CPU_AX]
 			mov		pc, r11
@@ -211,16 +256,16 @@ $label		CPUWORK	$clk
 
 	MACRO
 $label	MOVIMM8		$r, $clk
-$label		CPUWORK	$clk
-			GETPC8
+$label		GETPCF8
+			CPUWORK	$clk
 			strb	r0, [r9, $r]
 			mov		pc, r11
 	MEND
 
 	MACRO
 $label	MOVIMM16	$r, $clk
-$label		CPUWORK	$clk
-			GETPC16
+$label		GETPCF16
+			CPUWORK	$clk
 			strh	r0, [r9, $r]
 			mov		pc, r11
 	MEND
@@ -228,15 +273,15 @@ $label		CPUWORK	$clk
 
 	MACRO
 $label	SP_PUSH		$clk
-$label		CPUWORK	$clk
-			ldrh	r1, [r9, #CPU_SP]
+$label		ldrh	r1, [r9, #CPU_SP]
 			ldr		r2, [r9, #CPU_SS_BASE]
+			CPUWORK	$clk
 			sub		r0, r1, #2
 			mov		r3, r0 lsl #16
 			strh	r0, [r9, #CPU_SP]
 			add		r0, r2, r3 lsr #16
 			mov		lr, r11
-			b		i286_memorywrite_w
+			b		i286a_memorywrite_w
 	MEND
 
 	MACRO
@@ -245,30 +290,69 @@ $label		CPUWORK	$clk
 			ldrh	r0, [r9, #CPU_SP]
 			ldr		r1, [r9, #CPU_SS_BASE]
 			add		r0, r1, r0
-			bl		i286_memoryread_w
+			bl		i286a_memoryread_w
 			strh	r0, [r9, #CPU_SP]
 			mov		pc, r11
 	MEND
 
 	MACRO
 $label	SEGPOP		$s, $b, $clk
-$label		POP		$clk
-			mov		r1, r0 lsl #4
+$label		ldrh	r6, [r9, #CPU_MSW]
+			POP		$clk
 			strh	r0, [r9, $s]
-			str		r1, [r9, $b]
+			tst		r6, #MSW_PE
+			moveq	r0, r0 lsl #4
+			blne	i286a_selector
+			str		r0, [r9, $b]
 			mov		pc, r11
 	MEND
 
 	MACRO
 $label	SEGPOPFIX	$s, $b, $f, $clk
-$label		POP		$clk
-			mov		r1, r0 lsl #4
+$label		ldrh	r6, [r9, #CPU_MSW]
+			POP		$clk
 			strh	r0, [r9, $s]
-			str		r1, [r9, $b]
-			str		r1, [r9, $f]
+			tst		r6, #MSW_PE
+			moveq	r0, r0 lsl #4
+			blne	i286a_selector
+			str		r0, [r9, $b]
+			str		r0, [r9, $f]
+			mov		pc, r11
+	MEND
+
+
+	MACRO
+$label	JMPS		$jmpclk
+$label		CPUWORK	$jmpclk
+		;;	ldr		r5, [r9, #CPU_CS_BASE]
+			add		r0, r5, r8 lsr #16
+			GETR0
+			mov		r1, r0 lsl #24
+			add		r8, r8, #(1 << 16)
+			mov		r0, r1 asr #8
+			add		r8, r0, r8
+			mov		pc, r11
+	MEND
+
+	MACRO
+$label	JMPNE		$f, $nojclk, $jmpclk
+$label		tst		r8, $f
+			bne		$label.1
+			CPUWORK	$nojclk
+			add		r8, r8, #(1 << 16)
 			mov		pc, r11
+$label.1	JMPS	$jmpclk
 	MEND
 
+	MACRO
+$label	JMPEQ		$f, $nojclk, $jmpclk
+$label		tst		r8, $f
+			beq		$label.1
+			CPUWORK	$nojclk
+			add		r8, r8, #(1 << 16)
+			mov		pc, r11
+$label.1	JMPS	$jmpclk
+	MEND
 
 
 	END