]> cloudbase.mooo.com Git - avrcpm.git/blobdiff - avr/Z80int-jmp.asm
* Z80/8080 registers BC, DE, HL moved from RAM to AVR CPU registers. 'temp4' removed.
[avrcpm.git] / avr / Z80int-jmp.asm
index e2f8ea458ad55cec1b81fb10d1b72b50a9a06a29..675b287b8502b4940c808f1dca667c68adea0113 100644 (file)
 ;    $Id$
 ;
 
+#if EM_Z80
+
        .dseg
 z_regs:        
-z_b:   .byte   1
-z_c:   .byte   1
-z_d:   .byte   1
-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
+z_c2:
+       .equ    oz_c2 = z_c2 - z_regs
+       .byte   1
+z_b2:
+       .equ    oz_b2 = z_b2 - z_regs
+       .byte   1
+z_e2:
+       .equ    oz_e2 = z_e2 - z_regs
+       .byte   1
+z_d2:
+       .equ    oz_d2 = z_d2 - z_regs
+       .byte   1
+z_l2:
+       .equ    oz_l2 = z_l2 - z_regs
+       .byte   1
+z_h2:
+       .equ    oz_h2 = z_h2 - z_regs
+       .byte   1
+z_f2:
+       .equ    oz_f2 = z_f2 - z_regs
+       .byte   1
+z_a2:
+       .equ    oz_a2 = z_a2 - z_regs
+       .byte   1
+
+z_xl:
+       .equ    oz_xl = z_xl - z_regs
+       .byte   1
+z_xh:
+       .equ    oz_xh = z_xh - z_regs
+       .byte   1
+z_yl:
+       .equ    oz_yl = z_yl - z_regs
+       .byte   1
+z_yh:
+       .equ    oz_yh = z_yh - z_regs
+       .byte   1
+z_i:
+       .equ    oz_i  = z_i - z_regs
+       .byte   1
+z_r:
+       .equ    oz_r  = z_r - z_regs
+       .byte   1
+
+z_istat:
+       .equ    oz_istat = z_istat - z_regs
+       .byte   1
 
        .equ IM_MASK = 0x03             ;Mask IM 0..2
        .equ IM0     = 0
@@ -84,7 +83,6 @@ z_istat: .byte        1
 
        .equ IFF1 = 2                   ;IFF1 Flag
        .equ IFF2 = 3                   ;IFF2 Flag
-
 #endif
 
        .cseg
@@ -94,7 +92,6 @@ z80_init:
        ldiw    z_pc,IPLADDR
        ldiw    y,z_regs
 
-       cbi     flags,trace
        clr     intstat
 
        printnewline
@@ -124,7 +121,7 @@ noprintpc:
 
        ;TODO: hier kommt die Interruptbehandlung rein
 
-       cpse    intstat,_0              ;Fast path if no trace, int, break, ...
+       cpse    intstat,_0                      ;Fast path if no trace, int, break, ...
        rjmp    int_test
 
 int_instr:
@@ -137,6 +134,8 @@ int_instr:
 int_test:
        sbrs    intstat,i_trace
        rjmp    int_notrace
+       sbrs    intstat,i_halt
+       rjmp    int_notrace
        cpi     z_pch,DBG_TRACE_BOTTOM
        brlo    int_notrace
        cpi     z_pch,DBG_TRACE_TOP
@@ -372,23 +371,25 @@ do_fetch_rst:
 ;      ret
 
 .macro m_do_fetch_b
-       ldd opl,y+oz_b
+       mov     opl,z_b
 .endm
 
 .equ do_fetch_b = 0
+;      mov     opl,z_b
 ;      ldd opl,y+oz_b
 ;      ret
 
 .macro m_do_fetch_c
-       ldd     opl,y+oz_c
+       mov     opl,z_c
 .endm
 
 .equ do_fetch_c = 0
+;      mov     opl,z_c
 ;      ldd     opl,y+oz_c
 ;      ret
 
 .macro m_do_fetch_d
-       ldd     opl,y+oz_d
+       mov     opl,z_d
 .endm
 
 .equ do_fetch_d = 0
@@ -396,7 +397,7 @@ do_fetch_rst:
 ;      ret
 
 .macro m_do_fetch_e
-       ldd     opl,y+oz_e
+       mov     opl,z_e
 .endm
 
 .equ do_fetch_e = 0
@@ -404,41 +405,50 @@ do_fetch_rst:
 ;      ret
 
 .macro m_do_fetch_h
-       ldd     opl,y+oz_h
+       mov     opl,z_h
 .endm
 
 .equ do_fetch_h = 0
