]> cloudbase.mooo.com Git - avrcpm.git/blobdiff - avr/8080int-t3-jmp.asm
* avr/Z80int-jmp.asm
[avrcpm.git] / avr / 8080int-t3-jmp.asm
index 7d24af2b6999be7e2957fd33dc204cae07f8cb06..2bcf3f19da6b25902ce80c6b048a467002a7d0a0 100644 (file)
@@ -33,7 +33,6 @@ z_e:  .byte   1
 z_h:   .byte   1
 z_l:   .byte   1
 
-
        .cseg
        
 ;Init z80
@@ -46,7 +45,6 @@ z80_init:
        printstring "Ok, CPU is live!"
        printnewline
 
-
 main:
 .if INS_DEBUG
        cbi     flags,trace
@@ -58,7 +56,6 @@ main:
 notraceon:
 .endif
 
-
 .if PRINT_PC
        cpi z_pch,DBG_TRACE_BOTTOM
        brlo noprintpc
@@ -229,13 +226,13 @@ do_fetch_sp:
 do_fetch_mbc:
        lds xh,z_b
        lds xl,z_c
-       mem_read_d opl
+       mem_read_d z_a
        fetch_end
 
 do_fetch_mde:
        lds xh,z_d
        lds xl,z_e
-       mem_read_d opl
+       mem_read_d z_a
        fetch_end
 
 do_fetch_mhl:
@@ -329,13 +326,13 @@ do_store_hl:
 do_store_mbc:
        lds xh,z_b
        lds xl,z_c
-       mem_write_s opl
+       mem_write_s z_a
        store_end
 
 do_store_mde:
        lds xh,z_d
        lds xl,z_e
-       mem_write_s opl
+       mem_write_s z_a
        store_end
 
 do_store_mhl:
@@ -417,10 +414,10 @@ opjumps:
        gen_opjmp op_dec
        gen_opjmp op_inc16
        gen_opjmp op_dec16
-       gen_opjmp op_rlc
-       gen_opjmp op_rrc
-       gen_opjmp op_rr
-       gen_opjmp op_rl
+       gen_opjmp op_rlca
+       gen_opjmp op_rrca
+       gen_opjmp op_rra
+       gen_opjmp op_rla
        gen_opjmp op_adda
        gen_opjmp op_adca
        gen_opjmp op_subfa
@@ -647,7 +644,6 @@ opjumps:
 .equ ZFL_N = 1
 .equ ZFL_C = 0
 
-
 .equ AVR_T = SREG_T
 .equ AVR_H = SREG_H
 .equ AVR_S = SREG_S
@@ -669,10 +665,9 @@ opjumps:
        lpm     @0,z    
 .endm
 
-.macro do_z80_flags_HP
+.macro do_z80_flags_V
 #if EM_Z80
        bmov    z_flags, ZFL_P, temp, AVR_V
-       bmov    z_flags, ZFL_H, temp, AVR_H
 #endif
 .endm
 
@@ -694,6 +689,19 @@ opjumps:
 #endif
 .endm
 
+.macro do_z80_flags_clear_HN
+#if EM_Z80
+       andi    z_flags,~((1<<ZFL_H)|(1<<ZFL_N))
+#endif
+.endm
+
+       
+.macro do_z80_flags_copy_HC
+#if EM_Z80
+       bmov    z_flags, ZFL_H, z_flags, ZFL_H
+#endif
+.endm
+
 .macro do_z80_flags_op_rotate
        ; must not change avr carry flag!
 #if EM_Z80
@@ -706,13 +714,12 @@ opjumps:
 .macro do_z80_flags_op_and
 #if EM_Z80
        ori     z_flags,(1<<ZFL_H)
-#else
-       ori     z_flags,(1<<ZFL_H)
 #endif
 .endm
 
 .macro do_z80_flags_op_or
 #if EM_Z80
+                       ;nothing to do
 #endif
 .endm
 
@@ -720,9 +727,9 @@ opjumps:
 ;----------------------------------------------------------------
 
 do_op_inv:
-       printstring "Invalid opcode @ PC="
-       movw   temp,z_pcl
-       lcall printhexw
+       sbiw    z_pcl,1
+       lcall printregs
+       printstring "Invalid opcode! "
 
 haltinv:
        rjmp haltinv
