np2/i286a/i286a_mn.s - diff

Return to i286a_mn.s CVS log

Up to [RetroPC.NET] / np2 / i286a

Diff for /np2/i286a/i286a_mn.s between versions 1.10 and 1.18

version 1.10, 2003/12/19 00:25:49	version 1.18, 2003/12/22 12:28:05
Line 5	Line 5
INCLUDE i286aop.inc	INCLUDE i286aop.inc
INCLUDE i286aio.inc	INCLUDE i286aio.inc

IMPORT i286core	IMPORT i286acore
IMPORT _szpcflag8	IMPORT iflags
IMPORT i286a_localint	IMPORT i286a_localint
IMPORT i286a_trapint	IMPORT i286a_trapint
EXPORT i286a_trapintr	EXPORT i286a_trapintr
Line 27	Line 27
IMPORT dmap_i286	IMPORT dmap_i286
IMPORT biosfunc	IMPORT biosfunc

IMPORT dmac
IMPORT pic
IMPORT extirq_pop

IMPORT i286a_cts	IMPORT i286a_cts

IMPORT i286aop80	IMPORT i286aop80
Line 469 pusha ldrh r4, [r9, #CPU_SP]	Line 465 pusha ldrh r4, [r9, #CPU_SP]
strh r0, [r9, #CPU_SP]	strh r0, [r9, #CPU_SP]
mov pc, r11	mov pc, r11

popa ldrh r4, [r9, #CPU_SP]	popa ldrh r1, [r9, #CPU_SP]
ldr r5, [r9, #CPU_SS_BASE]	ldr r5, [r9, #CPU_SS_BASE]
CPUWORK #19	CPUWORK #19
add r0, r5, r4	mov r4, r1 lsl #16
mov r4, r4 lsl #16	add r0, r5, r1
bl i286a_memoryread_w	bl i286a_memoryread_w
add r4, r4, #(2 << 16)	add r4, r4, #(2 << 16)
strh r0, [r9, #CPU_DI]	strh r0, [r9, #CPU_DI]
Line 505 popa ldrh r4, [r9, #CPU_SP]	Line 501 popa ldrh r4, [r9, #CPU_SP]
strh r0, [r9, #CPU_SP]	strh r0, [r9, #CPU_SP]
mov pc, r11	mov pc, r11

bound GETPC8	bound GETPCF8
cmp r0, #&c0	cmp r0, #&c0
bcs bndreg	bcs bndreg
CPUWORK #13
R16DST r0, r12	R16DST r0, r12
	CPUWORK #13
ldrh r5, [r12, #CPU_REG]	ldrh r5, [r12, #CPU_REG]
bl i286a_a	bl i286a_a
add r4, r0, #2	add r4, r0, #2
Line 540 push_d16 CPUWORK #3	Line 536 push_d16 CPUWORK #3
mov lr, r11	mov lr, r11
b i286a_memorywrite_w	b i286a_memorywrite_w

imul_r_ea_d16 REG16EA r5, #21, #24	imul_r_ea_d16 REG16EA r6, #21, #24
mov r4, r0, lsl #16	mov r4, r0, lsl #16
GETPC16	GETPC16
mov r0, r0, lsl #16	mov r0, r0, lsl #16
Line 548 imul_r_ea_d16 REG16EA r5, #21, #24	Line 544 imul_r_ea_d16 REG16EA r5, #21, #24
mov r0, r0, asr #16	mov r0, r0, asr #16
mul r1, r0, r4	mul r1, r0, r4
add r12, r1, #&8000	add r12, r1, #&8000
strh r1, [r5, #CPU_REG]	strh r1, [r6, #CPU_REG]
movs r12, r12 lsr #16	movs r12, r12 lsr #16
biceq r8, r8, #O_FLAG	biceq r8, r8, #O_FLAG
biceq r8, r8, #C_FLAG	biceq r8, r8, #C_FLAG
Line 557 imul_r_ea_d16 REG16EA r5, #21, #24	Line 553 imul_r_ea_d16 REG16EA r5, #21, #24
mov pc, r11	mov pc, r11

push_d8 CPUWORK #3	push_d8 CPUWORK #3
GETPC8	GETPCF8
ldrh r2, [r9, #CPU_SP]	ldrh r2, [r9, #CPU_SP]
ldr r3, [r9, #CPU_SS_BASE]	ldr r3, [r9, #CPU_SS_BASE]
mov r0, r0 lsl #24	mov r0, r0 lsl #24
Line 569 push_d8 CPUWORK #3	Line 565 push_d8 CPUWORK #3
mov lr, r11	mov lr, r11
b i286a_memorywrite_w	b i286a_memorywrite_w

imul_r_ea_d8 REG16EA r5, #21, #24	imul_r_ea_d8 REG16EA r6, #21, #24
mov r4, r0, lsl #16	mov r4, r0, lsl #16
GETPC8	GETPC8
mov r0, r0, lsl #24	mov r0, r0, lsl #24
Line 577 imul_r_ea_d8 REG16EA r5, #21, #24	Line 573 imul_r_ea_d8 REG16EA r5, #21, #24
mov r0, r0, asr #24	mov r0, r0, asr #24
mul r1, r0, r4	mul r1, r0, r4
add r12, r1, #&8000	add r12, r1, #&8000
strh r1, [r5, #CPU_REG]	strh r1, [r6, #CPU_REG]
movs r12, r12 lsr #16	movs r12, r12 lsr #16
biceq r8, r8, #O_FLAG	biceq r8, r8, #O_FLAG
biceq r8, r8, #C_FLAG	biceq r8, r8, #C_FLAG
Line 589 insb CPUWORK #5	Line 585 insb CPUWORK #5
ldrh r0, [r9, #CPU_DX]	ldrh r0, [r9, #CPU_DX]
CPUSV	CPUSV
bl iocore_inp8	bl iocore_inp8
CPULD
ldrh r2, [r9, #CPU_DI]	ldrh r2, [r9, #CPU_DI]
ldr r3, [r9, #CPU_ES_BASE]	ldr r3, [r9, #CPU_ES_BASE]
	CPULD
mov r1, r0	mov r1, r0
add r0, r2, r3	add r0, r3, r2
tst r8, #D_FLAG	tst r8, #D_FLAG
addeq r2, r2, #1	addeq r2, r2, #1
subne r2, r2, #1	subne r2, r2, #1
Line 605 insw CPUWORK #5	Line 601 insw CPUWORK #5
ldrh r0, [r9, #CPU_DX]	ldrh r0, [r9, #CPU_DX]
CPUSV	CPUSV
bl iocore_inp16	bl iocore_inp16
CPULD
ldrh r2, [r9, #CPU_DI]	ldrh r2, [r9, #CPU_DI]
ldr r3, [r9, #CPU_ES_BASE]	ldr r3, [r9, #CPU_ES_BASE]
	CPULD
mov r1, r0	mov r1, r0
add r0, r2, r3	add r0, r3, r2
tst r8, #D_FLAG	tst r8, #D_FLAG
addeq r2, r2, #2	addeq r2, r2, #2
subne r2, r2, #2	subne r2, r2, #2
Line 620 insw CPUWORK #5	Line 616 insw CPUWORK #5
outsb CPUWORK #3	outsb CPUWORK #3
ldrh r1, [r9, #CPU_SI]	ldrh r1, [r9, #CPU_SI]
ldr r2, [r9, #CPU_DS_FIX]	ldr r2, [r9, #CPU_DS_FIX]
add r0, r1, r2
tst r8, #D_FLAG	tst r8, #D_FLAG
addeq r1, r1, #1	addeq r3, r1, #1
subne r1, r1, #1	subne r3, r1, #1
strh r1, [r9, #CPU_SI]	add r0, r2, r1
	strh r3, [r9, #CPU_SI]
bl i286a_memoryread	bl i286a_memoryread
mov r1, r0	mov r1, r0
ldr r0, [r9, #CPU_DX]	ldr r0, [r9, #CPU_DX]
Line 636 outsb CPUWORK #3	Line 632 outsb CPUWORK #3
outsw CPUWORK #3	outsw CPUWORK #3
ldrh r1, [r9, #CPU_SI]	ldrh r1, [r9, #CPU_SI]
ldr r2, [r9, #CPU_DS_FIX]	ldr r2, [r9, #CPU_DS_FIX]
add r0, r1, r2
tst r8, #D_FLAG	tst r8, #D_FLAG
addeq r1, r1, #2	addeq r3, r1, #2
subne r1, r1, #2	subne r3, r1, #2
strh r1, [r9, #CPU_SI]	add r0, r2, r1
	strh r3, [r9, #CPU_SI]
bl i286a_memoryread_w	bl i286a_memoryread_w
mov r1, r0	mov r1, r0
ldr r0, [r9, #CPU_DX]	ldr r0, [r9, #CPU_DX]
Line 669 jmps JMPS #7	Line 665 jmps JMPS #7
xchg_ea_r8 EAREG8 r6	xchg_ea_r8 EAREG8 r6
cmp r0, #&c0	cmp r0, #&c0
bcc xchgear8_1	bcc xchgear8_1
CPUWORK #3	R8SRC r0, r2
R8SRC r0, r5
ldrb r0, [r6, #CPU_REG]	ldrb r0, [r6, #CPU_REG]
ldrb r1, [r5, #CPU_REG]	ldrb r1, [r2, #CPU_REG]
strb r0, [r5, #CPU_REG]	CPUWORK #3
	strb r0, [r2, #CPU_REG]
strb r1, [r6, #CPU_REG]	strb r1, [r6, #CPU_REG]
mov pc, r11	mov pc, r11
xchgear8_1 CPUWORK #5	xchgear8_1 bl i286a_ea
bl i286a_ea
cmp r0, #I286_MEMWRITEMAX	cmp r0, #I286_MEMWRITEMAX
bcs xchgear8_2	bcs xchgear8_2
ldrb r1, [r6, #CPU_REG]	ldrb r1, [r6, #CPU_REG]
ldrb r4, [r9, r0]	ldrb r4, [r9, r0]
	CPUWORK #5
strb r1, [r9, r0]	strb r1, [r9, r0]
strb r4, [r6, #CPU_REG]	strb r4, [r6, #CPU_REG]
mov pc, r11	mov pc, r11
Line 689 xchgear8_2 mov r5, r0	Line 685 xchgear8_2 mov r5, r0
bl i286a_memoryread	bl i286a_memoryread
ldrb r1, [r6, #CPU_REG]	ldrb r1, [r6, #CPU_REG]
strb r0, [r6, #CPU_REG]	strb r0, [r6, #CPU_REG]
	CPUWORK #5
mov r0, r5	mov r0, r5
mov lr, r11	mov lr, r11
b i286a_memorywrite	b i286a_memorywrite
Line 696 xchgear8_2 mov r5, r0	Line 693 xchgear8_2 mov r5, r0
xchg_ea_r16 EAREG16 r6	xchg_ea_r16 EAREG16 r6
cmp r0, #&c0	cmp r0, #&c0
bcc xchgear16_1	bcc xchgear16_1
CPUWORK #3	R16SRC r0, r2
R16SRC r0, r5
ldrh r0, [r6, #CPU_REG]	ldrh r0, [r6, #CPU_REG]
ldrh r1, [r5, #CPU_REG]	ldrh r1, [r2, #CPU_REG]
strh r0, [r5, #CPU_REG]	CPUWORK #3
	strh r0, [r2, #CPU_REG]
strh r1, [r6, #CPU_REG]	strh r1, [r6, #CPU_REG]
mov pc, r11	mov pc, r11
xchgear16_1 CPUWORK #5	xchgear16_1 bl i286a_ea
bl i286a_ea	WORDACC r0, xchgear16_2
tst r0, #1
bne xchgear16_2
cmp r0, #I286_MEMWRITEMAX
bcs xchgear16_2
ldrh r1, [r6, #CPU_REG]	ldrh r1, [r6, #CPU_REG]
ldrh r4, [r9, r0]	ldrh r4, [r9, r0]
	CPUWORK #5
strh r1, [r9, r0]	strh r1, [r9, r0]
strh r4, [r6, #CPU_REG]	strh r4, [r6, #CPU_REG]
mov pc, r11	mov pc, r11
Line 718 xchgear16_2 mov r5, r0	Line 712 xchgear16_2 mov r5, r0
bl i286a_memoryread_w	bl i286a_memoryread_w
ldrh r1, [r6, #CPU_REG]	ldrh r1, [r6, #CPU_REG]
strh r0, [r6, #CPU_REG]	strh r0, [r6, #CPU_REG]
	CPUWORK #5
mov r0, r5	mov r0, r5
mov lr, r11	mov lr, r11
b i286a_memorywrite_w	b i286a_memorywrite_w
Line 725 xchgear16_2 mov r5, r0	Line 720 xchgear16_2 mov r5, r0
mov_ea_r8 EAREG8 r6	mov_ea_r8 EAREG8 r6
cmp r0, #&c0	cmp r0, #&c0
bcc movear8_1	bcc movear8_1
	ldrb r1, [r6, #CPU_REG]
	R8SRC r0, r2
CPUWORK #3	CPUWORK #3
R8SRC r0, r5	strb r1, [r2, #CPU_REG]
ldrb r0, [r6, #CPU_REG]
strb r0, [r5, #CPU_REG]
mov pc, r11	mov pc, r11
movear8_1 CPUWORK #5	movear8_1 CPUWORK #5
bl i286a_ea	bl i286a_ea
Line 739 movear8_1 CPUWORK #5	Line 734 movear8_1 CPUWORK #5
mov_ea_r16 EAREG16 r6	mov_ea_r16 EAREG16 r6
cmp r0, #&c0	cmp r0, #&c0
bcc movear16_1	bcc movear16_1
	ldrh r1, [r6, #CPU_REG]
	R16SRC r0, r2
CPUWORK #3	CPUWORK #3
R16SRC r0, r5	strh r1, [r2, #CPU_REG]
ldrh r0, [r6, #CPU_REG]
strh r0, [r5, #CPU_REG]
mov pc, r11	mov pc, r11
movear16_1 CPUWORK #5	movear16_1 CPUWORK #5
bl i286a_ea	bl i286a_ea
Line 750 movear16_1 CPUWORK #5	Line 745 movear16_1 CPUWORK #5
mov lr, r11	mov lr, r11
b i286a_memorywrite_w	b i286a_memorywrite_w

mov_r8_ea REG8EA r5, #2, #5	mov_r8_ea REG8EA r6, #2, #5
strb r0, [r5, #CPU_REG]	strb r0, [r6, #CPU_REG]
mov pc, r11	mov pc, r11

mov_r16_ea REG16EA r5, #2, #5	mov_r16_ea REG16EA r6, #2, #5
strh r0, [r5, #CPU_REG]	strh r0, [r6, #CPU_REG]
mov pc, r11	mov pc, r11

mov_ea_seg GETPC8	mov_ea_seg GETPCF8
and r1, r0, #(3 << 3)	and r1, r0, #(3 << 3)
add r1, r9, r1 lsr #2	add r1, r9, r1 lsr #2
ldrh r5, [r1, #CPU_SEG]	ldrh r6, [r1, #CPU_SEG]
cmp r0, #&c0	cmp r0, #&c0
bcc measegm	bcc measegm
	R16SRC r0, r2
CPUWORK #2	CPUWORK #2
R16SRC r0, r4	strh r6, [r2, #CPU_REG]
strh r5, [r4, #CPU_REG]
mov pc, r11	mov pc, r11
measegm CPUWORK #3	measegm CPUWORK #3
bl i286a_ea	bl i286a_ea
mov r1, r5	mov r1, r6
mov lr, r11	mov lr, r11
b i286a_memorywrite_w	b i286a_memorywrite_w

lea_r16_ea CPUWORK #3	lea_r16_ea CPUWORK #3
GETPC8	GETPCF8
cmp r0, #&c0	cmp r0, #&c0
bcs leareg	bcs leareg
R16DST r0, r5	R16DST r0, r6
bl i286a_lea	bl i286a_lea
strh r0, [r5, #CPU_REG]	strh r0, [r6, #CPU_REG]
mov pc, r11	mov pc, r11
leareg mov r6, #6	leareg mov r6, #6
sub r8, r8, #(2 << 16)	sub r8, r8, #(2 << 16)
b i286a_localint	b i286a_localint

mov_seg_ea GETPC8	mov_seg_ea GETPCF8
adr r6, msegea_tbl	adr r2, msegea_tbl
and r1, r0, #(3 << 3)	and r1, r0, #(3 << 3)
mov r5, r8	mov r6, r8
ldr r6, [r6, r1 lsr #1]	ldr r2, [r2, r1 lsr #1]
cmp r0, #&c0	cmp r0, #&c0
bcc msegeam	bcc msegeam
CPUWORK #2
R16SRC r0, r4	R16SRC r0, r4
	CPUWORK #2
ldrh r0, [r4, #CPU_REG]	ldrh r0, [r4, #CPU_REG]
mov pc, r6	mov pc, r2
msegeam CPUWORK #5	msegeam str r2, [sp, #-4]!
	CPUWORK #5
bl i286a_ea	bl i286a_ea
bl i286a_memoryread_w	ldr lr, [sp], #4
mov pc, r6	b i286a_memoryread_w
msegea_tbl dcd msegea_es	msegea_tbl dcd msegea_es
dcd msegea_cs	dcd msegea_cs
dcd msegea_ss	dcd msegea_ss
Line 819 msegea_ss mov r1, r0 lsl #4	Line 815 msegea_ss mov r1, r0 lsl #4
str r1, [r9, #CPU_SS_BASE]	str r1, [r9, #CPU_SS_BASE]
str r1, [r9, #CPU_SS_FIX]	str r1, [r9, #CPU_SS_FIX]
NEXT_OPCODE	NEXT_OPCODE
msegea_cs sub r8, r5, #(2 << 16)	msegea_cs sub r8, r6, #(2 << 16)
mov r6, #6	mov r6, #6
b i286a_localint	b i286a_localint

pop_ea POP #5	pop_ea POP #5
mov r5, r0	mov r6, r0
GETPC8	GETPCF8
cmp r0, #&c0	cmp r0, #&c0
bcs popreg	bcs popreg
bl i286a_ea	bl i286a_ea
mov r1, r5	mov r1, r6
mov lr, r11	mov lr, r11
b i286a_memorywrite_w	b i286a_memorywrite_w
popreg R16SRC r0, r1	popreg R16SRC r0, r1
Line 839 popreg R16SRC r0, r1	Line 835 popreg R16SRC r0, r1

nopandbios sub r0, r8, #(1 << 16)	nopandbios sub r0, r8, #(1 << 16)
CPUWORK #3	CPUWORK #3
; ldr r5, [r9, #CPU_CS_BASE]	;; ldr r5, [r9, #CPU_CS_BASE]
add r0, r5, r0 lsr #16	add r0, r5, r0 lsr #16
cmp r0, #&0f8000	cmp r0, #&0f8000
movcc pc, r11	movcc pc, r11
Line 864 nopandbios sub r0, r8, #(1 << 16)	Line 860 nopandbios sub r0, r8, #(1 << 16)
str r3, [r9, #CPU_DS_FIX]	str r3, [r9, #CPU_DS_FIX]
mov pc, r11	mov pc, r11

cbw CPUWORK #2	cbw ldrb r0, [r9, #CPU_AL]
ldrb r0, [r9, #CPU_AL]	CPUWORK #2
mov r1, r0 lsl #24	mov r1, r0 lsl #24
mov r0, r1 asr #31	mov r0, r1 asr #31
strb r0, [r9, #CPU_AH]	strb r0, [r9, #CPU_AH]
mov pc, r11	mov pc, r11

cwd CPUWORK #2	cwd ldrb r0, [r9, #CPU_AH]
ldrb r0, [r9, #CPU_AH]	CPUWORK #2
mov r1, r0 lsl #24	mov r1, r0 lsl #24
mov r0, r1 asr #31	mov r0, r1 asr #31
strh r0, [r9, #CPU_DX]	strh r0, [r9, #CPU_DX]
Line 891 call_far CPUWORK #13	Line 887 call_far CPUWORK #13
mov r4, r4, lsr #16	mov r4, r4, lsr #16
mov r1, r12 lsr #16	mov r1, r12 lsr #16
add r0, r4, r5	add r0, r4, r5
bl i286a_memorywrite_w ; ip
ldr r5, [r9, #CPU_CS_BASE]	ldr r5, [r9, #CPU_CS_BASE]
	bl i286a_memorywrite_w ; ip
strh r4, [r9, #CPU_SP]	strh r4, [r9, #CPU_SP]
add r0, r5, r8 lsr #16	add r0, r5, r8 lsr #16
bl i286a_memoryread_w ; newip	bl i286a_memoryread_w ; newip
Line 931 popf POP #5	Line 927 popf POP #5
strb r2, [r9, #CPU_TRAP]	strb r2, [r9, #CPU_TRAP]
bne popf_withirq	bne popf_withirq
ldr r0, popf_pic	ldr r0, popf_pic
tst r8, #I_FLAG	NOINTREXIT
moveq pc, r11
PICEXISTINTR
moveq pc, r11
popf_withirq I286IRQCHECKTERM	popf_withirq I286IRQCHECKTERM
popf_pic dcd pic	popf_pic dcd pic

sahf CPUWORK #2	sahf ldrb r0, [r9, #CPU_AH]
ldrb r0, [r9, #CPU_AH]	CPUWORK #2
bic r8, r8, #&ff	bic r8, r8, #&ff
orr r8, r0, r8	orr r8, r8, r0
mov pc, r11	mov pc, r11

lahf CPUWORK #2	lahf CPUWORK #2
Line 950 lahf CPUWORK #2	Line 943 lahf CPUWORK #2


mov_al_m8 CPUWORK #5	mov_al_m8 CPUWORK #5
ldr r5, [r9, #CPU_DS_FIX]	ldr r6, [r9, #CPU_DS_FIX]
GETPC16	GETPC16
add r0, r5, r0	add r0, r0, r6
bl i286a_memoryread	bl i286a_memoryread
strb r0, [r9, #CPU_AL]	strb r0, [r9, #CPU_AL]
mov pc, r11	mov pc, r11

mov_ax_m16 CPUWORK #5	mov_ax_m16 CPUWORK #5
ldr r5, [r9, #CPU_DS_FIX]	ldr r6, [r9, #CPU_DS_FIX]
GETPC16	GETPC16
add r0, r5, r0	add r0, r0, r6
bl i286a_memoryread_w	bl i286a_memoryread_w
strh r0, [r9, #CPU_AX]	strh r0, [r9, #CPU_AX]
mov pc, r11	mov pc, r11

mov_m8_al CPUWORK #5	mov_m8_al CPUWORK #5
ldr r5, [r9, #CPU_DS_FIX]	ldr r6, [r9, #CPU_DS_FIX]
GETPC16	GETPC16
ldrb r1, [r9, #CPU_AL]	ldrb r1, [r9, #CPU_AL]
add r0, r5, r0	add r0, r0, r6
mov lr, r11	mov lr, r11
b i286a_memorywrite	b i286a_memorywrite

mov_m16_ax CPUWORK #5	mov_m16_ax CPUWORK #5
ldr r5, [r9, #CPU_DS_FIX]	ldr r6, [r9, #CPU_DS_FIX]
GETPC16	GETPC16
ldrh r1, [r9, #CPU_AX]	ldrh r1, [r9, #CPU_AX]
add r0, r5, r0	add r0, r0, r6
mov lr, r11	mov lr, r11
b i286a_memorywrite_w	b i286a_memorywrite_w

movsb CPUWORK #5	movsb CPUWORK #5
ldrh r5, [r9, #CPU_SI]	ldrh r6, [r9, #CPU_SI]
ldr r0, [r9, #CPU_DS_FIX]	ldr r0, [r9, #CPU_DS_FIX]
tst r8, #D_FLAG	tst r8, #D_FLAG
moveq r4, #1	moveq r4, #1
movne r4, #-1	movne r4, #-1
add r0, r5, r0	add r0, r6, r0
bl i286a_memoryread	bl i286a_memoryread
ldrh r3, [r9, #CPU_DI]	ldrh r3, [r9, #CPU_DI]
ldr r2, [r9, #CPU_ES_BASE]	ldr r2, [r9, #CPU_ES_BASE]
add r5, r5, r4	add r6, r6, r4
mov r1, r0	mov r1, r0
add r0, r3, r2	add r0, r3, r2
add r3, r3, r4	add r3, r3, r4
strh r5, [r9, #CPU_SI]	strh r6, [r9, #CPU_SI]
strh r3, [r9, #CPU_DI]	strh r3, [r9, #CPU_DI]
mov lr, r11	mov lr, r11
b i286a_memorywrite	b i286a_memorywrite

movsw CPUWORK #5	movsw CPUWORK #5
ldrh r5, [r9, #CPU_SI]	ldrh r6, [r9, #CPU_SI]
ldr r0, [r9, #CPU_DS_FIX]	ldr r0, [r9, #CPU_DS_FIX]
tst r8, #D_FLAG	tst r8, #D_FLAG
moveq r4, #2	moveq r4, #2
movne r4, #-2	movne r4, #-2
add r0, r5, r0	add r0, r6, r0
bl i286a_memoryread_w	bl i286a_memoryread_w
ldrh r3, [r9, #CPU_DI]	ldrh r3, [r9, #CPU_DI]
ldr r2, [r9, #CPU_ES_BASE]	ldr r2, [r9, #CPU_ES_BASE]
add r5, r5, r4	add r6, r6, r4
mov r1, r0	mov r1, r0
add r0, r3, r2	add r0, r3, r2
add r3, r3, r4	add r3, r3, r4
strh r5, [r9, #CPU_SI]	strh r6, [r9, #CPU_SI]
strh r3, [r9, #CPU_DI]	strh r3, [r9, #CPU_DI]
mov lr, r11	mov lr, r11
b i286a_memorywrite_w	b i286a_memorywrite_w

cmpsb CPUWORK #8	cmpsb ldrh r5, [r9, #CPU_SI]
ldrh r5, [r9, #CPU_SI]
ldr r0, [r9, #CPU_DS_FIX]	ldr r0, [r9, #CPU_DS_FIX]
;	ldr r4, [r9, #CPU_ES_BASE]
;	CPUWORK #8
add r0, r5, r0	add r0, r0, r5
bl i286a_memoryread	bl i286a_memoryread
ldr r2, [r9, #CPU_ES_BASE]
ldrh r3, [r9, #CPU_DI]	ldrh r3, [r9, #CPU_DI]
mov r6, r0	mov r6, r0
and r12, r8, #D_FLAG	and r12, r8, #D_FLAG
mov r12, r12 lsr #(10 - 1)	mov r12, r12 lsr #(10 - 1)
add r0, r2, r3	add r0, r3, r4
rsb r2, r12, #1	rsb r2, r12, #1
add r5, r2, r5	add r5, r2, r5
add r3, r2, r3	add r3, r2, r3
Line 1041 cmpsb CPUWORK #8	Line 1032 cmpsb CPUWORK #8
SUB8 r6, r0	SUB8 r6, r0
mov pc, r11	mov pc, r11

cmpsw CPUWORK #8	cmpsw ldrh r5, [r9, #CPU_SI]
ldrh r5, [r9, #CPU_SI]
ldr r0, [r9, #CPU_DS_FIX]	ldr r0, [r9, #CPU_DS_FIX]
;	ldr r4, [r9, #CPU_ES_BASE]
;	CPUWORK #8
add r0, r5, r0	add r0, r0, r5
bl i286a_memoryread_w	bl i286a_memoryread_w
ldr r2, [r9, #CPU_ES_BASE]
ldrh r3, [r9, #CPU_DI]	ldrh r3, [r9, #CPU_DI]
mov r6, r0	mov r6, r0
and r12, r8, #D_FLAG	and r12, r8, #D_FLAG
mov r12, r12 lsr #(10 - 2)	mov r12, r12 lsr #(10 - 2)
add r0, r2, r3	add r0, r3, r4
rsb r2, r12, #2	rsb r2, r12, #2
add r5, r2, r5	add r5, r2, r5
add r3, r2, r3	add r3, r2, r3
Line 1164 ret_near CPUWORK #11	Line 1153 ret_near CPUWORK #11
orr r8, r8, r0 lsl #16	orr r8, r8, r0 lsl #16
mov pc, r11	mov pc, r11

les_r16_ea GETPC8	les_r16_ea GETPCF8
cmp r0, #&c0	cmp r0, #&c0
bcs lr16_r	bcs lr16_r
CPUWORK #3	CPUWORK #3
Line 1185 lr16_r mov r6, #6	Line 1174 lr16_r mov r6, #6
sub r8, r8, #(2 << 16)	sub r8, r8, #(2 << 16)
b i286a_localint	b i286a_localint

lds_r16_ea GETPC8	lds_r16_ea GETPCF8
cmp r0, #&c0	cmp r0, #&c0
bcs lr16_r	bcs lr16_r
CPUWORK #3	CPUWORK #3
Line 1204 lds_r16_ea GETPC8	Line 1193 lds_r16_ea GETPC8
str r1, [r9, #CPU_DS_FIX]	str r1, [r9, #CPU_DS_FIX]
mov pc, r11	mov pc, r11

mov_ea8_d8 GETPC8	mov_ea8_d8 GETPCF8
cmp r0, #&c0	cmp r0, #&c0
bcs med8_r	bcs med8_r
CPUWORK #3	CPUWORK #3
bl i286a_ea	bl i286a_ea
mov r4, r0	mov r4, r0
GETPC8	GETPCF8
mov r1, r0	mov r1, r0
mov r0, r4	mov r0, r4
mov lr, r11	mov lr, r11
b i286a_memorywrite	b i286a_memorywrite
med8_r CPUWORK #2	med8_r CPUWORK #2
R8DST r0, r4	R8DST r0, r4
GETPC8	GETPCF8
strb r0, [r4, #CPU_REG]	strb r0, [r4, #CPU_REG]
mov pc, r11	mov pc, r11

mov_ea16_d16 GETPC8	mov_ea16_d16 GETPCF8
cmp r0, #&c0	cmp r0, #&c0
bcs med16_r	bcs med16_r
CPUWORK #3	CPUWORK #3
Line 1301 leave ldrh r1, [r9, #CPU_BP]	Line 1290 leave ldrh r1, [r9, #CPU_BP]
ldr r0, [r9, #CPU_SS_BASE]	ldr r0, [r9, #CPU_SS_BASE]
CPUWORK #5	CPUWORK #5
add r4, r1, #2	add r4, r1, #2
add r0, r1, r0	add r0, r0, r1
bl i286a_memoryread_w	bl i286a_memoryread_w
strh r4, [r9, #CPU_SP]	strh r4, [r9, #CPU_SP]
strh r0, [r9, #CPU_BP]	strh r0, [r9, #CPU_BP]
mov pc, r11	mov pc, r11

ret_far_d16 CPUWORK #15	ret_far_d16 GETPC16
GETPC16
mov r6, r0
ldrh r4, [r9, #CPU_SP]	ldrh r4, [r9, #CPU_SP]
ldr r5, [r9, #CPU_SS_BASE]	ldr r5, [r9, #CPU_SS_BASE]
;	mov r6, r0
;	CPUWORK #15
add r0, r4, r5	add r0, r5, r4
add r4, r4, #2	add r4, r4, #2
bl i286a_memoryread_w	bl i286a_memoryread_w
mov r8, r8 lsl #16	mov r8, r8 lsl #16
Line 1331 ret_far_d16 CPUWORK #15	Line 1318 ret_far_d16 CPUWORK #15
str r1, [r9, #CPU_CS_BASE]	str r1, [r9, #CPU_CS_BASE]
mov pc, r11	mov pc, r11

ret_far CPUWORK #15	ret_far ldrh r1, [r9, #CPU_SP]
ldrh r4, [r9, #CPU_SP]
ldr r5, [r9, #CPU_SS_BASE]	ldr r5, [r9, #CPU_SS_BASE]
;	CPUWORK #15
add r0, r4, r5	add r4, r1, #2
add r4, r4, #2	add r0, r5, r1
bl i286a_memoryread_w	bl i286a_memoryread_w
mov r8, r8 lsl #16	mov r8, r8 lsl #16
mov r8, r8 lsr #16	mov r8, r8 lsr #16
Line 1356 int_03 CPUWORK #3	Line 1342 int_03 CPUWORK #3
b i286a_localint	b i286a_localint

int_d8 CPUWORK #3	int_d8 CPUWORK #3
GETPC8	GETPCF8
mov r6, r0	mov r6, r0
b i286a_localint	b i286a_localint

Line 1367 into CPUWORK #4	Line 1353 into CPUWORK #4
b i286a_localint	b i286a_localint

iret bl extirq_pop	iret bl extirq_pop
CPUWORK #31
ldrh r1, [r9, #CPU_SP]	ldrh r1, [r9, #CPU_SP]
ldr r5, [r9, #CPU_SS_BASE]	ldr r5, [r9, #CPU_SS_BASE]
;	CPUWORK #31
add r4, r1, #2	add r4, r1, #2
add r0, r1, r5	add r0, r5, r1
bl i286a_memoryread_w	bl i286a_memoryread_w
bic r4, r4, #(1 << 16)	bic r4, r4, #(1 << 16)
mov r8, r0 lsl #16	mov r8, r0 lsl #16
Line 1395 iret bl extirq_pop	Line 1380 iret bl extirq_pop
strb r2, [r9, #CPU_TRAP]	strb r2, [r9, #CPU_TRAP]
bne iret_withirq	bne iret_withirq
ldr r0, iret_pic	ldr r0, iret_pic
tst r8, #I_FLAG	NOINTREXIT
moveq pc, r11
PICEXISTINTR
moveq pc, r11
iret_withirq I286IRQCHECKTERM	iret_withirq I286IRQCHECKTERM
iret_pic dcd pic	iret_pic dcd pic


aam CPUWORK #16	aam CPUWORK #16
GETPC8	GETPCF8
movs r0, r0, lsl #7	movs r0, r0 lsl #7
beq aamzero	beq aamzero
ldrb r1, [r9, #CPU_AL]	ldrb r1, [r9, #CPU_AL]
mov r2, #&80	mov r2, #&80
Line 1413 aam CPUWORK #16	Line 1395 aam CPUWORK #16
aamlp cmp r1, r0	aamlp cmp r1, r0
subcs r1, r1, r0	subcs r1, r1, r0
orrcs r3, r2, r3	orrcs r3, r2, r3
	mov r0, r0 lsr #1
movs r2, r2 lsr #1	movs r2, r2 lsr #1
bne aamlp	bne aamlp
ldrb r2, [r10, r1]	ldrb r2, [r10, r1]
Line 1429 aamzero sub r8, r8, #(2 << 16)	Line 1412 aamzero sub r8, r8, #(2 << 16)
mov r6, #0	mov r6, #0
b i286a_localint	b i286a_localint

aad CPUWORK #14	aad ldrh r6, [r9, #CPU_AX]
GETPC8	GETPCF8
ldrh r1, [r9, #CPU_AX]	mov r2, r6 lsr #8
	mla r3, r2, r0, r6
bic r8, r8, #(S_FLAG + Z_FLAG + P_FLAG)	bic r8, r8, #(S_FLAG + Z_FLAG + P_FLAG)
;
mov r2, r1 lsr #8
mla r3, r2, r0, r1
;
and r1, r3, #&ff	and r1, r3, #&ff
;	ldrb r2, [r1, r10]
ldrb r2, [r10, r1]
strh r1, [r9, #CPU_AX]	strh r1, [r9, #CPU_AX]
;	CPUWORK #14
orr r8, r2, r8	orr r8, r2, r8
mov pc, r11	mov pc, r11

Line 1463 xlat ldrb r0, [r9, #CPU_AL]	Line 1442 xlat ldrb r0, [r9, #CPU_AL]
mov pc, r11	mov pc, r11

esc CPUWORK #2	esc CPUWORK #2
GETPC8	GETPCF8
cmp r0, #&c0	cmp r0, #&c0
movcs pc, r11	movcs pc, r11
mov lr, r11	mov lr, r11
Line 1518 jcxz ldrh r0, [r9, #CPU_CX]	Line 1497 jcxz ldrh r0, [r9, #CPU_CX]
jcxzj JMPS #8	jcxzj JMPS #8

in_al_d8 CPUWORK #5	in_al_d8 CPUWORK #5
GETPC8	GETPCF8
add r3, r0, r8 lsr #16	add r3, r5, r8 lsr #16
CPUSV	CPUSV
str r3, [r9, #CPU_INPUT]	str r3, [r9, #CPU_INPUT]
bl iocore_inp8	bl iocore_inp8
Line 1530 in_al_d8 CPUWORK #5	Line 1509 in_al_d8 CPUWORK #5
mov pc, r11	mov pc, r11

in_ax_d8 CPUWORK #5	in_ax_d8 CPUWORK #5
GETPC8	GETPCF8
CPUSV	CPUSV
bl iocore_inp16	bl iocore_inp16
CPULD	CPULD
Line 1538 in_ax_d8 CPUWORK #5	Line 1517 in_ax_d8 CPUWORK #5
mov pc, r11	mov pc, r11

out_d8_al CPUWORK #3	out_d8_al CPUWORK #3
GETPC8	GETPCF8
ldrb r1, [r9, #CPU_AL]	ldrb r1, [r9, #CPU_AL]
CPUSV	CPUSV
bl iocore_out8	bl iocore_out8
Line 1546 out_d8_al CPUWORK #3	Line 1525 out_d8_al CPUWORK #3
mov pc, r11	mov pc, r11

out_d8_ax CPUWORK #3	out_d8_ax CPUWORK #3
GETPC8	GETPCF8
ldrh r1, [r9, #CPU_AX]	ldrh r1, [r9, #CPU_AX]
CPUSV	CPUSV
bl iocore_out16	bl iocore_out16
CPULD	CPULD
mov pc, r11	mov pc, r11

call_near CPUWORK #7	call_near GETPC16
GETPC16
ldrh r2, [r9, #CPU_SP]	ldrh r2, [r9, #CPU_SP]
ldr r3, [r9, #CPU_SS_BASE]	ldr r3, [r9, #CPU_SS_BASE]
;	CPUWORK #7
sub r1, r2, #2	sub r1, r2, #2
mov r2, r1 lsl #16	mov r2, r1 lsl #16
strh r1, [r9, #CPU_SP]	strh r1, [r9, #CPU_SP]
Line 1657 sti_set orr r8, r8, #I_FLAG	Line 1635 sti_set orr r8, r8, #I_FLAG
ldr r0, sti_pic	ldr r0, sti_pic
strneb r1, [r9, #CPU_TRAP]	strneb r1, [r9, #CPU_TRAP]
bne sti_withirq	bne sti_withirq
PICEXISTINTR	PICEXISTINTR sti_noirq
bne sti_withirq	bne sti_withirq
sti_noirq NEXT_OPCODE	sti_noirq NEXT_OPCODE
sti_pic dcd pic	sti_pic dcd pic
Line 1679 i286a_step stmdb sp!, {r4 - r11, lr}	Line 1657 i286a_step stmdb sp!, {r4 - r11, lr}
ldr r10, ias_r10	ldr r10, ias_r10
;	;
ldr r5, [r9, #CPU_CS_BASE]	ldr r5, [r9, #CPU_CS_BASE]
; ldr r7, [r9, #CPU_REMAINCLOCK]	CPULD
ldr r8, [r9, #CPU_FLAG]

adr r4, optbl1	adr r4, optbl1
add r0, r5, r8 lsr #16	add r0, r5, r8 lsr #16
Line 1690 i286a_step stmdb sp!, {r4 - r11, lr}	Line 1667 i286a_step stmdb sp!, {r4 - r11, lr}
mov r11, pc	mov r11, pc
mov pc, r1	mov pc, r1

str r8, [r9, #CPU_FLAG]	bl dmap_i286
	CPUSV
ldmia sp!, {r4 - r11, pc}	ldmia sp!, {r4 - r11, pc}


Line 1698 i286a stmdb sp!, {r4 - r11, lr}	Line 1676 i286a stmdb sp!, {r4 - r11, lr}
ldr r9, ias_r9	ldr r9, ias_r9
ldr r2, ias_r1	ldr r2, ias_r1
ldr r10, ias_r10	ldr r10, ias_r10
ldr r8, [r9, #CPU_FLAG]	CPULD
ldr r5, [r9, #CPU_CS_BASE]	ldr r5, [r9, #CPU_CS_BASE]
ldr r1, [r2, #DMAC_WORKING]	ldr r1, [r2, #DMAC_WORKING]
and r0, r8, #(I_FLAG + T_FLAG)	and r0, r8, #(I_FLAG + T_FLAG)
Line 1706 i286a stmdb sp!, {r4 - r11, lr}	Line 1684 i286a stmdb sp!, {r4 - r11, lr}
beq i286awithtrap	beq i286awithtrap
cmp r1, #0	cmp r1, #0
bne i286awithdma	bne i286awithdma
adr r4, optbl1	i286a_lp adr r4, optbl1
i286a_lp add r0, r5, r8 lsr #16	add r0, r5, r8 lsr #16
bl i286a_memoryread	GETR0
ldr r1, [r4, r0 lsl #2]	ldr r1, [r4, r0 lsl #2]
add r8, r8, #(1 << 16)	add r8, r8, #(1 << 16)
mov r11, pc	mov r11, pc
mov pc, r1	mov pc, r1
ldr r7, [r9, #CPU_REMAINCLOCK]	CPUDBGL
ldr r5, [r9, #CPU_CS_BASE]
adr r4, optbl1
cmp r7, #0	cmp r7, #0
	ldrgt r5, [r9, #CPU_CS_BASE]
bgt i286a_lp	bgt i286a_lp
str r8, [r9, #CPU_FLAG]	CPUSV
ldmia sp!, {r4 - r11, pc}	ldmia sp!, {r4 - r11, pc}

ias_r9 dcd i286core - CPU_REG	ias_r9 dcd i286acore + CPU_SIZE
ias_r1 dcd dmac	ias_r1 dcd dmac
ias_r10 dcd _szpcflag8	ias_r10 dcd iflags

i286awithdma adr r4, optbl1	i286awithdma adr r4, optbl1
i286awdma_lp add r0, r5, r8 lsr #16	add r0, r5, r8 lsr #16
bl i286a_memoryread	GETR0
ldr r1, [r4, r0 lsl #2]	ldr r1, [r4, r0 lsl #2]
add r8, r8, #(1 << 16)	add r8, r8, #(1 << 16)
mov r11, pc	mov r11, pc
mov pc, r1	mov pc, r1
bl dmap_i286	bl dmap_i286
ldr r7, [r9, #CPU_REMAINCLOCK]	CPUDBGL
ldr r5, [r9, #CPU_CS_BASE]
adr r4, optbl1
cmp r7, #0	cmp r7, #0
bgt i286awdma_lp	ldrgt r5, [r9, #CPU_CS_BASE]
str r8, [r9, #CPU_FLAG]	bgt i286awithdma
	CPUSV
ldmia sp!, {r4 - r11, pc}	ldmia sp!, {r4 - r11, pc}

i286awithtrap adr r4, optbl1	i286awithtrap adr r4, optbl1
i286awtrp_lp add r0, r5, r8 lsr #16	add r0, r5, r8 lsr #16
bl i286a_memoryread	GETR0
ldr r1, [r4, r0 lsl #2]	ldr r1, [r4, r0 lsl #2]
add r8, r8, #(1 << 16)	add r8, r8, #(1 << 16)
mov r11, pc	mov r11, pc
Line 1752 i286awtrp_lp add r0, r5, r8 lsr #16	Line 1728 i286awtrp_lp add r0, r5, r8 lsr #16
and r0, r8, #(I_FLAG + T_FLAG)	and r0, r8, #(I_FLAG + T_FLAG)
cmp r0, #(I_FLAG + T_FLAG)	cmp r0, #(I_FLAG + T_FLAG)
beq i286a_trapint	beq i286a_trapint
i286a_trapintr str r8, [r9, #CPU_FLAG]	i286a_trapintr CPUSV
ldmia sp!, {r4 - r11, pc}	ldmia sp!, {r4 - r11, pc}

optbl1 dcd add_ea_r8 ; 00	optbl1 dcd add_ea_r8 ; 00
Line 1963 optbl1 dcd add_ea_r8 ; 00	Line 1939 optbl1 dcd add_ea_r8 ; 00
dcd i286asft16_d8	dcd i286asft16_d8
dcd ret_near_d16	dcd ret_near_d16
dcd ret_near	dcd ret_near
dcd les_r16_ea ; (now testing i286a_a)	dcd les_r16_ea
dcd lds_r16_ea ; (now testing i286a_a)	dcd lds_r16_ea
dcd mov_ea8_d8	dcd mov_ea8_d8
dcd mov_ea16_d16	dcd mov_ea16_d16
dcd enter	dcd enter
Line 2042 $label ldr r1, [r9, $b]	Line 2018 $label ldr r1, [r9, $b]
add r6, r6, #1	add r6, r6, #1
cmp r6, #MAX_PREFIX	cmp r6, #MAX_PREFIX
bcs prefix_fault	bcs prefix_fault
bl i286a_memoryread	GETR0
ldr r1, [r4, r0 lsl #2]	ldr r1, [r4, r0 lsl #2]
add r8, r8, #(1 << 16)	add r8, r8, #(1 << 16)
strb r6, [r9, #CPU_PREFIX]	strb r6, [r9, #CPU_PREFIX]
Line 2079 repne ldrb r6, [r9, #CPU_PREFIX]	Line 2055 repne ldrb r6, [r9, #CPU_PREFIX]
add r6, r6, #1	add r6, r6, #1
cmp r6, #MAX_PREFIX	cmp r6, #MAX_PREFIX
bcs prefix_fault	bcs prefix_fault
bl i286a_memoryread	GETR0
ldr r1, [r4, r0 lsl #2]	ldr r1, [r4, r0 lsl #2]
add r8, r8, #(1 << 16)	add r8, r8, #(1 << 16)
strb r6, [r9, #CPU_PREFIX]	strb r6, [r9, #CPU_PREFIX]
Line 2369 repe ldrb r6, [r9, #CPU_PREFIX]	Line 2345 repe ldrb r6, [r9, #CPU_PREFIX]
add r6, r6, #1	add r6, r6, #1
cmp r6, #MAX_PREFIX	cmp r6, #MAX_PREFIX
bcs prefix_fault	bcs prefix_fault
bl i286a_memoryread	GETR0
ldr r1, [r4, r0 lsl #2]	ldr r1, [r4, r0 lsl #2]
add r8, r8, #(1 << 16)	add r8, r8, #(1 << 16)
strb r6, [r9, #CPU_PREFIX]	strb r6, [r9, #CPU_PREFIX]

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.10
changed lines
	Added in v.1.18