--- np2/i286a/i286a_fe.s	2003/12/19 00:25:49	1.6
+++ np2/i286a/i286a_fe.s	2003/12/22 10:24:50	1.8
@@ -17,7 +17,7 @@
 
 	AREA	.text, CODE, READONLY
 
-i286aopfe		GETPC8
+i286aopfe		GETPCF8
 				tst		r0, #(1 << 3)
 				bne		decea8
 incea8			OP_EA8	INC8, #2, #7
@@ -26,7 +26,7 @@ decea8			OP_EA8	DEC8, #2, #7
 
 ; ----
 
-i286aopff		GETPC8
+i286aopff		GETPCF8
 				and		r12, r0, #(7 << 3)
 				adr		r1, opefftbl
 				ldr		pc, [r1, r12 lsr #1]
@@ -160,21 +160,21 @@ push16e			ldrh	r2, [r9, #CPU_SP]
 popea16			CPUWORK	#5
 				ldrh	r2, [r9, #CPU_SP]
 				ldr		r3, [r9, #CPU_SS_BASE]
-				mov		r6, r0
+				mov		r4, r0
 				add		r0, r2, r3
 				add		r2, r2, #2
 				bic		r2, r2, #&10000
 				strh	r2, [r9, #CPU_SP]
 				bl		i286a_memoryread_w
-				cmp		r6, #&c0
+				cmp		r4, #&c0
 				bcc		pop16m
-				R16SRC	r6, r1
+				R16SRC	r4, r1
 				strh	r0, [r1, #CPU_REG]
 				mov		pc, r11
-pop16m			mov		r5, r0
-				mov		r0, r6
+pop16m			mov		r6, r0
+				mov		r0, r4
 				bl		i286a_ea
-				mov		r1, r5
+				mov		r1, r6
 				mov		lr, r11
 				b		i286a_memoryread_w