--- np2/i286a/i286a_mn.s	2004/02/21 20:48:52	1.24
+++ np2/i286a/i286a_mn.s	2005/03/16 03:53:45	1.27
@@ -24,7 +24,7 @@
 	IMPORT		iocore_out8
 	IMPORT		iocore_out16
 
-	IMPORT		dmap_i286
+	IMPORT		dmax86
 	IMPORT		biosfunc
 
 	IMPORT		i286a_cts
@@ -134,8 +134,8 @@ xor_ax_d16		OP_AX_D16	XOR16, #3
 ; segprefix_ss		!
 ; aaa			*
 
-cmp_ea_r8		S_EA_R8		SUB8, #2, #7
-cmp_ea_r16		S_EA_R16	SUB16, #2, #7
+cmp_ea_r8		S_EA_R8		SUB8, #2, #6
+cmp_ea_r16		S_EA_R16	SUB16, #2, #6
 cmp_r8_ea		S_R8_EA		SUB8, #2, #6
 cmp_r16_ea		S_R16_EA	SUB16, #2, #6
 cmp_al_d8		S_AL_D8		SUB8, #3
@@ -190,18 +190,18 @@ pop_di			REGPOP		#CPU_DI, #5
 ; outsb			*
 ; outsw			*
 
-jo_short		JMPNE		#O_FLAG, #2, #7
-jno_short		JMPEQ		#O_FLAG, #2, #7
-jc_short		JMPNE		#C_FLAG, #2, #7
-jnc_short		JMPEQ		#C_FLAG, #2, #7
-jz_short		JMPNE		#Z_FLAG, #2, #7
-jnz_short		JMPEQ		#Z_FLAG, #2, #7
-jna_short		JMPNE		#(Z_FLAG + C_FLAG), #2, #7
-ja_short		JMPEQ		#(Z_FLAG + C_FLAG), #2, #7
-js_short		JMPNE		#S_FLAG, #2, #7
-jns_short		JMPEQ		#S_FLAG, #2, #7
-jp_short		JMPNE		#P_FLAG, #2, #7
-jnp_short		JMPEQ		#P_FLAG, #2, #7
+jo_short		JMPNE		#O_FLAG, #3, #7
+jno_short		JMPEQ		#O_FLAG, #3, #7
+jc_short		JMPNE		#C_FLAG, #3, #7
+jnc_short		JMPEQ		#C_FLAG, #3, #7
+jz_short		JMPNE		#Z_FLAG, #3, #7
+jnz_short		JMPEQ		#Z_FLAG, #3, #7
+jna_short		JMPNE		#(Z_FLAG + C_FLAG), #3, #7
+ja_short		JMPEQ		#(Z_FLAG + C_FLAG), #3, #7
+js_short		JMPNE		#S_FLAG, #3, #7
+jns_short		JMPEQ		#S_FLAG, #3, #7
+jp_short		JMPNE		#P_FLAG, #3, #7
+jnp_short		JMPEQ		#P_FLAG, #3, #7
 ; jl_short		+
 ; jnl_short		+
 ; jle_short		+
@@ -650,7 +650,7 @@ jle_short		tst		r8, #Z_FLAG
 jl_short		eor		r0, r8, r8 lsr #4
 				tst		r0, #S_FLAG
 				bne		jmps
-nojmps			CPUWORK	#2
+nojmps			CPUWORK	#3
 				add		r8, r8, #(1 << 16)
 				mov		pc, r11
 
@@ -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
@@ -1301,7 +1301,7 @@ enterlv1		cmp		r0, #1
 				strh	r2, [r9, #CPU_SP]
 				bl		i286a_memorywrite_w
 enterlv2		mov		r1, r0, lsl #2
-				add		r1, r1, #12
+				add		r1, r1, #(12 + 4)
 				CPUWORK	r1
 				strh	r4, [r9, #CPU_BP]
 				str		r11, [sp, #-4]!
@@ -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