--- np2/i286a/i286a_sf.s	2003/12/19 00:25:49	1.5
+++ np2/i286a/i286a_sf.s	2003/12/22 10:24:50	1.7
@@ -18,7 +18,7 @@
 
 	AREA	.text, CODE, READONLY
 
-i286asft8_1		GETPC8
+i286asft8_1		GETPCF8
 				and		r6, r0, #(7 << 3)
 				cmp		r0, #&c0
 				bcc		sft8m
@@ -113,7 +113,7 @@ sar_e8_1		SAR8	r0
 
 ; ----
 
-i286asft16_1	GETPC8
+i286asft16_1	GETPCF8
 				and		r6, r0, #(7 << 3)
 				cmp		r0, #&c0
 				bcc		sft16m
@@ -125,10 +125,7 @@ i286asft16_1	GETPC8
 				ldr		pc, [r1, r6 lsr #1]
 sft16m			CPUWORK	#7
 				bl		i286a_ea
-				tst		r0, #1
-				bne		sft16e
-				cmp		r0, #I286_MEMWRITEMAX
-				bcs		sft16e
+				WORDACC	r0, sft16e
 				add		r5, r9, r0
 				adr		r1, sft_reg16
 				ldrh	r4, [r5]
@@ -210,7 +207,7 @@ sar_e16_1		SAR16	r0
 
 ; ----
 
-i286asft8_cl	GETPC8
+i286asft8_cl	GETPCF8
 				and		r6, r0, #(7 << 3)
 				cmp		r0, #&c0
 				bcc		sft8clm
@@ -242,7 +239,7 @@ sft8cle			ldrb	r4, [r9, #CPU_CL]
 				adr		r1, sft_ext8cl
 				ldr		pc, [r1, r6 lsr #1]
 
-i286asft8_d8	GETPC8
+i286asft8_d8	GETPCF8
 				and		r6, r0, #(7 << 3)
 				cmp		r0, #&c0
 				bcc		sft8d8m
@@ -347,7 +344,7 @@ sar_e8_cl		SAR8CL	r0, r4
 
 ; ----
 
-i286asft16_cl	GETPC8
+i286asft16_cl	GETPCF8
 				and		r6, r0, #(7 << 3)
 				cmp		r0, #&c0
 				bcc		sft16clm
@@ -363,10 +360,7 @@ i286asft16_cl	GETPC8
 				ldr		pc, [r1, r6 lsr #1]
 sft16clm		CPUWORK	#8
 				bl		i286a_ea
-				tst		r0, #1
-				bne		sft16cle
-				cmp		r0, #I286_MEMWRITEMAX
-				bcs		sft16cle
+				WORDACC	r0, sft16cle
 				add		r5, r9, r0
 				ldrb	r0, [r9, #CPU_CL]
 				ands	r0, r0, #&1f
@@ -384,7 +378,7 @@ sft16cle		ldrb	r4, [r9, #CPU_CL]
 				adr		r1, sft_ext16cl
 				ldr		pc, [r1, r6 lsr #1]
 
-i286asft16_d8	GETPC8
+i286asft16_d8	GETPCF8
 				and		r6, r0, #(7 << 3)
 				cmp		r0, #&c0
 				bcc		sft16d8m
@@ -400,10 +394,7 @@ i286asft16_d8	GETPC8
 				ldr		pc, [r1, r6 lsr #1]
 sft16d8m		CPUWORK	#8
 				bl		i286a_ea
-				tst		r0, #1
-				bne		sft16d8e
-				cmp		r0, #I286_MEMWRITEMAX
-				bcs		sft16d8e
+				WORDACC	r0, sft16d8e
 				add		r5, r9, r0
 				GETPC8
 				ands	r0, r0, #&1f