X-Git-Url: http://cloudbase.mooo.com/gitweb/avrcpm.git/blobdiff_plain/f24b3c790fd048b43b1d72e63a8a615a47f17cd9..de15c768141e7d7c3f34e6a4260d1c7a55cece4f:/avr/8080int.asm

diff --git a/avr/8080int.asm b/avr/8080int.asm
index b660a3c..5e68a92 100644
--- a/avr/8080int.asm
+++ b/avr/8080int.asm
@@ -43,6 +43,59 @@ z_e:	.byte	1
 z_h:	.byte	1
 z_l:	.byte	1
 
+	.equ	oz_b = 0
+	.equ	oz_c = 1
+	.equ	oz_d = 2
+	.equ	oz_e = 3
+	.equ	oz_h = 4
+	.equ	oz_l = 5
+
+
+#if EM_Z80
+z_b2:	.byte	1
+z_c2:	.byte	1
+z_d2:	.byte	1
+z_e2:	.byte	1
+z_h2:	.byte	1
+z_l2:	.byte	1
+z_f2:	.byte	1
+z_a2:	.byte	1
+	.equ r2ofs = z_b2-z_b
+	.equ	oz_b2 = 6
+	.equ	oz_c2 = 7
+	.equ	oz_d2 = 8
+	.equ	oz_e2 = 9
+	.equ	oz_h2 = 10
+	.equ	oz_l2 = 11
+	.equ	oz_f2 = 12
+	.equ	oz_a2 = 13
+
+z_xh:	.byte	1
+z_xl:	.byte	1
+z_yh:	.byte	1
+z_yl:	.byte	1
+
+z_i:	.byte	1
+z_r:	.byte	1
+	.equ	oz_xh = 14
+	.equ	oz_xl = 15
+	.equ	oz_yh = 16
+	.equ	oz_yl = 17
+	.equ	oz_i = 18
+	.equ	oz_r = 19
+
+z_istat: .byte	1
+	.equ	oz_istat = 20
+
+	.equ IM_MASK = 0x03		;Mask IM 0..2
+	.equ IM0     = 0
+	.equ IM1     = 1
+	.equ IM2     = 2
+
+	.equ IFF1 = 2			;IFF1 Flag
+	.equ IFF2 = 3			;IFF2 Flag
+
+#endif
 
 	.cseg
 
@@ -80,7 +133,6 @@ main:
 notraceon:
 .endif
 
-
 .if PRINT_PC
 	cpi z_pch,DBG_TRACE_BOTTOM
 	brlo noprintpc
@@ -90,7 +142,7 @@ notraceon:
 	printnewline
 	printstring "PC="
 	movw temp,z_pcl
-	rcall printhexw
+	lcall printhexw
 	printstring " "
 noprintpc:
 .endif
@@ -371,7 +423,6 @@ do_store_am:
 	ret
 
 
-
 ; ------------ Operation phase stuff -----------------
 
 ;----------------------------------------------------------------
@@ -395,9 +446,9 @@ do_store_am:
 ;|ADC A,s   |***V0*|Add with Carry       |A=A+s+CY              |
 ;|ADC HL,ss |**?V0*|Add with Carry       |HL=HL+ss+CY           |
 ;|ADD A,s   |***V0*|Add                  |A=A+s                 |
-;|ADD HL,ss |--?-0*|Add                  |HL=HL+ss              |
-;|ADD IX,pp |--?-0*|Add                  |IX=IX+pp              |
-;|ADD IY,rr |--?-0*|Add                  |IY=IY+rr              |
+;|ADD HL,ss |--*-0*|Add                  |HL=HL+ss              |
+;|ADD IX,pp |--*-0*|Add                  |IX=IX+pp              |
+;|ADD IY,rr |--*-0*|Add                  |IY=IY+rr              |
 ;|AND s     |**1P00|Logical AND          |A=A&s                 |
 ;|BIT b,m   |?*1?0-|Test Bit             |m&{2^b}               |
 ;|CALL cc,nn|------|Conditional Call     |If cc CALL            |