-;      ldd     opl,y+oz_h
+;      mov     opl,z_h
 ;      ret
 
 .macro m_do_fetch_l
-       ldd     opl,y+oz_l
+       mov     opl,z_l
 .endm
 
 .equ do_fetch_l = 0
-;      ldd     opl,y+oz_l
+;      mov     opl,z_l
 ;      ret
 
 do_fetch_af:
-       mov opl,z_flags
-       mov oph,z_a
+       movw    opl,z_flags
        ret
 
-do_fetch_bc:
-       ldd     opl,y+oz_c
-       ldd     oph,y+oz_b
-       ret
+.macro m_do_fetch_bc
+       movw    opl,z_c
+.endm
 
-do_fetch_de:
-       ldd     opl,y+oz_e
-       ldd     oph,y+oz_d
-       ret
+.equ do_fetch_bc = 0
+;      movw    opl,z_c
+;      ret
+
+.macro m_do_fetch_de
+       movw    opl,z_e
+.endm
 
-do_fetch_hl:
-       ldd     opl,y+oz_l
-       ldd     oph,y+oz_h
+.equ do_fetch_de = 0
+;      ldd     opl,y+oz_e
+;      ldd     oph,y+oz_d
        ret
 
+.macro m_do_fetch_hl
+       movw    opl,z_l
+.endm
+
+.equ do_fetch_hl = 0
+;      movw    opl,z_l
+;      ret
+
 .macro m_do_fetch_sp
        movw opl,z_spl
 .endm
@@ -448,20 +458,19 @@ do_fetch_hl:
 ;      ret
 
 do_fetch_mbc:
-       ldd     xh,y+oz_b
-       ldd     xl,y+oz_c
+       movw    x,z_c
        mem_read_d z_a
        ret
 
 do_fetch_mde:
-       ldd     xh,y+oz_d
-       ldd     xl,y+oz_e
+       movw    x,z_e
+;      ldd     xh,y+oz_d
+;      ldd     xl,y+oz_e
        mem_read_d z_a
        ret
 
 do_fetch_mhl:
-       ldd     xh,y+oz_h
-       ldd     xl,y+oz_l
+       movw    x,z_l
        mem_read_d opl
        ret
 
@@ -499,64 +508,61 @@ do_store_a:
 ;.endm
 ;.equ do_store_b = 0
 do_store_b:
-       std     y+oz_b,opl
+       mov     z_b,opl
        ret
 
 do_store_c:
-       std     y+oz_c,opl
+       mov     z_c,opl
        ret
 
 do_store_d:
-       std     y+oz_d,opl
+       mov     z_d,opl
        ret
 
 do_store_e:
-       std     y+oz_e,opl
+       mov     z_e,opl
        ret
 
 do_store_h:
-       std     y+oz_h,opl
+       mov     z_h,opl
        ret
 
 do_store_l:
-       std     y+oz_l,opl
+       mov     z_l,opl
        ret
 
 do_store_af:
-       mov z_a,oph
-       mov z_flags,opl
+       movw z_flags,opl
        ret
 
 do_store_bc:
-       std     y+oz_b,oph
-       std     y+oz_c,opl
+       movw    z_c,opl
        ret
 
 do_store_de:
-       std     y+oz_d,oph
-       std     y+oz_e,opl
+       movw    z_e,opl
+;      std     y+oz_d,oph
+;      std     y+oz_e,opl
        ret
 
 do_store_hl:
-       std     y+oz_h,oph
-       std     y+oz_l,opl
+       movw    z_l,opl
        ret
 
 do_store_mbc:
-       ldd     xh,y+oz_b
-       ldd     xl,y+oz_c
+       movw    x,z_c
        mem_write_s z_a
        ret
 
 do_store_mde:
-       ldd     xh,y+oz_d
-       ldd     xl,y+oz_e
+       movw    x,z_e
+;      ldd     xh,y+oz_d
+;      ldd     xl,y+oz_e
        mem_write_s z_a
        ret
 
 do_store_mhl:
-       ldd     xh,y+oz_h
-       ldd     xl,y+oz_l
+       movw    x,z_l
        mem_write_s opl
        ret
 
@@ -1011,6 +1017,19 @@ dbg_op_ina_2:
 
 do_op_inc:
 #if EM_Z80
