--- np2/i286a/i286a_f6.s	2003/12/19 00:25:49	1.3
+++ np2/i286a/i286a_f6.s	2003/12/21 23:27:08	1.6
@@ -19,7 +19,7 @@
 
 	AREA	.text, CODE, READONLY
 
-i286aopf6		GETPC8
+i286aopf6		GETPCF8
 				and		r12, r0, #(7 << 3)
 				adr		r1, opef6tbl
 				ldr		pc, [r1, r12 lsr #1]
@@ -147,7 +147,7 @@ idiv8e_div		dcd		__imp___rt_sdiv
 
 ; ----
 
-i286aopf7		GETPC8
+i286aopf7		GETPCF8
 				and		r12, r0, #(7 << 3)
 				adr		r1, opef7tbl
 				ldr		pc, [r1, r12 lsr #1]
@@ -166,7 +166,7 @@ test_ea_d16		cmp		r0, #&c0
 				R16SRC	r0, r5
 				ldrh	r4, [r5, #CPU_REG]
 				GETPC16
-				AND8	r4, r0
+				AND16	r4, r0
 				mov		pc, r11
 test16m			CPUWORK	#6
 				bl		i286a_ea
@@ -217,7 +217,7 @@ imul_ea16		cmp		r0, #&c0
 				IMUL16	r0, r4
 				mov		r0, r1 lsr #16
 				strh	r1, [r9, #CPU_AX]
-				strh	r0, [r9, #CPU_AX]
+				strh	r0, [r9, #CPU_DX]
 				mov		pc, r11
 imul16m			CPUWORK	#24
 				bl		i286a_ea