@@ -413,9 +464,9 @@ do_store_am:
 ;|DEC s     |***V1-|Decrement            |s=s-1                 |
 ;|DEC xx    |------|Decrement            |xx=xx-1               |
 ;|DEC ss    |------|Decrement            |ss=ss-1               |
-;|DI        |------|Disable Interrupts   |                      |
+;|DI        |------|Disable Interrupts   |IFF1 = IFF2 = 0       |
 ;|DJNZ e    |------|Dec., Jump Non-Zero  |B=B-1 till B=0        |
-;|EI        |------|Enable Interrupts    |                      |
+;|EI        |------|Enable Interrupts    |IFF1 = IFF2 = 1       |
 ;|EX [SP],HL|------|Exchange             |[SP]<->HL             |
 ;|EX [SP],xx|------|Exchange             |[SP]<->xx             |
 ;|EX AF,AF' |------|Exchange             |AF<->AF'              |
@@ -476,7 +527,7 @@ do_store_am:
 ;|RRD       |**0P0-|Rotate Right 4 bits  |{A,[HL]}=->{A,[HL]} ##|
 ;|RST p     |------|Restart              | (p=0H,8H,10H,...,38H)|
 ;|SBC A,s   |***V1*|Subtract with Carry  |A=A-s-CY              |
-;|SBC HL,ss |**?V1*|Subtract with Carry  |HL=HL-ss-CY           |
+;|SBC HL,ss |***V1*|Subtract with Carry  |HL=HL-ss-CY           |
 ;|SCF       |--0-01|Set Carry Flag       |CY=1                  |
 ;|SET b,m   |------|Set bit              |m=mv{2^b}             |
 ;|SLA m     |**0P0*|Shift Left Arithmetic|m=m*2                 |
@@ -563,7 +614,6 @@ do_store_am:
 .equ ZFL_N = 1
 .equ ZFL_C = 0
 
-
 .equ AVR_T = SREG_T
 .equ AVR_H = SREG_H
 .equ AVR_S = SREG_S
@@ -591,6 +641,12 @@ do_store_am:
 #endif
 .endm
 
+.macro	do_z80_flags_H
+#if EM_Z80
+	bmov	z_flags, ZFL_H, temp, AVR_H
+#endif
+.endm
+
 .macro	do_z80_flags_set_N
 #if EM_Z80
 	ori	z_flags, (1<<ZFL_N)       ; Negation auf 1
@@ -669,10 +725,10 @@ do_op_outa: ; out (opl),a
 	printnewline
 	printstring "Port write: "
 	mov temp,z_a
-	rcall printhex
+	lcall printhex
 	printstring " -> ("
 	mov temp,opl
-	rcall printhex
+	lcall printhex
 	printstring ") "
 .endif
 	mov temp,z_a
@@ -686,21 +742,21 @@ do_op_outa: ; out (opl),a
 ;|IN A,[n]  |------|Input                |A=[n]                 |
 ;
 ;
-do_op_in:	; in a,(opl)
+do_op_ina:				; in a,(opl)
 .if PORT_DEBUG
 	printnewline
 	printstring "Port read: ("
 	mov temp,opl
-	rcall printhex
+	lcall printhex
 	printstring ") -> "
 .endif
 
 	mov temp2,opl
 	lcall portRead
-	mov opl,temp
+	mov z_a,temp
 
 .if PORT_DEBUG
-	rcall printhex
+	lcall printhex
 	printstring " "
 .endif
 	ret
@@ -1025,9 +1081,11 @@ do_op_addhl:
 	lds	temp2,z_h
 	add opl,temp
 	adc oph,temp2
+	sts	z_l,opl
+	sts	z_h,oph
 	in temp,sreg
-	bmov	z_flags,ZFL_H, temp,AVR_H
 	bmov	z_flags,ZFL_C, temp,AVR_C
+	do_z80_flags_H
 	do_z80_flags_clear_N
 	ret
 