+#if 1
+       andi    z_flags,(1<<ZFL_C)              ; preserve C-, Clear N-flag
+       subi    opl,-1
+       in      temp,sreg
+       sbrc    temp,AVR_N
+       sbr     z_flags,(1<<ZFL_S)
+       sbrc    temp,AVR_Z
+       sbr     z_flags,(1<<ZFL_Z)
+       sbrs    temp,AVR_H
+       sbr     z_flags,(1<<ZFL_H)
+       sbrc    temp,AVR_V
+       sbr     z_flags,(1<<ZFL_P)
+#else
        andi    z_flags,(1<<ZFL_C)              ; preserve C-, Clear N-flag
        ldi     temp,1
        add     opl,temp
@@ -1019,6 +1038,7 @@ do_op_inc:
        bmov    z_flags,ZFL_Z, temp,AVR_Z
        bmov    z_flags,ZFL_H, temp,AVR_H
        bmov    z_flags,ZFL_P, temp,AVR_V
+#endif
 #else /* 8080 */
        andi    z_flags,(1<<ZFL_C)|(1<<ZFL_H)   ; preserve C- and H-flag
        inc     opl
@@ -1027,15 +1047,24 @@ do_op_inc:
 #endif
        ret
 
+#if 0
+       bst     z_flags,ZFL_C                   ; save C flag
+       subi    opl,-1
+       in      temp,sreg
+       ldpmx   z_flags,flagmap_tab,temp        
+       bld     z_flags,ZFL_C
+       ret
+#endif
+
 do_op_inca:
 #if EM_Z80
        andi    z_flags,(1<<ZFL_C)              ; preserve C-, Clear N-flag
-       ldi     temp,1
-       add     z_a,temp
+       subi    z_a,-1
        in      temp,sreg
        bmov    z_flags,ZFL_S, temp,AVR_N
        bmov    z_flags,ZFL_Z, temp,AVR_Z
-       bmov    z_flags,ZFL_H, temp,AVR_H
+       sbrs    temp,AVR_H
+       sbr     z_flags,(1<<ZFL_H)
        bmov    z_flags,ZFL_P, temp,AVR_V
 #else /* 8080 */
        andi    z_flags,(1<<ZFL_C)|(1<<ZFL_H)   ; preserve C- and H-flag
@@ -1049,8 +1078,8 @@ do_op_inca:
 ;|Mnemonic  |SZHPNC|Description          |Notes                 |
 ;----------------------------------------------------------------
 ;|DEC r     |***V1-|Decrement            |s=s-1                 |
-;|DEC [HL]  |***V0-|Increment            |[HL]=[HL]-1           |
-;|DEC [xx+d]|***V0-|Increment            |[xx+d]=[xx+d]-1       |
+;|DEC [HL]  |***V1-|Increment            |[HL]=[HL]-1           |
+;|DEC [xx+d]|***V1-|Increment            |[xx+d]=[xx+d]-1       |
 ;|----------|SZHP C|---------- 8080 ----------------------------|
 ;|DEC r     |**-P -|Increment            |r=r-1                 |
 ;|DEC [HL]  |**-P -|Increment            |[HL]=[HL]-1           |
@@ -1075,8 +1104,7 @@ do_op_dec:
 
 do_op_deca:
 #if EM_Z80
-       ldi     temp,1
-       sub     z_a,temp
+       subi    z_a,1
        in      temp,sreg
        bmov    z_flags,ZFL_S, temp,AVR_N
        bmov    z_flags,ZFL_Z, temp,AVR_Z
@@ -1104,6 +1132,21 @@ do_op_inc16:
        sbci    oph,high(-1)
        ret
 
+do_op_incHL:
+       sub     z_l,_255
+       sbc     z_h,_255
+       ret
+
+do_op_incDE:
+       sub     z_e,_255
+       sbc     z_d,_255
+       ret
+
+do_op_incBC:
+       sub     z_c,_255
+       sbc     z_b,_255
+       ret
+
 ;----------------------------------------------------------------
 ;|Mnemonic  |SZHPNC|Description          |Notes                 |
 ;----------------------------------------------------------------
@@ -1116,6 +1159,21 @@ do_op_dec16:
        sbci   oph, 0
        ret
 
+do_op_decHL:
+       add     z_l,_255
+       adc     z_h,_255
+       ret
+
+do_op_decDE:
+       add     z_e,_255
+       adc     z_d,_255
+       ret
+
+do_op_decBC:
+       add     z_c,_255
+       adc     z_b,_255
+       ret
+
 ;----------------------------------------------------------------
 ;|Mnemonic  |SZHPNC|Description          |Notes                 |
 ;----------------------------------------------------------------
@@ -1341,12 +1399,8 @@ do_op_xora:
 ;
 ;
 do_op_addhl:
-       ldd     temp,y+oz_l
-       ldd     temp2,y+oz_h
-       add     opl,temp
-       adc     oph,temp2
-       std     y+oz_l,opl
-       std     y+oz_h,oph
+       add     z_l,opl
+       adc     z_h,oph
        in      temp,sreg
        bmov    z_flags,ZFL_C, temp,AVR_C
        do_z80_flags_H
@@ -1361,11 +1415,9 @@ do_op_addhl:
 ;
 do_op_sthl: ;store hl to mem loc in opl:h
        movw    xl,opl
-       ldd     temp,y+oz_l
-       mem_write
+       mem_write_s z_l
        adiw    xl,1
-       ldd     temp,y+oz_h
-       mem_write
+       mem_write_s z_h
        ret
 
 ;----------------------------------------------------------------
@@ -1720,11 +1772,9 @@ do_op_pop16:
 ;-----------------------------Z80--------------------------------
 ; 
 do_op_exhl:
-       ldd     temp,y+oz_l
-       ldd     temp2,y+oz_h
-       std     y+oz_l,opl
-       std     y+oz_h,oph
-       movw opl,temp
+       movw    temp,z_l
+       movw    z_l,opl
+       movw    opl,temp
        ret
 
 ;----------------------------------------------------------------
@@ -1887,9 +1937,7 @@ do_op_ifm: ;sign negative, aka s=1
 
                                ; (Joe G.)
 do_op_DJNZ:                    ; decremt B, jump B=0
-       ldd     temp,y+oz_b     ; B in temp
-       dec     temp            ; temp decrementieren
-       std     y+oz_b,temp     ; temp in B
+       dec     z_b             ; B decrementieren
        breq    do_op_DJNZ_Z    ; bei B=0
        subi    opl, 0x80       ; z_pc + e im Zweierkomplement
        subi    z_pcl,0x80
@@ -1902,9 +1950,7 @@ do_op_DJNZ_Z:
 #else
 
 do_op_djnz:
-       ldd     temp,y+oz_b
-       dec     temp
-       std     y+oz_b,temp
+       dec     z_b
        brne    opdjnze
        pop     temp                            ; nix tun
        pop     temp                            ; direkt zurueck zu main        
@@ -1934,6 +1980,29 @@ do_op_EXAF:
 ;|EXX       |------|Exchange             |qq<->qq'   (except AF)|
 
 
+#if 1
+
+do_op_EXX:
+       ldd     temp ,y+oz_c2
+       ldd     temp2,y+oz_b2
+       std     y+oz_c2,z_c
+       std     y+oz_b2,z_b
+       movw    z_c,temp
+
+       ldd     temp ,y+oz_e2
+       ldd     temp2,y+oz_d2
+       std     y+oz_e2,z_e
+       std     y+oz_d2,z_d
+       movw    z_e,temp
+
+       ldd     temp ,y+oz_l2
+       ldd     temp2,y+oz_h2
+       std     y+oz_l2,z_l
+       std     y+oz_h2,z_h
+       movw    z_l,temp
+       ret
+#else
+
 do_op_EXX:
        ldiw    z,z_b
        ldi     temp3,6
@@ -1946,6 +2015,8 @@ opexx_loop:
        brne    opexx_loop
        ret
 
+#endif
+
 #else
 do_op_djnz:
 do_op_EXAF:
@@ -2037,7 +2108,8 @@ do_op_prefixCB:
 instr  fetch_nop,      op_nop,         store_nop       ;00             ;NOP
 instr  fetch_DIR16,    op_nop,         store_BC        ;01 nn nn       ;LD BC,nn
 instr  fetch_nop,      op_nop,         store_MBC       ;02             ;LD (BC),A
-instr  fetch_BC,       op_INC16,       store_BC        ;03             ;INC BC
+;instr         fetch_BC,       op_INC16,       store_BC        ;03             ;INC BC
+instr  fetch_nop,      op_INCBC,       store_nop       ;03             ;INC BC
 instr  fetch_B,        op_INC,         store_B         ;04             ;INC B
 instr  fetch_B,        op_DEC,         store_B         ;05             ;DEC B
 instr  fetch_DIR8,     op_nop,         store_B         ;06             ;LD B,n
@@ -2045,7 +2117,8 @@ instr     fetch_nop,      op_RLCA,        store_nop       ;07             ;RLCA
 instr  fetch_nop,      op_EXAF,        store_nop       ;08             ;EX AF,AF'
 instr  fetch_BC,       op_ADDHL,       store_nop       ;09             ;ADD HL,BC
 instr  fetch_MBC,      op_nop,         store_nop       ;0A             ;LD A,(BC)
