--- np2/i286a/i286a_mn.s	2003/12/19 09:38:25	1.12
+++ np2/i286a/i286a_mn.s	2003/12/20 10:27:55	1.14
@@ -27,10 +27,6 @@
 	IMPORT		dmap_i286
 	IMPORT		biosfunc
 
-	IMPORT		dmac
-	IMPORT		pic
-	IMPORT		extirq_pop
-
 	IMPORT		i286a_cts
 
 	IMPORT		i286aop80
@@ -1674,8 +1670,7 @@ i286a_step		stmdb	sp!, {r4 - r11, lr}
 				ldr		r10, ias_r10
 				;
 				ldr		r5, [r9, #CPU_CS_BASE]
-		;		ldr		r7, [r9, #CPU_REMAINCLOCK]
-				ldr		r8, [r9, #CPU_FLAG]
+				CPULD
 
 				adr		r4, optbl1
 				add		r0, r5, r8 lsr #16
@@ -1686,7 +1681,7 @@ i286a_step		stmdb	sp!, {r4 - r11, lr}
 				mov		pc, r1
 
 				bl		dmap_i286
-				str		r8, [r9, #CPU_FLAG]
+				CPUSV
 				ldmia	sp!, {r4 - r11, pc}
 
 
@@ -1694,7 +1689,7 @@ i286a			stmdb	sp!, {r4 - r11, lr}
 				ldr		r9, ias_r9
 				ldr		r2, ias_r1
 				ldr		r10, ias_r10
-				ldr		r8, [r9, #CPU_FLAG]
+				CPULD
 				ldr		r5, [r9, #CPU_CS_BASE]
 				ldr		r1, [r2, #DMAC_WORKING]
 				and		r0, r8, #(I_FLAG + T_FLAG)
@@ -1714,7 +1709,7 @@ i286a_lp		add		r0, r5, r8 lsr #16
 				adr		r4, optbl1
 				cmp		r7, #0
 				bgt		i286a_lp
-				str		r8, [r9, #CPU_FLAG]
+				CPUSV
 				ldmia	sp!, {r4 - r11, pc}
 
 ias_r9			dcd		i286core + CPU_SIZE
@@ -1734,7 +1729,7 @@ i286awdma_lp	add		r0, r5, r8 lsr #16
 				adr		r4, optbl1
 				cmp		r7, #0
 				bgt		i286awdma_lp
-				str		r8, [r9, #CPU_FLAG]
+				CPUSV
 				ldmia	sp!, {r4 - r11, pc}
 
 i286awithtrap	adr		r4, optbl1
@@ -1748,7 +1743,7 @@ i286awtrp_lp	add		r0, r5, r8 lsr #16
 				and		r0, r8, #(I_FLAG + T_FLAG)
 				cmp		r0, #(I_FLAG + T_FLAG)
 				beq		i286a_trapint
-i286a_trapintr	str		r8, [r9, #CPU_FLAG]
+i286a_trapintr	CPUSV
 				ldmia	sp!, {r4 - r11, pc}
 
 optbl1			dcd		add_ea_r8			; 00