--- np2/i286a/i286a_sf.s	2003/12/21 23:27:08	1.6
+++ np2/i286a/i286a_sf.s	2004/07/17 20:43:02	1.8
@@ -125,10 +125,7 @@ i286asft16_1	GETPCF8
 				ldr		pc, [r1, r6 lsr #1]
 sft16m			CPUWORK	#7
 				bl		i286a_ea
-				tst		r0, #1
-				bne		sft16e
-				cmp		r0, #I286_MEMWRITEMAX
-				bcs		sft16e
+				ACCWORD	r0, sft16e
 				add		r5, r9, r0
 				adr		r1, sft_reg16
 				ldrh	r4, [r5]
@@ -363,10 +360,7 @@ i286asft16_cl	GETPCF8
 				ldr		pc, [r1, r6 lsr #1]
 sft16clm		CPUWORK	#8
 				bl		i286a_ea
-				tst		r0, #1
-				bne		sft16cle
-				cmp		r0, #I286_MEMWRITEMAX
-				bcs		sft16cle
+				ACCWORD	r0, sft16cle
 				add		r5, r9, r0
 				ldrb	r0, [r9, #CPU_CL]
 				ands	r0, r0, #&1f
@@ -400,10 +394,7 @@ i286asft16_d8	GETPCF8
 				ldr		pc, [r1, r6 lsr #1]
 sft16d8m		CPUWORK	#8
 				bl		i286a_ea
-				tst		r0, #1
-				bne		sft16d8e
-				cmp		r0, #I286_MEMWRITEMAX
-				bcs		sft16d8e
+				ACCWORD	r0, sft16d8e
 				add		r5, r9, r0
 				GETPC8
 				ands	r0, r0, #&1f