@@ -1122,6 +1180,53 @@ do_op_rmem8:
 ;     Z:   Set if Acc. is Zero after operation, reset otherwise.
 ;     S:   Set if most significant bit of Acc. is 1 after operation, reset otherwise.
 
+#if 1
+
+do_op_da:
+
+#if EM_Z80
+	sbrc	z_flags,ZFL_N			;if add-op	
+	rjmp	op_da_sub			;then
+#endif
+
+op_da_add:
+	ldi	temp2,0				;  new C and H flag
+	sbrc	z_flags,ZFL_H			;  |
+	rjmp	op_da_a01			;  if (H flag ...
+	mov	temp,opl			;  |
+	andi	temp,0x0f			;  |
+	cpi	temp,0x0a			;  or (lower nibble >= 0x0A))
+	brlo	op_da_a10			;  |
+op_da_a01:					;  then
+	ldi	oph,0x06			;    add 6 to lower nibble
+	add	opl,oph				;    
+	brhc	op_da_02			;    if 
+	ori	temp2,(1<<ZFL_H)		;      set new H flag
+op_da_02:					;
+	brcc	op_da_a10			;    if
+	ori	temp2,(1<<ZFL_C)		;      set new H flag
+op_da_a10:					;  endif
+	sbrc	z_flags,ZFL_C			;  |
+	rjmp	op_da_a12			;  if (C flag ...
+	cpi	opl,0xA0			;  |... or upper nibble >= 0xA0)
+	brlo	op_da_a13			; 
+op_da_a12:					;
+	ldi	oph,0x60			;    add 6 to lower nibble
+	add	opl,oph				;
+	ori	temp2,(1<<ZFL_C)		;      set new C flag
+op_da_a13:					;
+	ldpmx	z_flags, sz53p_tab, opl		;  get S,Z,P flag
+	or	z_flags,temp2			;  merge new C and H flag
+	ret
+
+#if EM_Z80
+
+op_da_sub:					;else (sub-op)
+	rcall do_op_inv				;  TODO: !
+	ret					;endif
+#endif
+
+#else
 
 do_op_da:
 	ldi	temp2,0				;new C and H flag
@@ -1174,7 +1279,7 @@ op_da_ae:
 op_da_sub:					;else (sub-op)
 	rcall do_op_inv				;  TODO: !
 	ret					;endif
-
+#endif
 
 
 ;----------------------------------------------------------------
@@ -1315,7 +1420,7 @@ do_op_ifnz:
 	sbrs z_flags, ZFL_Z
 	ret
 	pop	temp				; nix tun
-	pop temp				; direkt zuruech zu main	
+	pop temp				; direkt zurueck zu main	
 	ret
 
 ;----------------------------------------------------------------
@@ -1330,7 +1435,7 @@ do_op_ifz:
 	sbrc z_flags, ZFL_Z
 	ret
 	pop	temp				; nix tun
-	pop temp				; direkt zuruech zu main	
+	pop temp				; direkt zurueck zu main	
 	ret
 
 ;----------------------------------------------------------------
@@ -1441,7 +1546,7 @@ instr 	do_fetch_B,	op_DEC,		do_store_B	;05		;DEC B
 instr 	do_fetch_DIR8,	op_nop,		do_store_B	;06		;LD B,n
 instr 	do_fetch_nop,	op_RLCA,	do_store_nop	;07		;RLCA
 instr 	do_fetch_nop,	op_INV,		do_store_nop	;08		;EX AF,AF'
-instr 	do_fetch_BC,	op_ADDHL,	do_store_HL	;09		;ADD HL,BC
+instr 	do_fetch_BC,	op_ADDHL,	do_store_nop	;09		;ADD HL,BC
 instr 	do_fetch_MBC,	op_nop,		do_store_nop	;0A       	;LD A,(BC)
 instr 	do_fetch_BC,	op_DEC16,	do_store_BC	;0B       	;DEC BC
 instr 	do_fetch_C,	op_INC,		do_store_C	;0C       	;INC C