@@ -750,8 +757,8 @@ do_op_outa: ; out (opl),a
 .endif
        mov temp,z_a
        mov temp2,opl
-       rcall portWrite
-       op_end
+       lcall portWrite
+       ret
 
 ;----------------------------------------------------------------
 ;|Mnemonic  |SZHPNC|Description          |Notes                 |
@@ -769,7 +776,7 @@ do_op_in:   ; in a,(opl)
 .endif
 
        mov temp2,opl
-       rcall portRead
+       lcall portRead
        mov opl,temp
 
 .if PORT_DEBUG
@@ -790,25 +797,25 @@ do_op_in: ; in a,(opl)
 ;
 ; 
 do_op_inc:
-       inc     opl
-#if EM_Z80
+       ldi     temp,1
+       add     opl,temp
        in      temp, sreg
-#endif
-       andi    z_flags,(1<<ZFL_H)|(1<<ZFL_C)   ; preserve C-, and H-flag
+       andi    z_flags,(1<<ZFL_C)              ; preserve C-flag
        ldpmx   temp2, sz53p_tab, opl
        or      z_flags,temp2           ;
-       do_z80_flags_HP
-       op_end
+       bmov    z_flags, ZFL_H, temp, AVR_H
+       do_z80_flags_V  
+op_end
 
 do_op_inca:
-       inc     z_a
-#if EM_Z80
+       ldi     temp,1
+       add     z_a,temp
        in      temp, sreg
-#endif
-       andi    z_flags,(1<<ZFL_H)|(1<<ZFL_C)   ; preserve C-, and H-flag
+       andi    z_flags,(1<<ZFL_C)              ; preserve C-flag
        ldpmx   temp2, sz53p_tab, z_a
        or      z_flags,temp2           ;
-       do_z80_flags_HP
+       bmov    z_flags, ZFL_H, temp, AVR_H
+       do_z80_flags_V
        op_end
 
 ;----------------------------------------------------------------
@@ -823,26 +830,25 @@ do_op_inca:
 ;
 ;
 do_op_dec:
-       dec     opl
-#if EM_Z80
+       subi    opl,1
        in    temp, sreg
-#endif
-       andi    z_flags,(1<<ZFL_H)|(1<<ZFL_C)   ; preserve C-, and H-flag
+       andi    z_flags,(1<<ZFL_C)              ; preserve C-flag
        ldpmx   temp2, sz53p_tab, opl
        or      z_flags,temp2           ;
-       do_z80_flags_HP
+       bmov    z_flags, ZFL_H, temp, AVR_H
+       do_z80_flags_V
        do_z80_flags_set_N
        op_end
 
 do_op_deca:
-       dec     z_a
-#if EM_Z80
+       ldi     opl,1
+       sub     z_a,opl
        in    temp, sreg
-#endif
-       andi    z_flags,(1<<ZFL_H)|(1<<ZFL_C)   ; preserve C-, and H-flag
+       andi    z_flags,(1<<ZFL_C)              ; preserve C-flag
        ldpmx   temp2, sz53p_tab, z_a
        or      z_flags,temp2           ;
-       do_z80_flags_HP
+       bmov    z_flags, ZFL_H, temp, AVR_H
+       do_z80_flags_V
        do_z80_flags_set_N
        op_end
 
@@ -878,13 +884,14 @@ do_op_dec16:
 ;|RLCA      |---- *|Rotate Left Circular |A=A<-                 |
 ;
 ;
-do_op_rlc:
+do_op_rlca:
        ;Rotate Left Cyclical. All bits move 1 to the 
        ;left, the msb becomes c and lsb.
        do_z80_flags_op_rotate
-       lsl    opl
+       lsl     z_a
        brcc   do_op_rlc_noc
-       ori    opl, 1
+       ldi     temp,1
+       or      z_a,temp
        ori    z_flags, (1<<ZFL_C)
 do_op_rlc_noc:
        op_end
@@ -897,13 +904,14 @@ do_op_rlc_noc:
 ;|RRCA      |---- *|Rotate Right Circular|A=->A                 |
 ;
 ;
