--- np2/i286a/i286aop.inc	2003/12/18 23:07:49	1.6
+++ np2/i286a/i286aop.inc	2003/12/21 23:27:08	1.8
@@ -20,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
@@ -50,35 +50,35 @@ $label.1	CPUWORK	$memclk
 			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]
+$label		REG8EA	r6, $regclk, $memclk
+			ldrb	r2, [r6, #CPU_REG]
 			$alu	r2, r0
-			strb	r1, [r5, #CPU_REG]
+			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]
+$label		REG16EA	r6, $regclk, $memclk
+			ldrh	r2, [r6, #CPU_REG]
 			$alu	r2, r0
-			strh	r1, [r5, #CPU_REG]
+			strh	r1, [r6, #CPU_REG]
 			mov		pc, r11
 	MEND
 
 	MACRO
 $label	OP_AL_D8	$alu, $clk
 $label		CPUWORK	$clk
-			GETPC8
+			GETPCF8
 			ldrb	r2, [r9, #CPU_AL]
 			$alu	r2, r0
 			strb	r1, [r9, #CPU_AL]
@@ -114,7 +114,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
@@ -139,7 +139,7 @@ $label.1	CPUWORK	$memclk
 			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
@@ -154,8 +154,8 @@ $label		REG8EA	r5, $regclk, $memclk
 
 	MACRO
 $label	S_R16_EA	$alu, $regclk, $memclk
-$label		REG16EA	r5, $regclk, $memclk
-			ldrh	r2, [r5, #CPU_REG]
+$label		REG16EA	r6, $regclk, $memclk
+			ldrh	r2, [r6, #CPU_REG]
 			$alu	r2, r0
 			mov		pc, r11
 	MEND
@@ -198,11 +198,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
 			mov		r0, r5
 			mov		lr, r11
-			b		i286_memorywrite
+			b		i286a_memorywrite
 	MEND
 
 	MACRO
@@ -226,11 +226,11 @@ $label.1	CPUWORK	$memclk
 			strh	r1, [r9, r0]
 			mov		pc, r11
 $label.2	mov		r5, r0
-			bl		i286_memoryread_w
+			bl		i286a_memoryread_w
 			$alu	r0
 			mov		r0, r5
 			mov		lr, r11
-			b		i286_memorywrite_w
+			b		i286a_memorywrite_w
 	MEND
 
 
@@ -290,7 +290,7 @@ $label		CPUWORK	$clk
 			strh	r0, [r9, #CPU_SP]
 			add		r0, r2, r3 lsr #16
 			mov		lr, r11
-			b		i286_memorywrite_w
+			b		i286a_memorywrite_w
 	MEND
 
 	MACRO
@@ -299,7 +299,7 @@ $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
@@ -327,12 +327,12 @@ $label		POP		$clk
 	MACRO
 $label	JMPS		$jmpclk
 $label		CPUWORK	$jmpclk
-			ldr		r0, [r9, #CPU_CS_BASE]
-			add		r0, r0, r8 lsr #16
-			bl		i286_memoryread
-			mov		r1, r0, lsl #24
+		;;	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
+			mov		r0, r1 asr #8
 			add		r8, r0, r8
 			mov		pc, r11
 	MEND