--- np2/i286a/i286a_mn.s	2004/02/21 20:48:52	1.24
+++ np2/i286a/i286a_mn.s	2005/02/08 10:34:30	1.26
@@ -24,7 +24,7 @@
 	IMPORT		iocore_out8
 	IMPORT		iocore_out16
 
-	IMPORT		dmap_i286
+	IMPORT		dmax86
 	IMPORT		biosfunc
 
 	IMPORT		i286a_cts
@@ -701,7 +701,7 @@ xchg_ea_r16		EAREG16	r6
 				strh	r1, [r6, #CPU_REG]
 				mov		pc, r11
 xchgear16_1		bl		i286a_ea
-				WORDACC	r0, xchgear16_2
+				ACCWORD	r0, xchgear16_2
 				ldrh	r1, [r6, #CPU_REG]
 				ldrh	r4, [r9, r0]
 				CPUWORK	#5
@@ -1735,7 +1735,7 @@ i286a_step		stmdb	sp!, {r4 - r11, lr}
 				mov		r11, pc
 				mov		pc, r1
 
-				bl		dmap_i286
+				bl		dmax86
 				CPUSV
 				ldmia	sp!, {r4 - r11, pc}
 
@@ -1777,7 +1777,7 @@ i286awithdma	adr		r4, optbl1
 				add		r8, r8, #(1 << 16)
 				mov		r11, pc
 				mov		pc, r1
-				bl		dmap_i286
+				bl		dmax86
 				CPUDBGL
 				cmp		r7, #0
 				ldrgt	r5, [r9, #CPU_CS_BASE]
@@ -1792,7 +1792,7 @@ i286awithtrap	adr		r4, optbl1
 				add		r8, r8, #(1 << 16)
 				mov		r11, pc
 				mov		pc, r1
-				bl		dmap_i286
+				bl		dmax86
 				and		r0, r8, #(I_FLAG + T_FLAG)
 				cmp		r0, #(I_FLAG + T_FLAG)
 				bleq	i286a_trapint