@@ -1457,7 +1562,7 @@ instr 	do_fetch_D,	op_DEC,		do_store_D	;15		;DEC D
 instr 	do_fetch_DIR8,	op_nop,		do_store_D	;16 nn		;LD D,n
 instr 	do_fetch_nop,	op_RLA,		do_store_nop	;17		;RLA
 instr 	do_fetch_nop,	op_INV,		do_store_nop	;18 oo		;JR o
-instr 	do_fetch_DE,	op_ADDHL,	do_store_HL	;19		;ADD HL,DE
+instr 	do_fetch_DE,	op_ADDHL,	do_store_nop	;19		;ADD HL,DE
 instr 	do_fetch_MDE,	op_nop,		do_store_nop	;1A		;LD A,(DE)
 instr 	do_fetch_DE,	op_DEC16,	do_store_DE	;1B		;DEC DE
 instr 	do_fetch_E,	op_INC,		do_store_E	;1C		;INC E
@@ -1473,7 +1578,7 @@ instr 	do_fetch_H,	op_DEC,		do_store_H	;25		;DEC H
 instr 	do_fetch_DIR8,	op_nop,		do_store_H	;26 nn		;LD H,n
 instr 	do_fetch_A,	op_DA,		do_store_A	;27		;DAA
 instr 	do_fetch_nop,	op_INV,		do_store_nop	;28 oo		;JR Z,o
-instr 	do_fetch_HL,	op_ADDHL,	do_store_HL	;29		;ADD HL,HL
+instr 	do_fetch_HL,	op_ADDHL,	do_store_nop	;29		;ADD HL,HL
 instr 	do_fetch_DIR16,	op_RMEM16,	do_store_HL	;2A nn nn	;LD HL,(nn)
 instr 	do_fetch_HL,	op_DEC16,	do_store_HL	;2B		;DEC HL
 instr 	do_fetch_L,	op_INC,		do_store_L	;2C		;INC L
@@ -1489,7 +1594,7 @@ instr 	do_fetch_MHL,	op_DEC,		do_store_MHL	;35		;DEC (HL)
 instr 	do_fetch_DIR8,	op_nop,		do_store_MHL	;36 nn		;LD (HL),n
 instr 	do_fetch_nop,	op_SCF,		do_store_nop	;37		;SCF
 instr 	do_fetch_nop,	op_INV,		do_store_nop	;38 oo		;JR C,o
-instr 	do_fetch_SP,	op_ADDHL,	do_store_HL	;39		;ADD HL,SP
+instr 	do_fetch_SP,	op_ADDHL,	do_store_nop	;39		;ADD HL,SP
 instr 	do_fetch_DIR16,	op_RMEM8,	do_store_A	;3A nn nn	;LD A,(nn)
 instr 	do_fetch_SP,	op_DEC16,	do_store_SP	;3B		;DEC SP
 instr 	do_fetch_nop,	op_INCA,	do_store_nop	;3C		;INC A
@@ -1651,7 +1756,7 @@ instr 	do_fetch_RST,	op_nop,		do_store_CALL	;D7		;RST 10H
 instr 	do_fetch_nop,	op_IFC,		do_store_RET	;D8		;RET C
 instr 	do_fetch_nop,	op_nop,		do_store_nop	;D9		;EXX
 instr 	do_fetch_DIR16,	op_IFC,		do_store_PC	;DA nn nn	;JP C,nn
-instr 	do_fetch_DIR8,	op_IN,		do_store_A	;DB nn		;IN A,(n)
+instr 	do_fetch_DIR8,	op_INA,		do_store_nop	;DB nn		;IN A,(n)
 instr 	do_fetch_DIR16,	op_IFC,		do_store_CALL	;DC nn nn	;CALL C,nn
 instr 	do_fetch_nop,	op_INV,		do_store_nop	;DD 		;(Z80 specific)
 instr 	do_fetch_DIR8,	op_SBCFA,	do_store_nop	;DE nn		;SBC A,n