-instr  fetch_BC,       op_DEC16,       store_BC        ;0B             ;DEC BC
+;instr         fetch_BC,       op_DEC16,       store_BC        ;0B             ;DEC BC
+instr  fetch_nop,      op_DECBC,       store_nop       ;0B             ;DEC BC
 instr  fetch_C,        op_INC,         store_C         ;0C             ;INC C
 instr  fetch_C,        op_DEC,         store_C         ;0D             ;DEC C
 instr  fetch_DIR8,     op_nop,         store_C         ;0E nn          ;LD C,n
@@ -2053,7 +2126,8 @@ instr     fetch_nop,      op_RRCA,        store_nop       ;0F             ;RRCA
 instr  fetch_DIR8,     op_DJNZ,        store_nop       ;10 oo          ;DJNZ o
 instr  fetch_DIR16,    op_nop,         store_DE        ;11 nn nn       ;LD DE,nn
 instr  fetch_nop,      op_nop,         store_MDE       ;12             ;LD (DE),A
-instr  fetch_DE,       op_INC16,       store_DE        ;13             ;INC DE
+;instr         fetch_DE,       op_INC16,       store_DE        ;13             ;INC DE
+instr  fetch_nop,      op_INCDE,       store_nop       ;13             ;INC DE
 instr  fetch_D,        op_INC,         store_D         ;14             ;INC D
 instr  fetch_D,        op_DEC,         store_D         ;15             ;DEC D
 instr  fetch_DIR8,     op_nop,         store_D         ;16 nn          ;LD D,n
@@ -2061,7 +2135,8 @@ instr     fetch_nop,      op_RLA,         store_nop       ;17             ;RLA
 instr  fetch_DIR8,     op_nop,         store_pcrel     ;18 oo          ;JR o
 instr  fetch_DE,       op_ADDHL,       store_nop       ;19             ;ADD HL,DE
 instr  fetch_MDE,      op_nop,         store_nop       ;1A             ;LD A,(DE)
-instr  fetch_DE,       op_DEC16,       store_DE        ;1B             ;DEC DE
+;instr         fetch_DE,       op_DEC16,       store_DE        ;1B             ;DEC DE
+instr  fetch_nop,      op_DECDE,       store_nop       ;1B             ;DEC DE
 instr  fetch_E,        op_INC,         store_E         ;1C             ;INC E
 instr  fetch_E,        op_DEC,         store_E         ;1D             ;DEC E
 instr  fetch_DIR8,     op_nop,         store_E         ;1E nn          ;LD E,n
@@ -2069,7 +2144,8 @@ instr     fetch_nop,      op_RRA,         store_nop       ;1F             ;RRA
 instr  fetch_DIR8,     op_IFNZ,        store_pcrel     ;20 oo          ;JR NZ,o
 instr  fetch_DIR16,    op_nop,         store_HL        ;21 nn nn       ;LD HL,nn
 instr  fetch_DIR16,    op_STHL,        store_nop       ;22 nn nn       ;LD (nn),HL
-instr  fetch_HL,       op_INC16,       store_HL        ;23             ;INC HL
+;instr         fetch_HL,       op_INC16,       store_HL        ;23             ;INC HL
+instr  fetch_nop,      op_INCHL,       store_nop       ;23             ;INC HL
 instr  fetch_H,        op_INC,         store_H         ;24             ;INC H
 instr  fetch_H,        op_DEC,         store_H         ;25             ;DEC H
 instr  fetch_DIR8,     op_nop,         store_H         ;26 nn          ;LD H,n
@@ -2077,7 +2153,8 @@ instr     fetch_A,        op_DAA,         store_A         ;27             ;DAA
 instr  fetch_DIR8,     op_IFZ,         store_pcrel     ;28 oo          ;JR Z,o
 instr  fetch_HL,       op_ADDHL,       store_nop       ;29             ;ADD HL,HL
 instr  fetch_DIR16,    op_RMEM16,      store_HL        ;2A nn nn       ;LD HL,(nn)
-instr  fetch_HL,       op_DEC16,       store_HL        ;2B             ;DEC HL
+;instr         fetch_HL,       op_DEC16,       store_HL        ;2B             ;DEC HL
+instr  fetch_nop,      op_DECHL,       store_nop       ;2B             ;DEC HL
 instr  fetch_L,        op_INC,         store_L         ;2C             ;INC L
 instr  fetch_L,        op_DEC,         store_L         ;2D             ;DEC L
 instr  fetch_DIR8,     op_nop,         store_L         ;2E nn          ;LD L,n