-do_op_rrc: 
+do_op_rrca
        ;Rotate Right Cyclical. All bits move 1 to the 
        ;right, the lsb becomes c and msb.
        do_z80_flags_op_rotate
-       lsr    opl
+       lsr     z_a
        brcc   do_op_rrc_noc
-       ori    opl, 0x80
+       ldi     temp,0x80
+       or      z_a,temp
        ori    z_flags, (1<<ZFL_C)
 do_op_rrc_noc:
        op_end
@@ -916,15 +924,15 @@ do_op_rrc_noc:
 ;|RRA       |---- *|Rotate Right Acc.    |A=->{CY,A}            |
 ;
 ; 
-do_op_rr: 
+do_op_rra
        ;Rotate Right. All bits move 1 to the right, the lsb 
        ;becomes c, c becomes msb.
        clc                             ; get z80 carry to avr carry
        sbrc    z_flags,ZFL_C
        sec
        do_z80_flags_op_rotate          ; (clear ZFL_C, doesn't change AVR_C)
-       bmov    z_flags,ZFL_C, opl,0    ; Bit 0 --> CY
-       ror     opl
+       bmov    z_flags,ZFL_C, z_a,0    ; Bit 0 --> CY
+       ror     z_a
        op_end
 
 ;----------------------------------------------------------------
@@ -935,15 +943,15 @@ do_op_rr:
 ;|RLA       |---- *|Rotate Left Acc.     |A={CY,A}<-            |
 ;
 ; 
-do_op_rl:
+do_op_rla:
        ;Rotate Left. All bits move 1 to the left, the msb 
        ;becomes c, c becomes lsb.
        clc
        sbrc z_flags,ZFL_C
         sec
        do_z80_flags_op_rotate          ; (clear ZFL_C, doesn't change AVR_C)
-       bmov    z_flags,ZFL_C, opl,7    ; Bit 7 --> CY
-       rol opl
+       bmov    z_flags,ZFL_C, z_a,7    ; Bit 7 --> CY
+       rol z_a
        op_end
 
 ;----------------------------------------------------------------
@@ -959,7 +967,8 @@ do_op_adda:
        in temp,sreg
        ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,P flag
        bmov    z_flags,ZFL_C, temp,AVR_C
-       do_z80_flags_HP
+       bmov    z_flags,ZFL_H, temp,AVR_H
+       do_z80_flags_V
        op_end
 
 ;----------------------------------------------------------------
@@ -978,7 +987,8 @@ do_op_adca:
        in temp,sreg
        ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,P
        bmov    z_flags,ZFL_C, temp,AVR_C
-       do_z80_flags_HP
+       bmov    z_flags,ZFL_H, temp,AVR_H
+       do_z80_flags_V
        op_end
 
 ;----------------------------------------------------------------
@@ -994,7 +1004,8 @@ do_op_subfa:
        in temp,sreg
        ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,P
        bmov    z_flags,ZFL_C, temp,AVR_C
-       do_z80_flags_HP
+       bmov    z_flags,ZFL_H, temp,AVR_H
+       do_z80_flags_V
        do_z80_flags_set_N
        op_end
 
@@ -1007,13 +1018,13 @@ do_op_subfa:
 
 ;
 do_op_cpfa:
-       mov temp,z_a
-       sub temp,opl
-       mov opl,temp
+       mov temp2,z_a
+       sub temp2,opl
        in temp,sreg
-       ldpmx   z_flags,sz53p_tab,opl           ;S,Z,P
+       ldpmx   z_flags,sz53p_tab,temp2         ;S,Z,P
        bmov    z_flags,ZFL_C, temp,AVR_C
-       do_z80_flags_HP
+       bmov    z_flags,ZFL_H, temp,AVR_H
+       do_z80_flags_V
        do_z80_flags_set_N
        op_end
 
@@ -1033,7 +1044,8 @@ do_op_sbcfa:
        in temp,sreg
        ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,P
        bmov    z_flags,ZFL_C, temp,AVR_C
-       do_z80_flags_HP
+       bmov    z_flags,ZFL_H, temp,AVR_H
+       do_z80_flags_V
        do_z80_flags_set_N
        op_end
 
@@ -1044,7 +1056,7 @@ do_op_sbcfa:
 ;|----------|SZHP C|---------- 8080 ----------------------------|
 ;|AND s     |**-P 0|Logical AND          |A=A&s                 |
 ;
-; TODO H-Flag
+;
 do_op_anda:
        and z_a,opl                             ;
        ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,P,N,C
@@ -1059,7 +1071,7 @@ do_op_anda:
 ;|----------|SZHP C|---------- 8080 ----------------------------|
 ;|OR s      |**-P00|Logical inclusive OR |A=Avs                 |
 ;
-; TODO: H-Flag
+;
 do_op_ora:
        or z_a,opl
        ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,H,P,N,C
@@ -1073,7 +1085,7 @@ do_op_ora:
 ;|----------|SZHP C|---------- 8080 ----------------------------|
 ;|XOR s     |**-P 0|Logical Exclusive OR |A=Axs                 |
 ;
-; TODO: H-Flag
+;
 do_op_xora:
        eor z_a,opl
        ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,H,P,N,C
@@ -1150,11 +1162,11 @@ do_op_rmem8:
 ;  and subtraction operations. For addition (ADD, ADC, INC) or subtraction
 ;  (SUB, SBC, DEC, NEC), the following table indicates the operation performed:
 ;
-; -------------------------------------------------------------------------------
-; |          | C Flag  | HEX value in | H Flag | HEX value in | Number  | C flag|
-; | Operation| Before  | upper digit  | Before | lower digit  | added   | After |
-; |          | DAA     | (bit 7-4)    | DAA    | (bit 3-0)    | to byte | DAA   |
-; |-----------------------------------------------------------------------------|
+; -------------------------------------------------------------------
+; |       |C Flag |HEX value in|H Flag |HEX val in | Number |C flag |
+; |  Oper |Before |upper digit |Before |lower digit| added  |After  |
+; |       |DAA    |(bit 7-4)   |DAA    |(bit 3-0)  | to A   |DAA    |
+; |-------+-------+------------+-------+-----------+--------+-------|
 ; |          |    0    |     0-9      |   0    |     0-9      |   00    |   0   |
 ; |   ADD    |    0    |     0-8      |   0    |     A-F      |   06    |   0   |
 ; |          |    0    |     0-9      |   1    |     0-3      |   06    |   0   |
@@ -1164,111 +1176,134 @@ do_op_rmem8:
 ; |          |    1    |     0-2      |   0    |     0-9      |   60    |   1   |
 ; |          |    1    |     0-2      |   0    |     A-F      |   66    |   1   |
 ; |          |    1    |     0-3      |   1    |     0-3      |   66    |   1   |
-; |-----------------------------------------------------------------------------|
+; |-------+-------+------------+-------+-----------+--------+-------|
 ; |   SUB    |    0    |     0-9      |   0    |     0-9      |   00    |   0   |
 ; |   SBC    |    0    |     0-8      |   1    |     6-F      |   FA    |   0   |
 ; |   DEC    |    1    |     7-F      |   0    |     0-9      |   A0    |   1   |
 ; |   NEG    |    1    |     6-F      |   1    |     6-F      |   9A    |   1   |
-; |-----------------------------------------------------------------------------|
-;
-; Flags:
-;     C:   See instruction.
+; -------------------------------------------------------------------
+;
+; The H flag is affected as follows:
+;
+; ---------------------
+; | N | H | low   |H' |
+; |   |   |nibble |   |  
+; |---+---+-------+---|
+; | 0 | * |  0-9  | 0 | 
+; | 0 | * |  a-f  | 1 | 
+; | 1 | 0 |   *   | 0 | 
+; | 1 | 1 |  6-f  | 0 | 
+; | 1 | 1 |  0-5  | 1 | 
+; ---------------------
+;
+; Ohter flags:
 ;     N:   Unaffected.
 ;     P/V: Set if Acc. is even parity after operation, reset otherwise.
-;     H:   See instruction.
 ;     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:
-       ldi     oph,0                           ; what to add
-       sbrc    z_flags,ZFL_H                   ; if H-Flag
-       rjmp    op_da_06
-       mov     temp,opl
-       andi    temp,0x0f                       ; ... or lower digit > 9
-       cpi     temp,0x0a
-       brlo    op_da_06n
-op_da_06:                              
-       ori     oph,0x06
-op_da_06n:                             
-       sbrc    z_flags,(1<<ZFL_C)
-       rjmp    op_da_60
-       cpi     opl,0xa0
-       brlo    op_da_60n
-op_da_60:                              
-       ori     oph,0x60
-op_da_60n:                             
-       cpi     opl,0x9a
-       brlo    op_da_99n
-       ori     z_flags,(1<<ZFL_C); set C
-op_da_99n:
-       sbrs    z_flags,ZFL_N                   ; if sub-op
-       rjmp    op_da_add                       ; then
-       sub     opl,oph
-       rjmp    op_da_ex
-op_da_add:                                     ; else add-op
-       cpi     opl,0x91
-       brlo    op_da_60n2
-       mov     temp,opl
-       andi    temp,0x0f
-       cpi     temp,0x0a
-       brlo    op_da_60n2
-       ori     oph,0x60
-op_da_60n2:
-       add     opl,oph
-op_da_ex:
-       in      temp,SREG       
-       sbrc    temp,AVR_H
-       ori     z_flags,(1<<ZFL_C)
-       andi    z_flags,(1<<ZFL_N)|(1<<ZFL_C)   ; preserve C,N
-       ldpmx   temp2, sz53p_tab, opl           ; get S,Z,P
-       or      z_flags,temp2
-       bmov    z_flags,ZFL_H, temp,AVR_H       ; H  (?)
+
+#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
        op_end
+
+#if EM_Z80
+
+op_da_sub:                                     ;else (sub-op)
+       rcall do_op_inv                         ;  TODO: !
+       op_end                                  ;endif
+#endif
+
 #else
 
 do_op_da:
-       sbrc    z_flags,ZFL_N                   ; if add-op     
-       rjmp    do_op_da_sub                    ; then
-       ldi             temp2,0                 ;
-       mov             temp,opl                ;
-       andi    temp,0x0f                       ;
-       cpi             temp,0x0a               ;       if lower digit > 9
-       brlo    do_op_da_h                      ;
-       ori             temp2,0x06              ;               add 6 to lower digit
-do_op_da_h:                                    ;
-       sbrc    z_flags,ZFL_H                   ;   ... or H-Flag
-       ori             temp2,0x06              ;
-       add             opl,temp2               ;
-
-       ldi             temp2,0                 ;
-       mov             temp,opl                ;
-       andi    temp,0xf0                       ;
-       cpi             temp,0xa0               ;
-       brlo    do_op_da_c                      ;
-       ori             temp2,0x60              ;
-do_op_da_c:                                    ; else sub-op
-       sbrc    z_flags,ZFL_C                   ;
-       ori             temp2,0x60              ;
-       andi    z_flags, ~( (1<<ZFL_S) | (1<<ZFL_Z) | (1<<ZFL_H) )
-       add             opl,temp2               ;
-       in              temp,SREG               ;
-       bst             temp,AVR_Z              ;Z-Flag
-       bld             z_flags,ZFL_Z           ;
-       bst             temp,AVR_N              ;S-Flag
-       bst             z_flags,ZFL_S           ;
-       sbrc    temp2,5                         ;C-Flag, set if 0x06 added
-       ori             z_flags,(1<<ZFL_C)      ;
-                                               ;H-Flag?
-       op_end
-       
-do_op_da_sub:                                  ;TODO:
-       rcall do_op_inv
+       ldi     temp2,0                         ;new C and H flag
+       ldi     oph,0                           ;oph: what to add
+
+       sbrc    z_flags,ZFL_N                   ;if add-op      
+       rjmp    op_da_sub                       ;then
+op_da_add:
+       mov     temp,opl                        ;  |
+       andi    temp,0x0f                       ;  |
+       cpi     temp,0x0a                       ;  if (lower nibble >= 0x0A)
+       brlo    op_da_a10                       ;  |
+       ori     oph,0x06                        ;    add 6
+       ori     temp2,(1<<ZFL_H)                ;    set new H flag
+
+       sbrc    z_flags,ZFL_C                   ;    |
+       rjmp    op_da_a02                       ;    if (C flag ...
+       cpi     opl,0x90                        ;    |... or upper nibble >= 0x90)
+       brlo    op_da_a03                       ;    |
+op_da_a02:                             
+       ori     oph,0x60                        ;      add 0x60
+       ori     temp2,(1<<ZFL_C)                ;      set new C flag
+op_da_a03:                                     ;    endif
+       rjmp    op_da_ae
+op_da_a10:                                     ;  else (lower nibble is 0x09 or lower)
+       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:                             
+       ori     oph,0x60                        ;      add 0x60
+       ori     temp2,(1<<ZFL_C)                ;      set new C flag
+op_da_a13:
+       sbrs    z_flags,ZFL_H                   ;    if (H flag)
+       rjmp    op_da_ae                        ;    |
+       ori     oph,0x06                        ;      add 0x06
+       mov     temp,opl                        ;      |
+       andi    temp,0x0f                       ;      |
+       cpi     temp,0x06                       ;      if (lower nibble >= 0x0A)
+       brsh    op_da_ae                        ;      |
+       ori     temp2,(1<<ZFL_H)                ;        set new H flag
+                                               ;      endif
+                                               ;    endif
+op_da_ae:
+       add     opl,oph
+       ldpmx   z_flags, sz53p_tab, opl         ; get S,Z,P flag
+       or      z_flags,temp2                   ; merge new C and H flag
        op_end
+
+op_da_sub:                                     ;else (sub-op)
+       rcall do_op_inv                         ;  TODO: !
+       op_end                                  ;endif
 #endif
 
+
 ;----------------------------------------------------------------
 ;|Mnemonic  |SZHPNC|Description          |Notes                 |
 ;----------------------------------------------------------------
@@ -1277,20 +1312,20 @@ do_op_da_sub:                                   ;TODO:
 ;
 ;
 do_op_scf:
-       andi    z_flags,~((1<<ZFL_H)|(1<<ZFL_N))
+       do_z80_flags_clear_HN
        ori     z_flags,(1<<ZFL_C)
        op_end
 
 ;----------------------------------------------------------------
 ;|Mnemonic  |SZHPNC|Description          |Notes                 |
 ;----------------------------------------------------------------
-;|CCF       |--?-0*|Complement Carry Flag|CY=~CY                |
+;|CCF       |--?-0*|Complement Carry Flag|CY=~CY, HC=previous CY|
 ;|----------|SZHP C|---------- 8080 ----------------------------|
-;|SCF       |---- 1|Set Carry Flag       |CY=1                  |
+;|CCF       |---- 1|Set Carry Flag       |CY=1                  |
 ;
-;TODO: H-Flag
 do_op_ccf:
        do_z80_flags_clear_N
+       do_z80_flags_copy_HC
        ldi temp,(1<<ZFL_C)
        eor z_flags,temp
        op_end
@@ -1510,36 +1545,36 @@ do_op_ifm: ;sign negative, aka s=1
 todo_table:
 instr  do_fetch_nop,   op_nop,         do_store_nop    ;00             ;NOP
 instr  do_fetch_DIR16, op_nop,         do_store_BC     ;01 nn nn       ;LD BC,nn
-instr  do_fetch_A,     op_nop,         do_store_MBC    ;02             ;LD (BC),A
+instr  do_fetch_nop,   op_nop,         do_store_MBC    ;02             ;LD (BC),A
 instr  do_fetch_BC,    op_INC16,       do_store_BC     ;03             ;INC BC
 instr  do_fetch_B,     op_INC,         do_store_B      ;04             ;INC B
 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_A,     op_RLC,         do_store_A      ;07             ;RLCA
+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_MBC,   op_nop,         do_store_A      ;0A             ;LD A,(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
 instr  do_fetch_C,     op_DEC,         do_store_C      ;0D             ;DEC C
 instr  do_fetch_DIR8,  op_nop,         do_store_C      ;0E nn          ;LD C,n
-instr  do_fetch_A,     op_RRC,         do_store_A      ;0F             ;RRCA
+instr  do_fetch_nop,   op_RRCA,        do_store_nop    ;0F             ;RRCA
 instr  do_fetch_nop,   op_INV,         do_store_nop    ;10 oo          ;DJNZ o
 instr  do_fetch_DIR16, op_nop,         do_store_DE     ;11 nn nn       ;LD DE,nn
-instr  do_fetch_A,     op_nop,         do_store_MDE    ;12             ;LD (DE),A
+instr  do_fetch_nop,   op_nop,         do_store_MDE    ;12             ;LD (DE),A
 instr  do_fetch_DE,    op_INC16,       do_store_DE     ;13             ;INC DE
 instr  do_fetch_D,     op_INC,         do_store_D      ;14             ;INC D
 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_A,     op_RL,          do_store_A      ;17             ;RLA
+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_MDE,   op_nop,         do_store_A      ;1A             ;LD A,(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
 instr  do_fetch_E,     op_DEC,         do_store_E      ;1D             ;DEC E
 instr  do_fetch_DIR8,  op_nop,         do_store_E      ;1E nn          ;LD E,n
-instr  do_fetch_A,     op_RR,          do_store_A      ;1F             ;RRA
+instr  do_fetch_nop,   op_RRA,         do_store_nop    ;1F             ;RRA
 instr  do_fetch_nop,   op_INV,         do_store_nop    ;20 oo          ;JR NZ,o
 instr  do_fetch_DIR16, op_nop,         do_store_HL     ;21 nn nn       ;LD HL,nn
 instr  do_fetch_DIR16, op_STHL,        do_store_nop    ;22 nn nn       ;LD (nn),HL
@@ -1572,7 +1607,7 @@ instr     do_fetch_nop,   op_INCA,        do_store_nop    ;3C             ;INC A
 instr  do_fetch_nop,   op_DECA,        do_store_nop    ;3D             ;DEC A
 instr  do_fetch_DIR8,  op_nop,         do_store_A      ;3E nn          ;LD A,n
 instr  do_fetch_nop,   op_CCF,         do_store_nop    ;3F             ;CCF (Complement Carry Flag, gvd)
-instr  do_fetch_B,     op_nop,         do_store_B      ;40             ;LD B,B
+instr  do_fetch_nop,   op_nop,         do_store_nop    ;40             ;LD B,B
 instr  do_fetch_C,     op_nop,         do_store_B      ;41             ;LD B,C
 instr  do_fetch_D,     op_nop,         do_store_B      ;42             ;LD B,D
 instr  do_fetch_E,     op_nop,         do_store_B      ;43             ;LD B,E
@@ -1581,7 +1616,7 @@ instr     do_fetch_L,     op_nop,         do_store_B      ;45             ;LD B,L
 instr  do_fetch_MHL,   op_nop,         do_store_B      ;46             ;LD B,(HL)
 instr  do_fetch_A,     op_nop,         do_store_B      ;47             ;LD B,A
 instr  do_fetch_B,     op_nop,         do_store_C      ;48             ;LD C,B
-instr  do_fetch_C,     op_nop,         do_store_C      ;49             ;LD C,C
+instr  do_fetch_nop,   op_nop,         do_store_nop    ;49             ;LD C,C
 instr  do_fetch_D,     op_nop,         do_store_C      ;4A             ;LD C,D
 instr  do_fetch_E,     op_nop,         do_store_C      ;4B             ;LD C,E
 instr  do_fetch_H,     op_nop,         do_store_C      ;4C             ;LD C,H
@@ -1590,7 +1625,7 @@ instr     do_fetch_MHL,   op_nop,         do_store_C      ;4E             ;LD C,(HL)
 instr  do_fetch_A,     op_nop,         do_store_C      ;4F             ;LD C,A
 instr  do_fetch_B,     op_nop,         do_store_D      ;50             ;LD D,B
 instr  do_fetch_C,     op_nop,         do_store_D      ;51             ;LD D,C
-instr  do_fetch_D,     op_nop,         do_store_D      ;52             ;LD D,D
+instr  do_fetch_nop,   op_nop,         do_store_nop    ;52             ;LD D,D
 instr  do_fetch_E,     op_nop,         do_store_D      ;53             ;LD D,E
 instr  do_fetch_H,     op_nop,         do_store_D      ;54             ;LD D,H
 instr  do_fetch_L,     op_nop,         do_store_D      ;55             ;LD D,L
@@ -1599,7 +1634,7 @@ instr     do_fetch_A,     op_nop,         do_store_D      ;57             ;LD D,A
 instr  do_fetch_B,     op_nop,         do_store_E      ;58             ;LD E,B
 instr  do_fetch_C,     op_nop,         do_store_E      ;59             ;LD E,C
 instr  do_fetch_D,     op_nop,         do_store_E      ;5A             ;LD E,D
-instr  do_fetch_E,     op_nop,         do_store_E      ;5B             ;LD E,E
+instr  do_fetch_nop,   op_nop,         do_store_nop    ;5B             ;LD E,E
 instr  do_fetch_H,     op_nop,         do_store_E      ;5C             ;LD E,H
 instr  do_fetch_L,     op_nop,         do_store_E      ;5D             ;LD E,L
 instr  do_fetch_MHL,   op_nop,         do_store_E      ;5E             ;LD E,(HL)
@@ -1608,7 +1643,7 @@ instr     do_fetch_B,     op_nop,         do_store_H      ;60             ;LD H,B
 instr  do_fetch_C,     op_nop,         do_store_H      ;61             ;LD H,C
 instr  do_fetch_D,     op_nop,         do_store_H      ;62             ;LD H,D
 instr  do_fetch_E,     op_nop,         do_store_H      ;63             ;LD H,E
-instr  do_fetch_H,     op_nop,         do_store_H      ;64             ;LD H,H
+instr  do_fetch_nop,   op_nop,         do_store_nop    ;64             ;LD H,H
 instr  do_fetch_L,     op_nop,         do_store_H      ;65             ;LD H,L
 instr  do_fetch_MHL,   op_nop,         do_store_H      ;66             ;LD H,(HL)
 instr  do_fetch_A,     op_nop,         do_store_H      ;67             ;LD H,A
@@ -1617,7 +1652,7 @@ instr     do_fetch_C,     op_nop,         do_store_L      ;69             ;LD L,C
 instr  do_fetch_D,     op_nop,         do_store_L      ;6A             ;LD L,D
 instr  do_fetch_E,     op_nop,         do_store_L      ;6B             ;LD L,E
 instr  do_fetch_H,     op_nop,         do_store_L      ;6C             ;LD L,H
-instr  do_fetch_L,     op_nop,         do_store_L      ;6D             ;LD L,L
+instr  do_fetch_nop,   op_nop,         do_store_nop    ;6D             ;LD L,L
 instr  do_fetch_MHL,   op_nop,         do_store_L      ;6E             ;LD L,(HL)
 instr  do_fetch_A,     op_nop,         do_store_L      ;6F             ;LD L,A
 instr  do_fetch_B,     op_nop,         do_store_MHL    ;70             ;LD (HL),B
@@ -1635,7 +1670,7 @@ instr     do_fetch_E,     op_nop,         do_store_A      ;7B             ;LD A,E
 instr  do_fetch_H,     op_nop,         do_store_A      ;7C             ;LD A,H
 instr  do_fetch_L,     op_nop,         do_store_A      ;7D             ;LD A,L
 instr  do_fetch_MHL,   op_nop,         do_store_A      ;7E             ;LD A,(HL)
-instr  do_fetch_A,     op_nop,         do_store_A      ;7F             ;LD A,A
+instr  do_fetch_nop,   op_nop,         do_store_nop    ;7F             ;LD A,A
 instr  do_fetch_B,     op_ADDA,        do_store_nop    ;80             ;ADD A,B
 instr  do_fetch_C,     op_ADDA,        do_store_nop    ;81             ;ADD A,C
 instr  do_fetch_D,     op_ADDA,        do_store_nop    ;82             ;ADD A,D
@@ -1765,6 +1800,7 @@ instr     do_fetch_nop,   op_INV,         do_store_nop    ;FD             ;(Z80 specific)
 instr  do_fetch_DIR8,  op_CPFA,        do_store_nop    ;FE nn          ;CP n
 instr  do_fetch_RST,   op_nop,         do_store_CALL   ;FF             ;RST 38H
 
+
 ;----------------------------------------------------------------
 ; Lookup table, stolen from z80ex, Z80 emulation library.
 ; http://z80ex.sourceforge.net/