DAA implemented

src/zvm_m65/z80_instr_general.s

@@ -4,7 +4,48 @@
 ;
 
 
-Z80_instr_2F:      ; CPL
+!macro Z80_DAA_TAB .OTAB, .FTAB {
+	ldx REG_A
+	lda .OTAB,x
+	sta REG_A
+	lda .FTAB,x
+	sta REG_F
+	jmp ZVM_next
+}
+
+Z80_instr_27:                                                                  ; DAA
+
+	bbs1 REG_F, @N1
+@N0:
+	bbs0 REG_F, @N0C1
+@N0C0:
+	bbs4 REG_F, @N0C0H1
+@N0C0H0:
+	+Z80_DAA_TAB z80_otable_DAA_N0C0H0, z80_ftable_DAA_N0C0H0
+@N0C0H1:
+	+Z80_DAA_TAB z80_otable_DAA_N0C0H1, z80_ftable_DAA_N0C0H1
+@N0C1:
+	bbs4 REG_F, @N0C1H1
+@N0C1H0:
+	+Z80_DAA_TAB z80_otable_DAA_N0C1H0, z80_ftable_DAA_N0C1H0
+@N0C1H1:
+	+Z80_DAA_TAB z80_otable_DAA_N0C1H1, z80_ftable_DAA_N0C1H1
+@N1:
+	bbs0 REG_F, @N1C1
+@N1C0:
+	bbs4 REG_F, @N1C0H1
+@N1C0H0:
+	+Z80_DAA_TAB z80_otable_DAA_N1C0H0, z80_ftable_DAA_N1C0H0
+@N1C0H1:
+	+Z80_DAA_TAB z80_otable_DAA_N1C0H1, z80_ftable_DAA_N1C0H1
+@N1C1:
+	bbs4 REG_F, @N1C1H1
+@N1C1H0:
+	+Z80_DAA_TAB z80_otable_DAA_N1C1H0, z80_ftable_DAA_N1C1H0
+@N1C1H1:
+	+Z80_DAA_TAB z80_otable_DAA_N1C1H1, z80_ftable_DAA_N1C1H1
+
+Z80_instr_2F:                                                                  ; CPL
 
 	lda REG_A
 	eor #$FF
@@ -17,7 +58,7 @@ Z80_instr_2F:      ; CPL
 
 ; XXX put NEG here
 
-Z80_instr_3F:      ; CCF
+Z80_instr_3F:                                                                  ; CCF
 
 	+Z80_PUT_0_NF
 	bbs0 REG_F,@1
@@ -30,14 +71,14 @@ Z80_instr_3F:      ; CCF
 	+Z80_PUT_0_CF
 	jmp ZVM_next
 
-Z80_instr_37:      ; SCF
+Z80_instr_37:                                                                  ; SCF
 
 	+Z80_PUT_0_HF
 	+Z80_PUT_0_NF
 	+Z80_PUT_1_CF
 	jmp ZVM_next
 
-Z80_instr_76:      ; HALT
+Z80_instr_76:                                                                  ; HALT
 
 	; Used to call BIOS routines
 	; XXX probably not the besta idea, GENCPC seems to do some relocations
@@ -59,14 +100,14 @@ Z80_instr_76:      ; HALT
 	tax
 	jmp (zvm_BIOS_vectable,x)
 
-Z80_instr_F3:      ; DI
+Z80_instr_F3:                                                                  ; DI
 
 	lda #$00
 	sta REG_IFF1
 	sta REG_IFF2
 	jmp ZVM_next
 
-Z80_instr_FB:      ; EI
+Z80_instr_FB:                                                                  ; EI
 
 	lda #Z80_PF
 	sta REG_IFF1