@@ -2939,15 +3016,17 @@ do_op_BIT2:
 do_op_BIT1:
        ldi     temp,0x02
        rjmp    opbit
-       checkspace PC, 8
+
+       checkspace PC, 7
 do_op_BIT0:
        ldi     temp,0x01
 opbit:
-       and     temp,opl
-       in      temp,sreg
+       andi    z_flags,~((1<<ZFL_N)|(1<<ZFL_Z))
        ori     z_flags,(1<<ZFL_H)
-       andi    z_flags,~(1<<ZFL_N)
-       bmov    z_flags,ZFL_Z, temp,AVR_Z
+       and     temp,opl
+       brne    opbite
+       ori     z_flags,(1<<ZFL_Z)
+opbite:
        ret
 
 
@@ -3070,32 +3149,32 @@ opbit:
 ;.equ do_store_b = 0
        checkspace PC, 2
 do_store2_b:
-       std     y+oz_b,opl
+       mov     z_b,opl
        ret
 
        checkspace PC, 2
 do_store2_c:
-       std     y+oz_c,opl
+       mov     z_c,opl
        ret
 
        checkspace PC, 2
 do_store2_d:
-       std     y+oz_d,opl
+       mov     z_d,opl
        ret
 
        checkspace PC, 2
 do_store2_e:
-       std     y+oz_e,opl
+       mov     z_e,opl
        ret
 
        checkspace PC, 2
 do_store2_h:
-       std     y+oz_h,opl
+       mov     z_h,opl
        ret
 
        checkspace PC, 2
 do_store2_l:
-       std     y+oz_l,opl
+       mov     z_l,opl
        ret
 
        checkspace PC, 2
@@ -3105,8 +3184,7 @@ do_store2_a:
 
        checkspace PC, 4
 do_fetch2_mhl:
-       ldd     xh,y+oz_h
-       ldd     xl,y+oz_l
+       movw    x,z_l
        mem_read_d opl
        ret
 
@@ -3682,12 +3760,12 @@ do_op_out:                      ; out (c),opl
        mov temp,opl
        lcall printhex
        printstring " -> ("
-       ldd temp,y+oz_c
+       mov     temp,z_c
        lcall printhex
        printstring ") "
 .endif
        mov     temp,opl
-       ldd     temp2,y+oz_c
+       mov     temp2,z_c
        lcall   portWrite
        ret
 
@@ -3699,11 +3777,9 @@ do_op_out:                       ; out (c),opl
 
 do_op_stbc:            ;store bc to mem loc in opl:h
        movw xl,opl
-       ldd     temp,y+oz_c
-       mem_write
+       mem_write_s z_c
        adiw xl,1
-       ldd     temp,y+oz_b
-       mem_write
+       mem_write_s z_b
        ret
 
 ;----------------------------------------------------------------
@@ -3714,11 +3790,9 @@ do_op_stbc:              ;store bc to mem loc in opl:h
 ;
 do_op_stde:            ;store de to mem loc in opl:h
        movw xl,opl
-       ldd     temp,y+oz_e
-       mem_write
+       mem_write_s z_e
        adiw xl,1
-       ldd     temp,y+oz_d
-       mem_write
+       mem_write_s z_d
        ret
 
 ;----------------------------------------------------------------
@@ -3741,19 +3815,14 @@ do_op_stsp:             ;store sp to mem loc in opl:h
 ;
 
 do_op_ADCHL:
-       ldd     temp,y+oz_l
-       ldd     temp2,y+oz_h
-       clc
-       sbrc z_flags,ZFL_C
-        sec
-       adc opl,temp
-       in temp,sreg                            ; save lower Z 
-       adc oph,temp2
-       in temp2,sreg
-       std     y+oz_l,opl
-       std     y+oz_h,oph
-       and     temp,temp2                      ; 16bit Z
+       lsr     z_flags                         ; ZFL_C --> Carry
        ldi     z_flags,0                       ; clear N
+       adc     z_l,opl
+       in      temp,sreg                       ; save lower Z 
+       adc     z_h,oph
+       in      temp2,sreg
+
+       and     temp,temp2                      ; 16bit Z
        bmov    z_flags,ZFL_C, temp2,AVR_C
        bmov    z_flags,ZFL_P, temp2,AVR_V
        bmov    z_flags,ZFL_H, temp2,AVR_H
@@ -3770,18 +3839,12 @@ do_op_ADCHL:
        checkspace PC, 24
 
 do_op_sbchl:
-       ldd     temp,y+oz_l
-       ldd     temp2,y+oz_h
-       cp      temp,opl                        ; set z
-       clc
-       sbrc    z_flags,ZFL_C
-        sec
-       sbc     temp,opl
-       sbc     temp2,oph
-       std     y+oz_l,temp
-       std     y+oz_h,temp2
+       lsr     z_flags                         ; get Z80 carry
+       sez                                     ; set z
+       sbc     z_l,opl
+       sbc     z_h,oph
        in temp,sreg
-       ldi     z_flags,(1<<ZFL_N)                      ; set N
+       ldi     z_flags,(1<<ZFL_N)              ; set N
        bmov    z_flags,ZFL_C, temp,AVR_C
        bmov    z_flags,ZFL_P, temp,AVR_V
        bmov    z_flags,ZFL_H, temp,AVR_H
@@ -3925,54 +3988,43 @@ do_op_rrd:
 ;|LDIR      |--000-|Load, Inc., Repeat   |LDI till BC=0         |
 ;
 
-       checkspace PC, 19
+       checkspace PC, 13
 
 op_LDxx_common:
-       ldd     xh,y+oz_h               ;H
-       ldd     xl,y+oz_l               ;L
+       movw    x,z_l                   ;HL
 ;      mem_read_ds temp, z
        lcall   dram_read               ; temp = (HL)
-       movw    z,x
-
-       ldd     xh,y+oz_d               ;D
-       ldd     xl,y+oz_e               ;E
+       movw    x,z_e                   ;DE
 ;      mem_write_ds x, temp
        lcall   dram_write              ; (DE) = temp
 
-       ldd     oph,y+oz_b              ;B
-       ldd     opl,y+oz_c              ;C
-
        cbr     z_flags,(1<<ZFL_H) | (1<<ZFL_P) | (1<<ZFL_N)
-       subi    opl,1
-       sbci    oph,0
+
+       movw    x,z_c
+       sbiw    x,1                     ;BC--
+       movw    z_c,x
        breq    PC+2
         sbr    z_flags,(1<<ZFL_P)
-       std     y+oz_c,opl              ;C
-       std     y+oz_b,oph              ;B
        ret
 
-       checkspace PC, 8
+       checkspace PC, 6
 
 do_op_LDI:
        rcall   op_LDxx_common
-       adiw    z,1
-       adiw    x,1
-       std     y+oz_e,xl               ;E
-       std     y+oz_d,xh               ;D
-       std     y+oz_l,zl               ;L
-       std     y+oz_h,zh               ;H
+       sub     z_e,_255                ;-low(-1)       DE++
+       sbc     z_d,_255                ;-high(-1)
+       sub     z_l,_255                ;-low(-1)       HL++
+       sbc     z_h,_255                ;-high(-1)
        ret
 
-       checkspace PC, 8
+       checkspace PC, 6
 
 do_op_LDD:
        rcall   op_LDxx_common
-       sbiw    z,1
-       sbiw    x,1
-       std     y+oz_e,xl               ;E
-       std     y+oz_d,xh               ;D
-       std     y+oz_l,zl               ;L
-       std     y+oz_h,zh               ;H
+       add     z_e,_255                ;+low(-1)       DE--
+       adc     z_d,_255                ;+high(-1)
+       add     z_l,_255                ;+low(-1)       HL--
+       adc     z_h,_255                ;+high(-1)
        ret
 
        checkspace PC, 5
@@ -4011,18 +4063,15 @@ do_op_LDDR:
        checkspace PC, 21
 
 op_CPxx_common:
-       ldd     xh,y+oz_h               ; H
-       ldd     xl,y+oz_l               ; L
-       ldd     zh,y+oz_b               ; B
-       ldd     zl,y+oz_c               ; C
+       movw    x,z_l                   ; HL
+       
+       movw    z,z_c                   ;BC
 
        cbr     z_flags,(1<<ZFL_S)|(1<<ZFL_Z)|(1<<ZFL_H)|(1<<ZFL_P)
        sbr     z_flags,(1<<ZFL_N)
        lcall   dram_read               ; temp = (HL)
 
-;      mov     temp2,z_a
-;      sub     temp2,temp              ; A - (HL)
-       cp      z_a,temp
+       cp      z_a,temp                ; A - (HL)
 
        brpl    PC+2
         sbr    z_flags,(1<<ZFL_S)
@@ -4034,8 +4083,7 @@ op_CPxx_common:
        sbiw    z,1                     ; BC--
        breq    PC+2
         sbr    z_flags,(1<<ZFL_P)
-       std     y+oz_c,zl               ; C
-       std     y+oz_b,zh               ; B
+       movw    z_c,z                   ;BC
        ret
 
        checkspace PC, 5
@@ -4043,8 +4091,7 @@ op_CPxx_common:
 do_op_CPI:
        rcall   op_CPxx_common
        adiw    x,1                     ; HL++
-       std     y+oz_l,xl               ; L
-       std     y+oz_h,xh               ; H
+       movw    z_l,x                   ; HL
        ret
 
 
@@ -4053,8 +4100,7 @@ do_op_CPI:
 do_op_CPD:
        rcall   op_CPxx_common
        sbiw    x,1                     ; HL--
-       std     y+oz_l,xl               ; L
-       std     y+oz_h,xh               ; H
+       movw    z_l,x                   ; HL
        ret
 
        checkspace PC, 7
@@ -4087,39 +4133,34 @@ do_op_CPDR:
 ;|INIR      |?1??1-|Input, Inc., Repeat  |INI till B=0          |
 ;|INDR      |?1??1-|Input, Dec., Repeat  |IND till B=0          |
 
-       checkspace PC, 15
+       checkspace PC, 12
 
 op_INxx_common:
        cbr     z_flags,(1<<ZFL_Z)
        sbr     z_flags,(1<<ZFL_N)
-       ldd     temp2,y+oz_c    ;C
+       mov     temp2,z_c               ;C
        lcall   portRead
-       ldd     xh,y+oz_h               ;H
-       ldd     xl,y+oz_l               ;L
+       movw    x,z_l                   ;HL
        lcall   dram_write
-       ldd     temp,y+oz_b     ;B
-       dec     temp
-       std     y+oz_b,temp     ;B
+       dec     z_b                     ;B
        brne    PC+2
         sbr    z_flags,(1<<ZFL_Z)
        ret
 
-       checkspace PC, 5
+       checkspace PC, 4
 
 do_op_INI:
        rcall   op_INxx_common
        adiw    x,1
-       std     y+oz_l,xl               ;L
-       std     y+oz_h,xh               ;H
+       movw    z_l,x                   ;HL
        ret
 
-       checkspace PC, 5
+       checkspace PC, 4
 
 do_op_IND:
        rcall   op_INxx_common
        sbiw    x,1
-       std     y+oz_l,xl               ;L
-       std     y+oz_h,xh               ;H
+       movw    z_l,x                   ;HL
        ret
 
        checkspace PC, 5
@@ -4148,43 +4189,34 @@ do_op_INDR:
 ;|OTIR      |?1??1-|Output, Inc., Repeat |OUTI till B=0         |
 ;|OTDR      |?1??1-|Output, Dec., Repeat |OUTD till B=0         |
 
-       checkspace PC, 13
+       checkspace PC, 12
 
 op_OUTxx_common:
-       cbr     z_flags,(1<<ZFL_Z)
-       sbr     z_flags,(1<<ZFL_N)
+       movw    x,z_l                   ;HL
        lcall   dram_read               ;temp = (z)
-       ldd     temp2,y+oz_c    ;C
+       mov     temp2,z_c               ;C
        lcall   portWrite
-       ldd     temp,y+oz_b     ;B
-       dec     temp
-       std     y+oz_b,temp     ;B
+       cbr     z_flags,(1<<ZFL_Z)
+       sbr     z_flags,(1<<ZFL_N)
+       dec     z_b                     ;B
        brne    PC+2
         sbr    z_flags,(1<<ZFL_Z)
        ret
 
-       checkspace PC, 8
+       checkspace PC, 4
 
 do_op_OUTI:
-       ldd     xh,y+oz_h               ;H
-       ldd     xl,y+oz_l               ;L
-       adiw    x,1
-       std     y+oz_l,xl               ;L
-       std     y+oz_h,xh               ;H
-       sbiw    x,1
        rcall   op_OUTxx_common
+       sub     z_l,_255                ;-low(-1)
+       sbc     z_h,_255                ;-high(-1)
        ret
 
-       checkspace PC, 8
+       checkspace PC, 4
 
 do_op_OUTD:
-       ldd     xh,y+oz_h               ;H
-       ldd     xl,y+oz_l               ;L
-       sbiw    x,1
-       std     y+oz_l,xl               ;L
-       std     y+oz_h,xh               ;H
-       adiw    x,1
        rcall   op_OUTxx_common
+       add     z_l,_255                ;+low(-1)
+       adc     z_h,_255                ;+high(-1)
        ret
 
        checkspace PC, 5