]> cloudbase.mooo.com Git - avrcpm.git/blobdiff - avr/Z80int-jmp.asm
* New config option: SRAM_FILL
[avrcpm.git] / avr / Z80int-jmp.asm
index 7b17fa47b365218574604fc436e2d6581a96e44e..442650bee45cccdf8c4eb2047de1329b31d8b080 100644 (file)
 ;
 
 #if EM_Z80
-  #define OPC_TABSTART 0x1B00
-#else
-  #define OPC_TABSTART 0x1200
-#endif
 
        .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
@@ -90,7 +83,6 @@ z_istat: .byte        1
 
        .equ IFF1 = 2                   ;IFF1 Flag
        .equ IFF2 = 3                   ;IFF2 Flag
-
 #endif
 
        .cseg
@@ -100,7 +92,6 @@ z80_init:
        ldiw    z_pc,IPLADDR
        ldiw    y,z_regs
 
-       cbi     flags,trace
        clr     intstat
 
        printnewline
@@ -130,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:
@@ -143,6 +134,8 @@ int_instr:
 int_test:
        sbrs    intstat,i_trace
        rjmp    int_notrace
+       sbrc    intstat,i_halt
+       rjmp    int_notrace
        cpi     z_pch,DBG_TRACE_BOTTOM
        brlo    int_notrace
        cpi     z_pch,DBG_TRACE_TOP
@@ -164,33 +157,78 @@ int_nobreak:
 ;--------------------------------------------------
 ; init opcode table 
 ;
-;      opctable opc_name
+;      opctable opc_name, pos
 ;
-#if EM_Z80
-       .equ    numtabs_ = 5
-#else
-       .equ    numtabs_ = 1
-#endif
 
 .macro opctable
 
+
+  .set opcjmp_table_pos_ = (@1 + 255) & -0x100         ;0xff00
+
   .ifndef opc_tabnext_
-    .if OPC_TABSTART & 0x00ff
-      .error "OPC_TABSTART is not page aligned!"
-    .endif
-    .set opc_tabnext_ = OPC_TABSTART
-    .equ opc_tablow_ = opc_tabnext_
-    .equ opc_tabend_ = opc_tablow_ + (256 * numtabs_) + 128
-    .equ sz53p_table_pos = opc_tablow_ + (256 * numtabs_)
+    .set opc_tabnext_ = opcjmp_table_pos_
+
+    .set opc_tablow_0 = 0
+    .set opc_tablen_0 = 0
+    .set opc_tablow_1 = 0
+    .set opc_tablen_1 = 0
   .endif
 
-  .set opcjmp_table_pos_ = opc_tabnext_
-  .set opc_tabnext_ = opc_tabnext_ + 256
+  .if opcjmp_table_pos_ < opc_tabnext_
+    .set opcjmp_table_pos_ = opc_tabnext_
+  .endif
+
+  .if opc_tablow_0 == 0
+    .set opc_tablow_0 = opcjmp_table_pos_
+    .set opc_tablen_0 = 256
+;.message "add tab_0"
+  .elif opc_tablow_1 == 0
+    .if (opc_tablow_0 + opc_tablen_0) == opcjmp_table_pos_
+      .set opc_tablen_0 = opc_tablen_0 + 256
+;.message "    tab_0++"
+    .else
+      .set opc_tablow_1 = opcjmp_table_pos_
+      .set opc_tablen_1 = 256
+;.message "add tab_1"
+    .endif
+  .else  
+    .if (opc_tablow_1 + opc_tablen_1) == opcjmp_table_pos_
+      .set opc_tablen_1 = opc_tablen_1 + 256
+;.message     "tab_1++"
+    .else
+      .error "Tab full_"
+    .endif
+  .endif
 
+  .set opc_tabnext_ = opcjmp_table_pos_ + 256
   .equ @0 = opcjmp_table_pos_
 
-  .set todo_table_pos_ = 0
+.endm
 
+;--------------------------------------------------
+; 
+;      checkspace frompos, size
+;
+.macro checkspace
+
+  .ifdef opc_tablow_0
+    .if @0 <=  opc_tablow_0
+      .if (@0 + @1) >  opc_tablow_0
+        .org opc_tablow_0 + opc_tablen_0
+;        .message "skip tab, remove tab_0"
+        .if opc_tablow_1 == 0
+          .set opc_tablow_0 = 0
+          .set opc_tablen_0 = 0
+        .else
+          .set opc_tablow_0 = opc_tablow_1
+          .set opc_tablen_0 = opc_tablen_1
+          .set opc_tablow_1 = 0
+          .set opc_tablen_1 = 0
+;          .message "remove tab_1"
+        .endif
+      .endif
+    .endif
+  .endif
 .endm
 
 ;--------------------------------------------------
@@ -205,11 +243,16 @@ int_nobreak:
   .set store_ = (do_@2 != do_store_nop)                ; must jump to store action
   .set cnt_ = fetch_ + op_ + store_            ; number of actions for this instruction
 
-  .set action_1_ = 0
-  .set action_2_ = 0
-  .set action_3_ = 0
 
-  .if cnt_ == 1
+  .set done_ = 0
+  .set pc_save_ = PC
+
+  .if cnt_ == 0                                        ; nothing to do (nop)
+    .org opcjmp_table_pos_
+    ret                                                ; go back to main
+    .org pc_save_
+    .set done_ = 1
+  .elif cnt_ == 1                              ; jump direct to action
     .if fetch_
       .set action_1_ = do_@0
     .elif op_
@@ -217,79 +260,38 @@ int_nobreak:
     .else
       .set action_1_ = do_@2
     .endif
-  .elif cnt_ == 2
-    .if fetch_
-      .set action_1_ = do_@0
-      .if op_
-        .set action_2_ = do_@1
-      .else
-        .set action_2_ = do_@2
-      .endif
-    .else
-      .set action_1_ = do_@1
-      .set action_2_ = do_@2
-    .endif
-  .elif cnt_ == 3
-    .set action_1_ = do_@0
-    .set action_2_ = do_@1
-    .set action_3_ = do_@2
-  .endif
-
-  .set longdist_ = 0
-  .set pc_save_ = PC
-
-  .org opcjmp_table_pos_
-  .set opcjmp_table_pos_ = opcjmp_table_pos_ + 1
-
-
-  .if cnt_ == 0                                        ; nothing to do (nop)
-    ret                                                ; go back to main
-  .elif cnt_ == 1                              ; jump direct to action
-    .if (PC - action_1_) > 2047
-      .set longdist_ = 1                        ; target action out of reach for rel jump
-    .else
+    .if (opcjmp_table_pos_ - action_1_) <= 2047
+       .org opcjmp_table_pos_
         rjmp action_1_                         ; do op and return to main
+       .org pc_save_
+      .set done_ = 1
     .endif
   .endif
 
+  .if !done_
 
-  .set done_ = 0
-  .if (cnt_ > 1) || longdist_
-                                               ; two or tree actions
     .if defined (l_@0_@1_@2)
-      .if (PC - l_@0_@1_@2) <= 2047
-        rjmp l_@0_@1_@2                                ; generate a jump to action table
-       .set done_ = 1
-      .endif
-    .endif
-
-    .if !done_
-
-      .if todo_table_pos_ == 0
-        .set todo_table_pos_ = opcjmp_table_pos_ - 2048
-        .if todo_table_pos_ < pc_save_
-          .set todo_table_pos_ = pc_save_
-        .endif
-      .endif
-
-      .if todo_table_pos_ <  opc_tablow_
-        .if todo_table_pos_ + 2*cnt_ >  opc_tablow_
-          .set todo_table_pos_ = opc_tabend_
-        .endif
-      .endif
 
-      .if defined (l_@0_@1_@2)
-        rjmp todo_table_pos_
-        .org todo_table_pos_
+      .if (opcjmp_table_pos_ - l_@0_@1_@2) <= 2047
+        .org opcjmp_table_pos_
+        rjmp l_@0_@1_@2                                ; generate a jump to action table
+        .org pc_save_
+      .else
+        checkspace pc_save_, 2
+        .set pc_save_ = PC
+        .org opcjmp_table_pos_
+        rjmp pc_save_
+        .org pc_save_
        jmp l_@0_@1_@2
-        .set todo_table_pos_ = PC
-       .set done_ = 1
       .endif
-    .endif
 
-    .if !done_
+    .else
+
+      checkspace pc_save_, 2*cnt_
+      .set pc_save_ = PC
 
-      .equ l_@0_@1_@2 = todo_table_pos_                ; make a label
+      .org opcjmp_table_pos_
+      .equ l_@0_@1_@2 = pc_save_               ; make a label
       rjmp l_@0_@1_@2                          ; generate a jump to action table
 
       .org l_@0_@1_@2
@@ -335,16 +337,10 @@ int_nobreak:
         .endif
       .endif    
 
-      .set todo_table_pos_ = PC
-
     .endif
   .endif
 
-  .if todo_table_pos_ == 0
-    .org pc_save_
-  .else
-    .org todo_table_pos_
-  .endif
+  .set opcjmp_table_pos_ = opcjmp_table_pos_ + 1
 
 .endm
 
@@ -354,9 +350,17 @@ do_x_nop:
 
 ; ------------ Fetch phase stuff -----------------
 
+
 fetch_ops:
 .equ do_fetch_nop = do_x_nop
 
+do_fetch_rst:
+       movw x,z_pcl
+       sbiw x,1
+       mem_read_d opl
+       andi opl,0x38
+       ldi oph,0
+       ret
 
 .macro m_do_fetch_a
        mov opl,z_a
@@ -367,23 +371,25 @@ fetch_ops:
 ;      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
@@ -391,7 +397,7 @@ fetch_ops:
 ;      ret
 
 .macro m_do_fetch_e
-       ldd     opl,y+oz_e
+       mov     opl,z_e
 .endm
 
 .equ do_fetch_e = 0
@@ -399,41 +405,50 @@ fetch_ops:
 ;      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
@@ -443,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
 
@@ -479,14 +493,6 @@ do_fetch_dir16:
        adiw z_pcl,1
        ret
 
-do_fetch_rst:
-       movw x,z_pcl
-       sbiw x,1
-       mem_read_d opl
-       andi opl,0x38
-       ldi oph,0
-       ret
-
 ; ------------ Store phase stuff -----------------
 
 store_ops:
@@ -502,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
 
@@ -1014,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
@@ -1022,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
@@ -1030,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
@@ -1052,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           |
@@ -1078,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
@@ -1107,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                 |
 ;----------------------------------------------------------------
@@ -1119,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                 |
 ;----------------------------------------------------------------
@@ -1344,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
@@ -1364,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
 
 ;----------------------------------------------------------------
@@ -1723,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
 
 ;----------------------------------------------------------------
@@ -1890,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
@@ -1905,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        
@@ -1937,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
@@ -1949,6 +2015,8 @@ opexx_loop:
        brne    opexx_loop
        ret
 
+#endif
+
 #else
 do_op_djnz:
 do_op_EXAF:
@@ -1959,14 +2027,11 @@ do_op_EXX:
 
 #if EM_Z80
 
-do_op_noni:
-       sbiw    z_pcl,1                         ;--z_pc
-       ret
-
 do_op_prefixED:
        mem_read_ds zl,z_pc                     ;zl = memReadByte(z_pc)
        adiw    z_pcl,1                         ;++z_pc
        ldi     zh,high(EDjmp)                  ;
+;;;    ldi     zh,high(0)                      ;
        ijmp
 
 
@@ -2031,26 +2096,29 @@ do_op_prefixCB:
 #endif
 
 
+
 ; ----------------------- Opcode decoding -------------------------
 
 ; Lookup table for Z80 opcodes. Translates the first byte of the instruction word into three
 ; operations: fetch, do something, store.
 ; The table is made of 256 words. 
 
-       opctable opcjmp
+       opctable opcjmp, PC     ;+3*256
         
 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_B,        op_DEC,         store_B         ;05             ;DEC B
 instr  fetch_DIR8,     op_nop,         store_B         ;06             ;LD B,n
 instr  fetch_nop,      op_RLCA,        store_nop       ;07             ;RLCA
-instr  fetch_nop,      op_EXAF,        store_nop       ;08     ;EX AF,AF'
+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
@@ -2058,51 +2126,55 @@ 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_D,        op_DEC,         store_D         ;15             ;DEC D
 instr  fetch_DIR8,     op_nop,         store_D         ;16 nn          ;LD D,n
 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_E,        op_DEC,         store_E         ;1D             ;DEC E
 instr  fetch_DIR8,     op_nop,         store_E         ;1E nn          ;LD E,n
 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_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
-instr  fetch_A,        op_DAA,         store_A ;27     ;DAA
+;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
+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_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
-instr  fetch_nop,      op_CPL,         store_nop       ;2F     ;CPL
+;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
+instr  fetch_nop,      op_CPL,         store_nop       ;2F             ;CPL
 instr  fetch_DIR8,     op_IFNC,        store_pcrel     ;30 oo          ;JR NC,o
 instr  fetch_DIR16,    op_nop,         store_SP        ;31 nn nn       ;LD SP,nn
 instr  fetch_DIR16,    op_nop,         store_AM        ;32 nn nn       ;LD (nn),A
 instr  fetch_SP,       op_INC16,       store_SP        ;33             ;INC SP
 instr  fetch_MHL,      op_INC,         store_MHL       ;34             ;INC (HL)
-instr  fetch_MHL,      op_DEC,         store_MHL       ;35     ;DEC (HL)
+instr  fetch_MHL,      op_DEC,         store_MHL       ;35             ;DEC (HL)
 instr  fetch_DIR8,     op_nop,         store_MHL       ;36 nn          ;LD (HL),n
 instr  fetch_nop,      op_SCF,         store_nop       ;37             ;SCF
 instr  fetch_DIR8,     op_IFC,         store_pcrel     ;38 oo          ;JR C,o
 instr  fetch_SP,       op_ADDHL,       store_nop       ;39             ;ADD HL,SP
-instr  fetch_DIR16,    op_RMEM8,       store_A ;3A nn nn       ;LD A,(nn)
-instr  fetch_SP,       op_DEC16,       store_SP        ;3B     ;DEC SP
+instr  fetch_DIR16,    op_RMEM8,       store_A         ;3A nn nn       ;LD A,(nn)
+instr  fetch_SP,       op_DEC16,       store_SP        ;3B             ;DEC SP
 instr  fetch_nop,      op_INCA,        store_nop       ;3C             ;INC A
-instr  fetch_nop,      op_DECA,        store_nop       ;3D     ;DEC A
-instr  fetch_DIR8,     op_nop,         store_A ;3E nn          ;LD A,n
-instr  fetch_nop,      op_CCF,         store_nop       ;3F     ;CCF (Complement Carry Flag, gvd)
+instr  fetch_nop,      op_DECA,        store_nop       ;3D             ;DEC A
+instr  fetch_DIR8,     op_nop,         store_A         ;3E nn          ;LD A,n
+instr  fetch_nop,      op_CCF,         store_nop       ;3F             ;CCF (Complement Carry Flag, gvd)
 instr  fetch_nop,      op_nop,         store_nop       ;40             ;LD B,B
 instr  fetch_C,        op_nop,         store_B         ;41             ;LD B,C
 instr  fetch_D,        op_nop,         store_B         ;42             ;LD B,D
@@ -2223,14 +2295,14 @@ instr   fetch_H,        op_ORA,         store_nop       ;B4             ;OR A,H
 instr  fetch_L,        op_ORA,         store_nop       ;B5             ;OR A,L
 instr  fetch_MHL,      op_ORA,         store_nop       ;B6             ;OR A,(HL)
 instr  fetch_A,        op_ORA,         store_nop       ;B7             ;OR A,A
-instr  fetch_B,        op_CPFA,        store_nop       ;B8     ;CP A,B
-instr  fetch_C,        op_CPFA,        store_nop       ;B9     ;CP A,C
-instr  fetch_D,        op_CPFA,        store_nop       ;BA     ;CP A,D
-instr  fetch_E,        op_CPFA,        store_nop       ;BB     ;CP A,E
-instr  fetch_H,        op_CPFA,        store_nop       ;BC     ;CP A,H
-instr  fetch_L,        op_CPFA,        store_nop       ;BD     ;CP A,L
-instr  fetch_MHL,      op_CPFA,        store_nop       ;BE     ;CP A,(HL)
-instr  fetch_A,        op_CPFA,        store_nop       ;BF     ;CP A,A
+instr  fetch_B,        op_CPFA,        store_nop       ;B8             ;CP A,B
+instr  fetch_C,        op_CPFA,        store_nop       ;B9             ;CP A,C
+instr  fetch_D,        op_CPFA,        store_nop       ;BA             ;CP A,D
+instr  fetch_E,        op_CPFA,        store_nop       ;BB             ;CP A,E
+instr  fetch_H,        op_CPFA,        store_nop       ;BC             ;CP A,H
+instr  fetch_L,        op_CPFA,        store_nop       ;BD             ;CP A,L
+instr  fetch_MHL,      op_CPFA,        store_nop       ;BE             ;CP A,(HL)
+instr  fetch_A,        op_CPFA,        store_nop       ;BF             ;CP A,A
 instr  fetch_nop,      op_IFNZ,        store_RET       ;C0             ;RET NZ
 instr  fetch_nop,      op_POP16,       store_BC        ;C1             ;POP BC
 instr  fetch_DIR16,    op_IFNZ,        store_PC        ;C2 nn nn       ;JP NZ,nn
@@ -2256,7 +2328,7 @@ instr     fetch_DE,       op_PUSH16,      store_nop       ;D5             ;PUSH DE
 instr  fetch_DIR8,     op_SUBFA,       store_nop       ;D6 nn          ;SUB n
 instr  fetch_RST,      op_nop,         store_CALL      ;D7             ;RST 10H
 instr  fetch_nop,      op_IFC,         store_RET       ;D8             ;RET C
-instr  fetch_nop,      op_EXX,         store_nop       ;D9     ;EXX
+instr  fetch_nop,      op_EXX,         store_nop       ;D9             ;EXX
 instr  fetch_DIR16,    op_IFC,         store_PC        ;DA nn nn       ;JP C,nn
 instr  fetch_DIR8,     op_INA,         store_nop       ;DB nn          ;IN A,(n)
 instr  fetch_DIR16,    op_IFC,         store_CALL      ;DC nn nn       ;CALL C,nn
@@ -2266,7 +2338,7 @@ instr     fetch_RST,      op_nop,         store_CALL      ;DF             ;RST 18H
 instr  fetch_nop,      op_IFPO,        store_RET       ;E0             ;RET PO
 instr  fetch_nop,      op_POP16,       store_HL        ;E1             ;POP HL
 instr  fetch_DIR16,    op_IFPO,        store_PC        ;E2 nn nn       ;JP PO,nn
-instr  fetch_MSP,      op_EXHL,        store_MSP       ;E3     ;EX (SP),HL
+instr  fetch_MSP,      op_EXHL,        store_MSP       ;E3             ;EX (SP),HL
 instr  fetch_DIR16,    op_IFPO,        store_CALL      ;E4 nn nn       ;CALL PO,nn
 instr  fetch_HL,       op_PUSH16,      store_nop       ;E5             ;PUSH HL
 instr  fetch_DIR8,     op_ANDA,        store_nop       ;E6 nn          ;AND n
@@ -2274,7 +2346,7 @@ instr     fetch_RST,      op_nop,         store_CALL      ;E7             ;RST 20H
 instr  fetch_nop,      op_IFPE,        store_RET       ;E8             ;RET PE
 instr  fetch_HL,       op_nop,         store_PC        ;E9             ;JP HL
 instr  fetch_DIR16,    op_IFPE,        store_PC        ;EA nn nn       ;JP PE,nn
-instr  fetch_DE,       op_EXHL,        store_DE        ;EB     ;EX DE,HL
+instr  fetch_DE,       op_EXHL,        store_DE        ;EB             ;EX DE,HL
 instr  fetch_DIR16,    op_IFPE,        store_CALL      ;EC nn nn       ;CALL PE,nn
 instr  fetch_nop,      op_prefixED,    store_nop       ;ED             ;(ED opcode prefix)
 instr  fetch_DIR8,     op_XORA,        store_nop       ;EE nn          ;XOR n
@@ -2282,7 +2354,7 @@ instr     fetch_RST,      op_nop,         store_CALL      ;EF             ;RST 28H
 instr  fetch_nop,      op_IFP,         store_RET       ;F0             ;RET P
 instr  fetch_nop,      op_POP16,       store_AF        ;F1             ;POP AF
 instr  fetch_DIR16,    op_IFP,         store_PC        ;F2 nn nn       ;JP P,nn
-instr  fetch_nop,      op_DI,          store_nop       ;F3     ;DI
+instr  fetch_nop,      op_DI,          store_nop       ;F3             ;DI
 instr  fetch_DIR16,    op_IFP,         store_CALL      ;F4 nn nn       ;CALL P,nn
 instr  fetch_AF,       op_PUSH16,      store_nop       ;F5             ;PUSH AF
 instr  fetch_DIR8,     op_ORA,         store_nop       ;F6 nn          ;OR n
@@ -2290,10 +2362,10 @@ instr   fetch_RST,      op_nop,         store_CALL      ;F7             ;RST 30H
 instr  fetch_nop,      op_IFM,         store_RET       ;F8             ;RET M
 instr  fetch_HL,       op_nop,         store_SP        ;F9             ;LD SP,HL
 instr  fetch_DIR16,    op_IFM,         store_PC        ;FA nn nn       ;JP M,nn
-instr  fetch_nop,      op_EI,          store_nop       ;FB     ;EI
+instr  fetch_nop,      op_EI,          store_nop       ;FB             ;EI
 instr  fetch_DIR16,    op_IFM,         store_CALL      ;FC nn nn       ;CALL M,nn
 instr  fetch_nop,      op_prefixFD,    store_nop       ;FD             ;(FD opcode prefix)
-instr  fetch_DIR8,     op_CPFA,        store_nop       ;FE nn  ;CP n
+instr  fetch_DIR8,     op_CPFA,        store_nop       ;FE nn          ;CP n
 instr  fetch_RST,      op_nop,         store_CALL      ;FF             ;RST 38H
 
 
@@ -2301,345 +2373,78 @@ instr  fetch_RST,      op_nop,         store_CALL      ;FF             ;RST 38H
 
 
 
-do_fetch_0:
-       ldi     opl,0
+       checkspace PC, 2
+
+do_op_noni:
+       sbiw    z_pcl,1                         ;--z_pc
        ret
 
+       checkspace PC, 16
+
 do_fetch_dir8_2:
        movw    xl,z_pcl
        adiw    xl,1
        mem_read_d opl
        ret
 
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|IN r,[C]  |***P0-|Input                |r=[C]                 |
-;
+       checkspace PC, 5
 
-do_op_in:                      ; in opl,(opl)
-.if PORT_DEBUG
-       push    opl     
-       cp      opl,_0          ; don't debug port 0 (con stat)
-       breq    dbg_op_in_1
-       printnewline
-       printstring "Port read: ("
-       mov temp,opl
-       lcall printhex
-       printstring ") -> "
-dbg_op_in_1:
-.endif
+do_fetch_xh:
+       sbis    flags,prefixfd
+       ldd     opl,y+oz_xh
+       sbic    flags,prefixfd
+       ldd     opl,y+oz_yh
+       ret
 
-       mov     temp2,opl
-       lcall   portRead
-       mov     opl,temp
-       bst     z_flags,ZFL_C                   ;save Carry
-       ldpmx   z_flags,sz53p_tab,temp          ;S,Z,P
-       bld     z_flags,ZFL_C
+       checkspace PC, 5
 
-.if PORT_DEBUG
-       pop     temp
-       cp      temp,_0
-       breq    dbg_op_in_2
-       lcall printhex
-       printstring " "
-dbg_op_in_2:
-.endif
+do_fetch_xl:
+       sbis    flags,prefixfd
+       ldd     opl,y+oz_xl
+       sbic    flags,prefixfd
+       ldd     opl,y+oz_yl
        ret
 
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|OUT [C],r |------|Output               |[C]=r                 |
-;
 
-do_op_out:                     ; out (c),opl
-.if PORT_DEBUG
-       printnewline
-       printstring "Port write: "
-       mov temp,opl
-       lcall printhex
-       printstring " -> ("
-       ldd temp,y+oz_c
-       lcall printhex
-       printstring ") "
-.endif
-       mov     temp,opl
-       ldd     temp2,y+oz_c
-       lcall   portWrite
-       ret
+       checkspace PC, 41
 
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|LD dst,src|------|Load                 |dst=src               |
-;
+do_fetch_mxx:
+       sbic    flags,prefixfd
+       rjmp    fetchmxx_fd
+       ldd     xh,y+oz_xh
+       ldd     xl,y+oz_xl
+       rjmp    fetchmxx1
+fetchmxx_fd:
+       ldd     xh,y+oz_yh
+       ldd     xl,y+oz_yl
+fetchmxx1:
+       mem_read_ds opl, z_pc                   ;get displacement
+       adiw z_pcl,1
+       clr     oph                             ;sign extend
+       tst     opl
+       brpl    fetchmxx2
+       com     oph
+fetchmxx2:
+       add     xl,opl                          ;add displacement
+       adc     xh,oph
+       mem_read_d opl                          ;get operand
+       ret                                     ;(Ix+d) still in xl,xh
 
-do_op_stbc:            ;store bc to mem loc in opl:h
-       movw xl,opl
-       ldd     temp,y+oz_c
-       mem_write
-       adiw xl,1
-       ldd     temp,y+oz_b
-       mem_write
+
+       checkspace PC, 8
+
+do_fetch_xx:
+       sbic    flags,prefixfd
+       rjmp    fetchxx_fd
+       ldd     opl,y+oz_xl
+       ldd     oph,y+oz_xh
+       ret
+fetchxx_fd:
+       ldd     opl,y+oz_yl
+       ldd     oph,y+oz_yh
        ret
 
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|LD dst,src|------|Load                 |dst=src               |
-;
-;
-do_op_stde:            ;store de to mem loc in opl:h
-       movw xl,opl
-       ldd     temp,y+oz_e
-       mem_write
-       adiw xl,1
-       ldd     temp,y+oz_d
-       mem_write
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|LD dst,src|------|Load                 |dst=src               |
-;
-;
-do_op_stsp:            ;store sp to mem loc in opl:h
-       movw xl,opl
-       mem_write_s z_spl
-       adiw xl,1
-       mem_write_s z_sph
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|ADC HL,ss |***V0*|Add with Carry       |HL=HL+ss+CY           |
-;
-
-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
-       ldi     z_flags,0                       ; clear N
-       bmov    z_flags,ZFL_C, temp2,AVR_C
-       bmov    z_flags,ZFL_P, temp2,AVR_V
-       bmov    z_flags,ZFL_H, temp2,AVR_H
-       bmov    z_flags,ZFL_Z, temp,AVR_Z
-       bmov    z_flags,ZFL_S, temp2,AVR_N
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|SBC HL,ss |***V1*|Subtract with carry  |HL=HL-ss-CY           |
-;
-;
-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
-       in temp,sreg
-       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
-       bmov    z_flags,ZFL_Z, temp,AVR_Z
-       bmov    z_flags,ZFL_S, temp,AVR_N
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|NEG       |***V1*|Negate A             |A=0-A                 |
-
-;
-do_op_NEG:
-       ldi     temp,0
-       sub     temp,z_a
-       mov     z_a,temp
-       in      temp,sreg
-       ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,P
-       bmov    z_flags,ZFL_C, temp,AVR_C
-       bmov    z_flags,ZFL_H, temp,AVR_H
-       do_z80_flags_V
-       do_z80_flags_set_N
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|RETI      |------|Return from Interrupt|PC=[SP]+              |
-;|RETN      |------|Return from NMI      |  Copy IFF2 to IFF1   |
-
-
-do_op_RETI:
-do_op_RETN:
-       ldd     temp,y+oz_istat
-       bmov    temp,IFF1, temp,IFF2
-       std     y+oz_istat,temp
-       ljmp    do_store_ret
-
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|IM n      |------|Interrupt Mode       |             (n=0,1,2)|
-
-do_op_IM0:
-       ldd     temp,y+oz_istat
-       andi    temp, ~IM_MASK
-       std     y+oz_istat,temp
-       ret
-
-do_op_IM1:
-       ldd     temp,y+oz_istat
-       andi    temp,~IM_MASK
-       ori     temp,IM1
-       std     y+oz_istat,temp
-       ret
-
-do_op_IM2:
-       ldd     temp,y+oz_istat
-       andi    temp, ~IM_MASK
-       ori     temp,IM2
-       std     y+oz_istat,temp
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|LD A,i    |**0*0-|Load                 |(i=I,R)  IFF2 --> P   |
-;|LD i,A    |------|Load                 |(i=I,R)               |
-
-do_op_ldai:
-       ldd     z_a,y+oz_i
-       rjmp    op_ldar1
-
-do_op_ldar:
-       ldd     z_a,y+oz_r
-op_ldar1:
-       bst     z_flags,ZFL_C                   ;save C
-       ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,H,P,N      
-       bld     z_flags,ZFL_C                   ;
-       ldd     temp,y+oz_istat
-       bmov    z_flags,ZFL_P, temp,IFF2
-       ret
-
-do_op_ldia:
-       std     y+oz_i,z_a
-       ret
-
-do_op_ldra:
-       std     y+oz_r,z_a
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|RLD       |**0P0-|Rotate Left 4 bits   |{A,[HL]}={A,[HL]}<- ##|
-;|RRD       |**0P0-|Rotate Right 4 bits  |{A,[HL]}=->{A,[HL]} ##|
-
-do_op_rld:
-       swap    opl
-       mov     oph,opl
-       andi    opl,0xf0
-       andi    oph,0x0f
-       mov     temp,z_a
-       andi    temp,0x0f
-       or      opl,temp
-       mov     temp,z_a
-       andi    temp,0xf0
-       or      temp,oph
-       mov     z_a,temp
-       bst     z_flags,ZFL_C                   ;save C
-       ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,H,P,N      
-       bld     z_flags,ZFL_C                   ;
-       ret
-
-do_op_rrd:
-       mov     oph,opl
-       andi    opl,0xf0
-       andi    oph,0x0f
-       mov     temp,z_a
-       andi    temp,0x0f
-       or      opl,temp
-       swap    opl
-       mov     temp,z_a
-       andi    temp,0xf0
-       or      temp,oph
-       mov     z_a,temp
-       bst     z_flags,ZFL_C                   ;save C
-       ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,H,P,N      
-       bld     z_flags,ZFL_C                   ;
-       ret
-
-
-do_fetch_xh:
-       sbis    flags,prefixfd
-       ldd     opl,y+oz_xh
-       sbic    flags,prefixfd
-       ldd     opl,y+oz_yh
-       ret
-
-do_fetch_xl:
-       sbis    flags,prefixfd
-       ldd     opl,y+oz_xl
-       sbic    flags,prefixfd
-       ldd     opl,y+oz_yl
-       ret
-
-
-do_fetch_mxx:
-       sbic    flags,prefixfd
-       rjmp    fetchmxx_fd
-       ldd     xh,y+oz_xh
-       ldd     xl,y+oz_xl
-       rjmp    fetchmxx1
-fetchmxx_fd:
-       ldd     xh,y+oz_yh
-       ldd     xl,y+oz_yl
-fetchmxx1:
-       mem_read_ds opl, z_pc                   ;get displacement
-       adiw z_pcl,1
-       clr     oph                             ;sign extend
-       tst     opl
-       brpl    fetchmxx2
-       com     oph
-fetchmxx2:
-       add     xl,opl                          ;add displacement
-       adc     xh,oph
-       mem_read_d opl                          ;get operand
-       ret                                     ;(Ix+d) still in xl,xh
-
-
-do_fetch_xx:
-       sbic    flags,prefixfd
-       rjmp    fetchxx_fd
-       ldd     opl,y+oz_xl
-       ldd     oph,y+oz_xh
-       ret
-fetchxx_fd:
-       ldd     opl,y+oz_yl
-       ldd     oph,y+oz_yh
-       ret
+       checkspace PC, 5
 
 do_store_xh:
        sbis    flags,prefixfd
@@ -2648,6 +2453,8 @@ do_store_xh:
        std     y+oz_yh,opl
        ret
 
+       checkspace PC, 5
+
 do_store_xl:
        sbis    flags,prefixfd
        std     y+oz_xl,opl
@@ -2655,6 +2462,8 @@ do_store_xl:
        std     y+oz_yl,opl
        ret
 
+       checkspace PC, 37
+
 do_store_mxx:
        sbic    flags,prefixfd
        rjmp    storemxx_fd
@@ -2677,10 +2486,14 @@ storemxx2:
        mem_write_s opl                         ;store operand
        ret
 
+       checkspace PC, 10
+
 do_store_mxx_0:
        mem_write_s opl                         ;store operand
        ret
 
+       checkspace PC, 38
+
 do_store_mxx_2:
        sbic    flags,prefixfd
        rjmp    storemxx2_fd
@@ -2704,6 +2517,8 @@ storemxx22:
        mem_write_s opl                         ;store operand
        ret
 
+       checkspace PC, 8
+
 do_store_xx:
        sbic    flags,prefixfd
        rjmp    storexx_fd
@@ -2720,10 +2535,12 @@ storexx_fd:
 ;----------------------------------------------------------------
 ;|LD dst,src|------|Load                 |dst=src               |
 ;
-;
+
+       checkspace PC, 30
+
 do_op_stxx:            ;store xx to mem loc in opl:h
 
-       movw xl,opl
+       movw    xl,opl
        sbis    flags,prefixfd
        ldd     temp,y+oz_xl
        sbic    flags,prefixfd
@@ -2744,6 +2561,8 @@ do_op_stxx:               ;store xx to mem loc in opl:h
 ;|EX [SP],IX|------|Exchange             |[SP]<->IX             |
 ;|EX [SP],IY|------|Exchange             |[SP]<->IY             |
 ; 
+       checkspace PC, 13
+
 do_op_EXxx:
        sbic    flags,prefixfd
        rjmp    opexxx_fd
@@ -2767,7 +2586,9 @@ opexxxe:
 ;|ADD IX,pp |--*-0*|Add                  |IX=IX+pp              |
 ;|ADD IY,rr |--*-0*|Add                  |IY=IY+rr              |
 ;
-;
+
+       checkspace PC, 25
+
 do_op_addxx:
        sbic    flags,prefixfd
        rjmp    opadx_fd
@@ -2792,502 +2613,8 @@ opadx_e:
        do_z80_flags_clear_N
        ret
 
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|LDD       |--0*0-|Load and Decrement   |[DE]=[HL],HL=HL-1,#   |
-;|LDDR      |--000-|Load, Dec., Repeat   |LDD till BC=0         |
-;|LDI       |--0*0-|Load and Increment   |[DE]=[HL],HL=HL+1,#   |
-;|LDIR      |--000-|Load, Inc., Repeat   |LDI till BC=0         |
-;
-
-op_LDxx_common:
-       ldd     zh,y+oz_h               ;H
-       ldd     zl,y+oz_l               ;L
-       ldd     xh,y+oz_d       ;D
-       ldd     xl,y+oz_e       ;E
-       ldd     oph,y+oz_b      ;B
-       ldd     opl,y+oz_c      ;C
-       mem_read_ds temp, z
-       mem_write_ds x, temp
-       cbr     z_flags,(1<<ZFL_H) | (1<<ZFL_P) | (1<<ZFL_N)
-       subi    opl,1
-       sbci    oph,0
-       breq    PC+2
-        sbr    z_flags,(1<<ZFL_P)
-       std     y+oz_c,opl      ;C
-       std     y+oz_b,oph      ;B
-       ret
-
-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
-       ret
-
-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
-       ret
-
-do_op_LDIR:
-       rcall   do_op_LDI
-       sbrs    z_flags,ZFL_P
-        ret
-       sbiw    z_pcl,2
-       ret
-
-do_op_LDDR:
-       rcall   do_op_LDD
-       sbrs    z_flags,ZFL_P
-        ret
-       sbiw    z_pcl,2
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|CPD       |****1-|Compare and Decrement|A-[HL],HL=HL-1,BC=BC-1|
-;|CPDR      |****1-|Compare, Dec., Repeat|CPD till A=[HL]or BC=0|
-;|CPI       |****1-|Compare and Increment|A-[HL],HL=HL+1,BC=BC-1|
-;|CPIR      |****1-|Compare, Inc., Repeat|CPI till A=[HL]or BC=0|
-
-
-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
-
-       cbr     z_flags,(1<<ZFL_S)|(1<<ZFL_Z)|(1<<ZFL_H)|(1<<ZFL_P)
-       sbr     z_flags,(1<<ZFL_N)
-       mem_read                        ; temp = (HL)
-       mov     temp2,z_a
-       sub     temp2,temp              ; A - (HL)
-       brpl    PC+2
-        sbr    z_flags,(1<<ZFL_S)
-       brne    PC+2
-        sbr    z_flags,(1<<ZFL_Z)
-       brhc    PC+2
-        sbr    z_flags,(1<<ZFL_H)
-
-       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
-       ret
-
-do_op_CPI:
-       rcall   op_CPxx_common
-       adiw    x,1                     ; HL++
-       std     y+oz_l,xl               ; L
-       std     y+oz_h,xh               ; H
-       ret
-
-
-do_op_CPD:
-       rcall   op_CPxx_common
-       sbiw    x,1                     ; HL--
-       std     y+oz_l,xl               ; L
-       std     y+oz_h,xh               ; H
-       ret
-
-do_op_CPIR:
-       rcall   do_op_CPI
-       sbrc    z_flags,ZFL_Z
-        ret
-       sbrs    z_flags,ZFL_P
-        ret
-       sbiw    z_pcl,2
-       ret
-
-do_op_CPDR:
-       rcall   do_op_CPD
-       sbrc    z_flags,ZFL_Z
-        ret
-       sbrs    z_flags,ZFL_P
-        ret
-       sbiw    z_pcl,2
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|INI       |?*??1-|Input and Increment  |[HL]=[C],HL=HL+1,B=B-1|
-;|IND       |?*??1-|Input and Decrement  |[HL]=[C],HL=HL-1,B=B-1|
-;|INIR      |?1??1-|Input, Inc., Repeat  |INI till B=0          |
-;|INDR      |?1??1-|Input, Dec., Repeat  |IND till B=0          |
-
-op_INxx_common:
-       cbr     z_flags,(1<<ZFL_Z)
-       sbr     z_flags,(1<<ZFL_N)
-       ldd     temp2,y+oz_c    ;C
-       lcall   portRead
-       ldd     xh,y+oz_h               ;H
-       ldd     xl,y+oz_l               ;L
-       lcall   dram_write
-       ldd     temp,y+oz_b     ;B
-       dec     temp
-       std     y+oz_b,temp     ;B
-       brne    PC+2
-        sbr    z_flags,(1<<ZFL_Z)
-       ret
-
-do_op_INI:
-       rcall   op_INxx_common
-       adiw    x,1
-       std     y+oz_l,xl               ;L
-       std     y+oz_h,xh               ;H
-       ret
-
-do_op_IND:
-       rcall   op_INxx_common
-       sbiw    x,1
-       std     y+oz_l,xl               ;L
-       std     y+oz_h,xh               ;H
-       ret
-
-do_op_INIR:
-       rcall   do_op_INI
-       sbrc    z_flags,ZFL_Z
-        ret
-       sbiw    z_pcl,2
-       ret
-
-do_op_INDR:
-       rcall   do_op_IND
-       sbrc    z_flags,ZFL_Z
-        ret
-       sbiw    z_pcl,2
-       ret
-
-;----------------------------------------------------------------
-;|Mnemonic  |SZHPNC|Description          |Notes                 |
-;----------------------------------------------------------------
-;|OUTI      |?*??1-|Output and Increment |[C]=[HL],HL=HL+1,B=B-1|
-;|OUTD      |?*??1-|Output and Decrement |[C]=[HL],HL=HL-1,B=B-1|
-;|OTIR      |?1??1-|Output, Inc., Repeat |OUTI till B=0         |
-;|OTDR      |?1??1-|Output, Dec., Repeat |OUTD till B=0         |
-
-op_OUTxx_common:
-       cbr     z_flags,(1<<ZFL_Z)
-       sbr     z_flags,(1<<ZFL_N)
-       lcall   dram_read               ;temp = (z)
-       ldd     temp2,y+oz_c    ;C
-       lcall   portWrite
-       ldd     temp,y+oz_b     ;B
-       dec     temp
-       std     y+oz_b,temp     ;B
-       brne    PC+2
-        sbr    z_flags,(1<<ZFL_Z)
-       ret
-
-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
-       ret
-
-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
-       ret
-
-do_op_OTIR:
-       rcall   do_op_OUTI
-       sbrc    z_flags,ZFL_Z
-        ret
-       sbiw    z_pcl,2
-       ret
-
-do_op_OTDR:
-       rcall   do_op_OUTD
-       sbrc    z_flags,ZFL_Z
-        ret
-       sbiw    z_pcl,2
-       ret
-
 
-       opctable EDjmp
-
-instr  fetch_nop,      op_nop,         store_nop       ;00             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;01             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;02             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;03             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;04             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;05             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;06             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;07             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;08             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;09             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;0A             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;0B             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;0C             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;0D             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;0E             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;0F             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;10             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;11             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;12             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;13             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;14             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;15             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;16             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;17             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;18             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;19             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;1A             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;1B             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;1C             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;1D             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;1E             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;1F             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;20             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;21             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;22             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;23             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;24             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;25             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;26             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;27             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;28             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;29             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;2A             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;2B             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;2C             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;2D             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;2E             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;2F             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;30             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;31             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;32             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;33             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;34             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;35             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;36             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;37             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;38             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;39             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;3A             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;3B             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;3C             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;3D             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;3E             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;3F             ;NOP
-instr  fetch_C,        op_IN,          store_B         ;40             ;IN B,(C)
-instr  fetch_B,        op_OUT,         store_nop       ;41             ;OUT (C),B
-instr  fetch_BC,       op_SBCHL,       store_nop       ;42             ;SBC HL,BC
-instr  fetch_DIR16,    op_STBC,        store_nop       ;43             ;LD (nn),BC
-instr  fetch_nop,      op_NEG,         store_nop       ;44             ;NEG
-instr  fetch_nop,      op_RETN,        store_nop       ;45             ;RETN
-instr  fetch_nop,      op_IM0,         store_nop       ;46             ;IM 0
-instr  fetch_nop,      op_ldia,        store_nop       ;47             ;LD I,A
-instr  fetch_C,        op_IN,          store_C         ;48             ;IN C,(C)
-instr  fetch_C,        op_OUT,         store_nop       ;49             ;OUT (C),C
-instr  fetch_BC,       op_ADCHL,       store_nop       ;4A             ;ADC HL,BC
-instr  fetch_DIR16,    op_RMEM16,      store_BC        ;4B nn nn       ;LD BC,(nn)
-instr  fetch_nop,      op_NEG,         store_nop       ;4C             ;NEG
-instr  fetch_nop,      op_RETI,        store_nop       ;4D             ;RETI
-instr  fetch_nop,      op_IM0,         store_nop       ;4E             ;IM 0
-instr  fetch_nop,      op_ldra,        store_nop       ;4F             ;LD R,A
-instr  fetch_C,        op_IN,          store_D         ;50             ;IN D,(C)
-instr  fetch_D,        op_OUT,         store_nop       ;51             ;OUT (C),D
-instr  fetch_DE,       op_SBCHL,       store_nop       ;52             ;SBC HL,DE
-instr  fetch_DIR16,    op_STDE,        store_nop       ;53 nn nn       ;LD (nn),DE
-instr  fetch_nop,      op_NEG,         store_nop       ;54             ;NEG
-instr  fetch_nop,      op_RETN,        store_nop       ;55             ;RETN
-instr  fetch_nop,      op_IM1,         store_nop       ;56             ;IM 1
-instr  fetch_nop,      op_ldai,        store_nop       ;57             ;LD A,I
-instr  fetch_C,        op_IN,          store_E         ;58             ;IN E,(C)
-instr  fetch_E,        op_OUT,         store_nop       ;59             ;OUT (C),E
-instr  fetch_DE,       op_ADCHL,       store_nop       ;5A             ;ADC HL,DE
-instr  fetch_DIR16,    op_RMEM16,      store_DE        ;5B nn nn       ;LD DE,(nn)
-instr  fetch_nop,      op_NEG,         store_nop       ;5C             ;NEG
-instr  fetch_nop,      op_RETN,        store_nop       ;5D             ;RETN
-instr  fetch_nop,      op_IM2,         store_nop       ;5E             ;IM 2
-instr  fetch_nop,      op_ldar,        store_nop       ;5F             ;LD A,R
-instr  fetch_C,        op_IN,          store_H         ;60             ;IN H,(C)
-instr  fetch_H,        op_OUT,         store_nop       ;61             ;OUT (C),H
-instr  fetch_HL,       op_SBCHL,       store_nop       ;62             ;SBC HL,HL
-instr  fetch_DIR16,    op_STHL,        store_nop       ;63 nn nn       ;LD (nn),HL
-instr  fetch_nop,      op_NEG,         store_nop       ;64             ;NEG
-instr  fetch_nop,      op_RETN,        store_nop       ;65             ;RETN
-instr  fetch_nop,      op_IM0,         store_nop       ;66             ;IM 0
-instr  fetch_mhl,      op_RRD,         store_mhl       ;67             ;RRD
-instr  fetch_C,        op_IN,          store_L         ;68             ;IN L,(C)
-instr  fetch_L,        op_OUT,         store_nop       ;69             ;OUT (C),L
-instr  fetch_HL,       op_ADCHL,       store_nop       ;6A             ;ADC HL,HL
-instr  fetch_DIR16,    op_RMEM16,      store_HL        ;6B nn nn       ;LD HL,(nn)
-instr  fetch_nop,      op_NEG,         store_nop       ;6C             ;NEG
-instr  fetch_nop,      op_RETN,        store_nop       ;6D             ;RETN
-instr  fetch_nop,      op_IM0,         store_nop       ;6E             ;IM 0
-instr  fetch_mhl,      op_RLD,         store_mhl       ;6F             ;RLD
-instr  fetch_C,        op_IN,          store_nop       ;70             ;IN (C)
-instr  fetch_0,        op_OUT,         store_nop       ;71             ;OUT (C),0
-instr  fetch_SP,       op_SBCHL,       store_nop       ;72             ;SBC HL,SP
-instr  fetch_DIR16,    op_STSP,        store_nop       ;73 nn nn       ;LD (nn),SP
-instr  fetch_nop,      op_NEG,         store_nop       ;74             ;NEG
-instr  fetch_nop,      op_RETN,        store_nop       ;75             ;RETN
-instr  fetch_nop,      op_IM1,         store_nop       ;76             ;IM 1
-instr  fetch_nop,      op_nop,         store_nop       ;77             ;NOP
-instr  fetch_C,        op_IN,          store_A         ;78             ;IN A,(C)
-instr  fetch_A,        op_OUT,         store_nop       ;79             ;OUT (C),A
-instr  fetch_SP,       op_ADCHL,       store_nop       ;7A             ;ADC HL,SP
-instr  fetch_DIR16,    op_RMEM16,      store_SP        ;7B nn nn       ;LD SP,(nn)
-instr  fetch_nop,      op_NEG,         store_nop       ;7C             ;NEG
-instr  fetch_nop,      op_RETN,        store_nop       ;7D             ;RETN
-instr  fetch_nop,      op_IM2,         store_nop       ;7E             ;IM 2
-instr  fetch_nop,      op_nop,         store_nop       ;7F             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;80             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;81             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;82             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;83             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;84             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;85             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;86             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;87             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;88             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;89             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;8A             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;8B             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;8C             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;8D             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;8E             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;8F             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;90             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;91             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;92             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;93             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;94             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;95             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;96             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;97             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;98             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;99             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;9A             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;9B             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;9C             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;9D             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;9E             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;9F             ;NOP
-instr  fetch_nop,      op_LDI,         store_nop       ;A0             ;LDI
-instr  fetch_nop,      op_CPI,         store_nop       ;A1     ;CPI
-instr  fetch_nop,      op_INI,         store_nop       ;A2             ;INI
-instr  fetch_nop,      op_OUTI,        store_nop       ;A3             ;OUTI
-instr  fetch_nop,      op_nop,         store_nop       ;A4             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;A5             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;A6             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;A7             ;NOP
-instr  fetch_nop,      op_LDD,         store_nop       ;A8             ;LDD
-instr  fetch_nop,      op_CPD,         store_nop       ;A9     ;CPD
-instr  fetch_nop,      op_IND,         store_nop       ;AA             ;IND
-instr  fetch_nop,      op_OUTD,        store_nop       ;AB             ;OUTD
-instr  fetch_nop,      op_nop,         store_nop       ;AC             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;AD             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;AE             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;AF             ;NOP
-instr  fetch_nop,      op_LDIR,        store_nop       ;B0             ;LDIR
-instr  fetch_nop,      op_CPIR,        store_nop       ;B1     ;CPIR
-instr  fetch_nop,      op_INIR,        store_nop       ;B2             ;INIR
-instr  fetch_nop,      op_OTIR,        store_nop       ;B3             ;OTIR
-instr  fetch_nop,      op_nop,         store_nop       ;B4             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;B5             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;B6             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;B7             ;NOP
-instr  fetch_nop,      op_LDDR,        store_nop       ;B8             ;LDDR
-instr  fetch_nop,      op_CPDR,        store_nop       ;B9     ;CPDR
-instr  fetch_nop,      op_INDR,        store_nop       ;BA             ;INDR
-instr  fetch_nop,      op_OTDR,        store_nop       ;BB             ;OTDR
-instr  fetch_nop,      op_nop,         store_nop       ;BC             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;BD             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;BE             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;BF             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C0             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C1             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C2             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C3             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C4             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C5             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C6             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C7             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C8             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;C9             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;CA             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;CB             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;CC             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;CD             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;CE             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;CF             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D0             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D1             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D2             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D3             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D4             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D5             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D6             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D7             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D8             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;D9             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;DA             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;DB             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;DC             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;DD             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;DE             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;DF             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E0             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E1             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E2             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E3             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E4             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E5             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E6             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E7             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E8             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;E9             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;EA             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;EB             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;EC             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;ED             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;EE             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;EF             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F0             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F1             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F2             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F3             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F4             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F5             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F6             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F7             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F8             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;F9             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;FA             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;FB             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;FC             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;FD             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;FE             ;NOP
-instr  fetch_nop,      op_nop,         store_nop       ;FF             ;NOP
-
-
-       opctable        DDFDjmp
+       opctable DDFDjmp, PC    ;+256
 
 instr  fetch_nop,      op_noni,                store_nop       ;00             ;
 instr  fetch_nop,      op_noni,        store_nop       ;01             ;
@@ -3326,15 +2653,15 @@ instr   fetch_DIR16,    op_nop,         store_xx        ;21             ;LD xx,nn
 instr  fetch_DIR16,    op_STxx,        store_nop       ;22             ;LD (nn),xx
 instr  fetch_xx,       op_INC16,       store_xx        ;23             ;INC xx
 instr  fetch_xH,       op_INC,         store_xH        ;24             ;INC xh
-instr  fetch_xH,       op_DEC,         store_xH        ;25     ;DEC xh
+instr  fetch_xH,       op_DEC,         store_xH        ;25             ;DEC xh
 instr  fetch_DIR8,     op_nop,         store_xH        ;26             ;LD xh,n
 instr  fetch_nop,      op_noni,        store_nop       ;27             ;
 instr  fetch_nop,      op_noni,        store_nop       ;28             ;
 instr  fetch_xx,       op_ADDxx,       store_nop       ;29             ;ADD xx,xx
 instr  fetch_DIR16,    op_RMEM16,      store_xx        ;2A             ;LD xx,(nn)
-instr  fetch_xx,       op_DEC16,       store_xx        ;2B     ;DEC xx
+instr  fetch_xx,       op_DEC16,       store_xx        ;2B             ;DEC xx
 instr  fetch_xL,       op_INC,         store_xL        ;2C             ;INC xl
-instr  fetch_xL,       op_DEC,         store_xL        ;2D     ;DEC xl
+instr  fetch_xL,       op_DEC,         store_xL        ;2D             ;DEC xl
 instr  fetch_DIR8,     op_nop,         store_xL        ;2E             ;LD xl,n
 instr  fetch_nop,      op_noni,        store_nop       ;2F             ;
 instr  fetch_nop,      op_noni,        store_nop       ;30             ;
@@ -3342,7 +2669,7 @@ instr     fetch_nop,      op_noni,        store_nop       ;31             ;
 instr  fetch_nop,      op_noni,        store_nop       ;32             ;
 instr  fetch_nop,      op_noni,        store_nop       ;33             ;
 instr  fetch_MXX,      op_INC,         store_MXX_0     ;34             ;INC (xx+d)
-instr  fetch_MXX,      op_DEC,         store_MXX_0     ;35     ;DEC (xx+d)
+instr  fetch_MXX,      op_DEC,         store_MXX_0     ;35             ;DEC (xx+d)
 instr  fetch_DIR8_2,   op_nop,         store_MXX_2     ;36             ;LD (xx+d),n
 instr  fetch_nop,      op_noni,        store_nop       ;37             ;
 instr  fetch_nop,      op_noni,        store_nop       ;38             ;
@@ -3477,9 +2804,9 @@ instr     fetch_nop,      op_noni,        store_nop       ;B8             ;
 instr  fetch_nop,      op_noni,        store_nop       ;B9             ;
 instr  fetch_nop,      op_noni,        store_nop       ;BA             ;
 instr  fetch_nop,      op_noni,        store_nop       ;BB             ;
-instr  fetch_xH,       op_CPFA,        store_nop       ;BC     ;CP A,xh
-instr  fetch_xL,       op_CPFA,        store_nop       ;BD     ;CP A,xl
-instr  fetch_MXX,      op_CPFA,        store_nop       ;BE     ;CP A,(xx)
+instr  fetch_xH,       op_CPFA,        store_nop       ;BC             ;CP A,xh
+instr  fetch_xL,       op_CPFA,        store_nop       ;BD             ;CP A,xl
+instr  fetch_MXX,      op_CPFA,        store_nop       ;BE             ;CP A,(xx)
 instr  fetch_nop,      op_noni,        store_nop       ;BF             ;
 instr  fetch_nop,      op_noni,        store_nop       ;C0             ;
 instr  fetch_nop,      op_noni,        store_nop       ;C1             ;
@@ -3516,7 +2843,7 @@ instr     fetch_nop,      op_noni,        store_nop       ;DF             ;
 instr  fetch_nop,      op_noni,        store_nop       ;E0             ;
 instr  fetch_nop,      op_POP16,       store_xx        ;E1             ;POP xx
 instr  fetch_nop,      op_noni,        store_nop       ;E2             ;
-instr  fetch_MSP,      op_EXxx,        store_MSP       ;E3     ;EX (SP),xx
+instr  fetch_MSP,      op_EXxx,        store_MSP       ;E3             ;EX (SP),xx
 instr  fetch_nop,      op_noni,        store_nop       ;E4             ;
 instr  fetch_xx,       op_PUSH16,      store_nop       ;E5             ;PUSH xx
 instr  fetch_nop,      op_noni,        store_nop       ;E6             ;
@@ -3561,6 +2888,8 @@ instr     fetch_nop,      op_noni,        store_nop       ;FF             ;
 ;|SRL m     |**0P0*|Shift Right Logical  |m=->{0,m,CY}          |
 
 
+       checkspace PC, 9
+
 do_op_rlc:
        ;Rotate Left Cyclical. All bits move 1 to the 
        ;left, the msb becomes c and lsb.
@@ -3572,6 +2901,8 @@ do_op_rlc:
        or      z_flags,temp
        ret
 
+       checkspace PC, 9
+
 do_op_rrc: 
        ;Rotate Right Cyclical. All bits move 1 to the 
        ;right, the lsb becomes c and msb.
@@ -3583,6 +2914,8 @@ do_op_rrc:
        ret
 
 
+       checkspace PC, 11
+
 do_op_rl:
        ;Rotate Left. All bits move 1 to the left, the msb 
        ;becomes c, c becomes lsb.
@@ -3596,6 +2929,8 @@ do_op_rl:
        ret
 
 
+       checkspace PC, 10
+
 do_op_rr:
        ;Rotate Right. All bits move 1 to the right, the lsb 
        ;becomes c, c becomes msb.
@@ -3607,6 +2942,8 @@ do_op_rr:
        bmov    z_flags,ZFL_C, temp,AVR_C       ;
        ret
 
+       checkspace PC, 9
+
 do_op_sla:
        lsl     opl
        in      temp,sreg
@@ -3614,6 +2951,8 @@ do_op_sla:
        bmov    z_flags,ZFL_C, temp,AVR_C       ;
        ret
 
+       checkspace PC, 11
+
 do_op_sra:
        lsr     opl
        in      temp,sreg
@@ -3622,6 +2961,8 @@ do_op_sra:
        bmov    z_flags,ZFL_C, temp,AVR_C       ;
        ret
 
+       checkspace PC, 9
+
 do_op_sll:
        sec
        rol     opl
@@ -3630,6 +2971,8 @@ do_op_sll:
        bmov    z_flags,ZFL_C, temp,AVR_C       ;
        ret
 
+       checkspace PC, 8
+
 do_op_srl:
        lsr     opl
        in      temp,sreg
@@ -3645,35 +2988,45 @@ do_op_srl:
 ;|SET b,m   |------|Set bit              |m=mv{2^b}             |
 
 
+       checkspace PC, 2
 do_op_BIT7:
        ldi     temp,0x80
        rjmp    opbit
+       checkspace PC, 2
 do_op_BIT6:
        ldi     temp,0x40
        rjmp    opbit
+       checkspace PC, 2
 do_op_BIT5:
        ldi     temp,0x20
        rjmp    opbit
+       checkspace PC, 2
 do_op_BIT4:
        ldi     temp,0x10
        rjmp    opbit
+       checkspace PC, 2
 do_op_BIT3:
        ldi     temp,0x08
        rjmp    opbit
+       checkspace PC, 2
 do_op_BIT2:
        ldi     temp,0x04
        rjmp    opbit
+       checkspace PC, 2
 do_op_BIT1:
        ldi     temp,0x02
        rjmp    opbit
+
+       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
 
 
@@ -3794,41 +3147,48 @@ opbit:
 ;      std     y+oz_b,opl
 ;.endm
 ;.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
 do_store2_a:
        mov z_a,opl
        ret
 
+       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
 
-       opctable        CBjmp
+       opctable CBjmp, PC      ;+256
 
 instr  fetch_B,        op_RLC,         store2_B        ;00             ;RLC B
 instr  fetch_C,        op_RLC,         store2_C        ;01             ;RLC C
@@ -4088,7 +3448,7 @@ instr     fetch2_mhl,     op_SET7,        store_MHL       ;FE             ;SET 7,(HL)
 instr  fetch_A,        op_SET7,        store2_A        ;FF             ;SET 7,A
 
 
-       opctable        DDFDCBjmp
+       opctable DDFDCBjmp, PC ;+256
 
 instr  fetch_nop,      op_RLC,         store2_B        ;00             ;RLC (Ix+d),B
 instr  fetch_nop,      op_RLC,         store2_C        ;01             ;RLC (Ix+d),C
@@ -4347,6 +3707,796 @@ instr   fetch_nop,      op_SET7,        store2_L        ;FD             ;SET 7,(Ix+d),L
 instr  fetch_nop,      op_SET7,        store_nop       ;FE             ;SET 7,(Ix+d)
 instr  fetch_nop,      op_SET7,        store2_A        ;FF             ;SET 7,(Ix+d),A
 
+do_fetch_0:
+       ldi     opl,0
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|IN r,[C]  |***P0-|Input                |r=[C]                 |
+;
+
+do_op_in:                      ; in opl,(opl)
+.if PORT_DEBUG
+       push    opl     
+       cp      opl,_0          ; don't debug port 0 (con stat)
+       breq    dbg_op_in_1
+       printnewline
+       printstring "Port read: ("
+       mov temp,opl
+       lcall printhex
+       printstring ") -> "
+dbg_op_in_1:
+.endif
+
+       mov     temp2,opl
+       lcall   portRead
+       mov     opl,temp
+       bst     z_flags,ZFL_C                   ;save Carry
+       ldpmx   z_flags,sz53p_tab,temp          ;S,Z,P
+       bld     z_flags,ZFL_C
+
+.if PORT_DEBUG
+       pop     temp
+       cp      temp,_0
+       breq    dbg_op_in_2
+       lcall printhex
+       printstring " "
+dbg_op_in_2:
+.endif
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|OUT [C],r |------|Output               |[C]=r                 |
+;
+
+do_op_out:                     ; out (c),opl
+.if PORT_DEBUG
+       printnewline
+       printstring "Port write: "
+       mov temp,opl
+       lcall printhex
+       printstring " -> ("
+       mov     temp,z_c
+       lcall printhex
+       printstring ") "
+.endif
+       mov     temp,opl
+       mov     temp2,z_c
+       lcall   portWrite
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|LD dst,src|------|Load                 |dst=src               |
+;
+
+do_op_stbc:            ;store bc to mem loc in opl:h
+       movw xl,opl
+       mem_write_s z_c
+       adiw xl,1
+       mem_write_s z_b
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|LD dst,src|------|Load                 |dst=src               |
+;
+;
+do_op_stde:            ;store de to mem loc in opl:h
+       movw xl,opl
+       mem_write_s z_e
+       adiw xl,1
+       mem_write_s z_d
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|LD dst,src|------|Load                 |dst=src               |
+;
+;
+do_op_stsp:            ;store sp to mem loc in opl:h
+       movw xl,opl
+       mem_write_s z_spl
+       adiw xl,1
+       mem_write_s z_sph
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|ADC HL,ss |***V0*|Add with Carry       |HL=HL+ss+CY           |
+;
+
+do_op_ADCHL:
+       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
+       bmov    z_flags,ZFL_Z, temp,AVR_Z
+       bmov    z_flags,ZFL_S, temp2,AVR_N
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|SBC HL,ss |***V1*|Subtract with carry  |HL=HL-ss-CY           |
+;
+
+       checkspace PC, 24
+
+do_op_sbchl:
+       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
+       bmov    z_flags,ZFL_C, temp,AVR_C
+       bmov    z_flags,ZFL_P, temp,AVR_V
+       bmov    z_flags,ZFL_H, temp,AVR_H
+       bmov    z_flags,ZFL_Z, temp,AVR_Z
+       bmov    z_flags,ZFL_S, temp,AVR_N
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|NEG       |***V1*|Negate A             |A=0-A                 |
+
+;
+do_op_NEG:
+       ldi     temp,0
+       sub     temp,z_a
+       mov     z_a,temp
+       in      temp,sreg
+       ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,P
+       bmov    z_flags,ZFL_C, temp,AVR_C
+       bmov    z_flags,ZFL_H, temp,AVR_H
+       do_z80_flags_V
+       do_z80_flags_set_N
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|RETI      |------|Return from Interrupt|PC=[SP]+              |
+;|RETN      |------|Return from NMI      |  Copy IFF2 to IFF1   |
+
+
+do_op_RETI:
+do_op_RETN:
+       ldd     temp,y+oz_istat
+       bmov    temp,IFF1, temp,IFF2
+       std     y+oz_istat,temp
+       ljmp    do_store_ret
+
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|IM n      |------|Interrupt Mode       |             (n=0,1,2)|
+
+do_op_IM0:
+       ldd     temp,y+oz_istat
+       andi    temp, ~IM_MASK
+       std     y+oz_istat,temp
+       ret
+
+do_op_IM1:
+       ldd     temp,y+oz_istat
+       andi    temp,~IM_MASK
+       ori     temp,IM1
+       std     y+oz_istat,temp
+       ret
+
+do_op_IM2:
+       ldd     temp,y+oz_istat
+       andi    temp, ~IM_MASK
+       ori     temp,IM2
+       std     y+oz_istat,temp
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|LD A,i    |**0*0-|Load                 |(i=I,R)  IFF2 --> P   |
+;|LD i,A    |------|Load                 |(i=I,R)               |
+
+do_op_ldai:
+       ldd     z_a,y+oz_i
+       rjmp    op_ldar1
+
+do_op_ldar:
+       ldd     z_a,y+oz_r
+op_ldar1:
+       bst     z_flags,ZFL_C                   ;save C
+       ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,H,P,N      
+       bld     z_flags,ZFL_C                   ;
+       ldd     temp,y+oz_istat
+       bmov    z_flags,ZFL_P, temp,IFF2
+       ret
+
+do_op_ldia:
+       std     y+oz_i,z_a
+       ret
+
+do_op_ldra:
+       std     y+oz_r,z_a
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|RLD       |**0P0-|Rotate Left 4 bits   |{A,[HL]}={A,[HL]}<- ##|
+;|RRD       |**0P0-|Rotate Right 4 bits  |{A,[HL]}=->{A,[HL]} ##|
+
+do_op_rld:
+       swap    opl
+       mov     oph,opl
+       andi    opl,0xf0
+       andi    oph,0x0f
+       mov     temp,z_a
+       andi    temp,0x0f
+       or      opl,temp
+       mov     temp,z_a
+       andi    temp,0xf0
+       or      temp,oph
+       mov     z_a,temp
+       bst     z_flags,ZFL_C                   ;save C
+       ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,H,P,N      
+       bld     z_flags,ZFL_C                   ;
+       ret
+
+do_op_rrd:
+       mov     oph,opl
+       andi    opl,0xf0
+       andi    oph,0x0f
+       mov     temp,z_a
+       andi    temp,0x0f
+       or      opl,temp
+       swap    opl
+       mov     temp,z_a
+       andi    temp,0xf0
+       or      temp,oph
+       mov     z_a,temp
+       bst     z_flags,ZFL_C                   ;save C
+       ldpmx   z_flags,sz53p_tab,z_a           ;S,Z,H,P,N      
+       bld     z_flags,ZFL_C                   ;
+       ret
+
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|LDD       |--0*0-|Load and Decrement   |[DE]=[HL],HL=HL-1,#   |
+;|LDDR      |--000-|Load, Dec., Repeat   |LDD till BC=0         |
+;|LDI       |--0*0-|Load and Increment   |[DE]=[HL],HL=HL+1,#   |
+;|LDIR      |--000-|Load, Inc., Repeat   |LDI till BC=0         |
+;
+
+       checkspace PC, 13
+
+op_LDxx_common:
+       movw    x,z_l                   ;HL
+;      mem_read_ds temp, z
+       lcall   dram_read               ; temp = (HL)
+       movw    x,z_e                   ;DE
+;      mem_write_ds x, temp
+       lcall   dram_write              ; (DE) = temp
+
+       cbr     z_flags,(1<<ZFL_H) | (1<<ZFL_P) | (1<<ZFL_N)
+
+       movw    x,z_c
+       sbiw    x,1                     ;BC--
+       movw    z_c,x
+       breq    PC+2
+        sbr    z_flags,(1<<ZFL_P)
+       ret
+
+       checkspace PC, 6
+
+do_op_LDI:
+       rcall   op_LDxx_common
+       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, 6
+
+do_op_LDD:
+       rcall   op_LDxx_common
+       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
+
+do_op_LDIR:
+       rcall   do_op_LDI
+#if 1
+       sbrc    z_flags,ZFL_P
+        rjmp   do_op_LDIR
+       ret
+#else
+       sbrs    z_flags,ZFL_P
+        ret
+       sbiw    z_pcl,2
+       ret
+#endif
+
+       checkspace PC, 5
+
+do_op_LDDR:
+       rcall   do_op_LDD
+       sbrs    z_flags,ZFL_P
+        ret
+       sbiw    z_pcl,2
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|CPD       |****1-|Compare and Decrement|A-[HL],HL=HL-1,BC=BC-1|
+;|CPDR      |****1-|Compare, Dec., Repeat|CPD till A=[HL]or BC=0|
+;|CPI       |****1-|Compare and Increment|A-[HL],HL=HL+1,BC=BC-1|
+;|CPIR      |****1-|Compare, Inc., Repeat|CPI till A=[HL]or BC=0|
+
+
+       checkspace PC, 21
+
+op_CPxx_common:
+       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)
+
+       cp      z_a,temp                ; A - (HL)
+
+       brpl    PC+2
+        sbr    z_flags,(1<<ZFL_S)
+       brne    PC+2
+        sbr    z_flags,(1<<ZFL_Z)
+       brhc    PC+2
+        sbr    z_flags,(1<<ZFL_H)
+
+       sbiw    z,1                     ; BC--
+       breq    PC+2
+        sbr    z_flags,(1<<ZFL_P)
+       movw    z_c,z                   ;BC
+       ret
+
+       checkspace PC, 5
+
+do_op_CPI:
+       rcall   op_CPxx_common
+       adiw    x,1                     ; HL++
+       movw    z_l,x                   ; HL
+       ret
+
+
+       checkspace PC, 5
+
+do_op_CPD:
+       rcall   op_CPxx_common
+       sbiw    x,1                     ; HL--
+       movw    z_l,x                   ; HL
+       ret
+
+       checkspace PC, 7
+
+do_op_CPIR:
+       rcall   do_op_CPI
+       sbrc    z_flags,ZFL_Z
+        ret
+       sbrs    z_flags,ZFL_P
+        ret
+       sbiw    z_pcl,2
+       ret
+
+       checkspace PC, 7
+
+do_op_CPDR:
+       rcall   do_op_CPD
+       sbrc    z_flags,ZFL_Z
+        ret
+       sbrs    z_flags,ZFL_P
+        ret
+       sbiw    z_pcl,2
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|INI       |?*??1-|Input and Increment  |[HL]=[C],HL=HL+1,B=B-1|
+;|IND       |?*??1-|Input and Decrement  |[HL]=[C],HL=HL-1,B=B-1|
+;|INIR      |?1??1-|Input, Inc., Repeat  |INI till B=0          |
+;|INDR      |?1??1-|Input, Dec., Repeat  |IND till B=0          |
+
+       checkspace PC, 12
+
+op_INxx_common:
+       cbr     z_flags,(1<<ZFL_Z)
+       sbr     z_flags,(1<<ZFL_N)
+       mov     temp2,z_c               ;C
+       lcall   portRead
+       movw    x,z_l                   ;HL
+       lcall   dram_write
+       dec     z_b                     ;B
+       brne    PC+2
+        sbr    z_flags,(1<<ZFL_Z)
+       ret
+
+       checkspace PC, 4
+
+do_op_INI:
+       rcall   op_INxx_common
+       adiw    x,1
+       movw    z_l,x                   ;HL
+       ret
+
+       checkspace PC, 4
+
+do_op_IND:
+       rcall   op_INxx_common
+       sbiw    x,1
+       movw    z_l,x                   ;HL
+       ret
+
+       checkspace PC, 5
+
+do_op_INIR:
+       rcall   do_op_INI
+       sbrc    z_flags,ZFL_Z
+        ret
+       sbiw    z_pcl,2
+       ret
+
+       checkspace PC, 5
+
+do_op_INDR:
+       rcall   do_op_IND
+       sbrc    z_flags,ZFL_Z
+        ret
+       sbiw    z_pcl,2
+       ret
+
+;----------------------------------------------------------------
+;|Mnemonic  |SZHPNC|Description          |Notes                 |
+;----------------------------------------------------------------
+;|OUTI      |?*??1-|Output and Increment |[C]=[HL],HL=HL+1,B=B-1|
+;|OUTD      |?*??1-|Output and Decrement |[C]=[HL],HL=HL-1,B=B-1|
+;|OTIR      |?1??1-|Output, Inc., Repeat |OUTI till B=0         |
+;|OTDR      |?1??1-|Output, Dec., Repeat |OUTD till B=0         |
+
+       checkspace PC, 12
+
+op_OUTxx_common:
+       movw    x,z_l                   ;HL
+       lcall   dram_read               ;temp = (z)
+       mov     temp2,z_c               ;C
+       lcall   portWrite
+       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, 4
+
+do_op_OUTI:
+       rcall   op_OUTxx_common
+       sub     z_l,_255                ;-low(-1)
+       sbc     z_h,_255                ;-high(-1)
+       ret
+
+       checkspace PC, 4
+
+do_op_OUTD:
+       rcall   op_OUTxx_common
+       add     z_l,_255                ;+low(-1)
+       adc     z_h,_255                ;+high(-1)
+       ret
+
+       checkspace PC, 5
+
+do_op_OTIR:
+       rcall   do_op_OUTI
+       sbrc    z_flags,ZFL_Z
+        ret
+       sbiw    z_pcl,2
+       ret
+
+       checkspace PC, 5
+
+do_op_OTDR:
+       rcall   do_op_OUTD
+       sbrc    z_flags,ZFL_Z
+        ret
+       sbiw    z_pcl,2
+       ret
+
+#if 1
+       opctable EDjmp, PC      ;+ 2*256
+
+instr  fetch_nop,      op_nop,         store_nop       ;00             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;01             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;02             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;03             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;04             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;05             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;06             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;07             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;08             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;09             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;0A             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;0B             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;0C             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;0D             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;0E             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;0F             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;10             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;11             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;12             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;13             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;14             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;15             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;16             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;17             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;18             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;19             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;1A             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;1B             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;1C             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;1D             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;1E             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;1F             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;20             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;21             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;22             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;23             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;24             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;25             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;26             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;27             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;28             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;29             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;2A             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;2B             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;2C             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;2D             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;2E             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;2F             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;30             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;31             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;32             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;33             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;34             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;35             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;36             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;37             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;38             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;39             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;3A             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;3B             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;3C             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;3D             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;3E             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;3F             ;NOP
+instr  fetch_C,        op_IN,          store2_B        ;40             ;IN B,(C)
+instr  fetch_B,        op_OUT,         store_nop       ;41             ;OUT (C),B
+instr  fetch_BC,       op_SBCHL,       store_nop       ;42             ;SBC HL,BC
+instr  fetch_DIR16,    op_STBC,        store_nop       ;43             ;LD (nn),BC
+instr  fetch_nop,      op_NEG,         store_nop       ;44             ;NEG
+instr  fetch_nop,      op_RETN,        store_nop       ;45             ;RETN
+instr  fetch_nop,      op_IM0,         store_nop       ;46             ;IM 0
+instr  fetch_nop,      op_ldia,        store_nop       ;47             ;LD I,A
+instr  fetch_C,        op_IN,          store2_C        ;48             ;IN C,(C)
+instr  fetch_C,        op_OUT,         store_nop       ;49             ;OUT (C),C
+instr  fetch_BC,       op_ADCHL,       store_nop       ;4A             ;ADC HL,BC
+instr  fetch_DIR16,    op_RMEM16,      store_BC        ;4B nn nn       ;LD BC,(nn)
+instr  fetch_nop,      op_NEG,         store_nop       ;4C             ;NEG
+instr  fetch_nop,      op_RETI,        store_nop       ;4D             ;RETI
+instr  fetch_nop,      op_IM0,         store_nop       ;4E             ;IM 0
+instr  fetch_nop,      op_ldra,        store_nop       ;4F             ;LD R,A
+instr  fetch_C,        op_IN,          store2_D        ;50             ;IN D,(C)
+instr  fetch_D,        op_OUT,         store_nop       ;51             ;OUT (C),D
+instr  fetch_DE,       op_SBCHL,       store_nop       ;52             ;SBC HL,DE
+instr  fetch_DIR16,    op_STDE,        store_nop       ;53 nn nn       ;LD (nn),DE
+instr  fetch_nop,      op_NEG,         store_nop       ;54             ;NEG
+instr  fetch_nop,      op_RETN,        store_nop       ;55             ;RETN
+instr  fetch_nop,      op_IM1,         store_nop       ;56             ;IM 1
+instr  fetch_nop,      op_ldai,        store_nop       ;57             ;LD A,I
+instr  fetch_C,        op_IN,          store2_E        ;58             ;IN E,(C)
+instr  fetch_E,        op_OUT,         store_nop       ;59             ;OUT (C),E
+instr  fetch_DE,       op_ADCHL,       store_nop       ;5A             ;ADC HL,DE
+instr  fetch_DIR16,    op_RMEM16,      store_DE        ;5B nn nn       ;LD DE,(nn)
+instr  fetch_nop,      op_NEG,         store_nop       ;5C             ;NEG
+instr  fetch_nop,      op_RETN,        store_nop       ;5D             ;RETN
+instr  fetch_nop,      op_IM2,         store_nop       ;5E             ;IM 2
+instr  fetch_nop,      op_ldar,        store_nop       ;5F             ;LD A,R
+instr  fetch_C,        op_IN,          store2_H        ;60             ;IN H,(C)
+instr  fetch_H,        op_OUT,         store_nop       ;61             ;OUT (C),H
+instr  fetch_HL,       op_SBCHL,       store_nop       ;62             ;SBC HL,HL
+instr  fetch_DIR16,    op_STHL,        store_nop       ;63 nn nn       ;LD (nn),HL
+instr  fetch_nop,      op_NEG,         store_nop       ;64             ;NEG
+instr  fetch_nop,      op_RETN,        store_nop       ;65             ;RETN
+instr  fetch_nop,      op_IM0,         store_nop       ;66             ;IM 0
+instr  fetch2_mhl,     op_RRD,         store_mhl       ;67             ;RRD
+instr  fetch_C,        op_IN,          store2_L        ;68             ;IN L,(C)
+instr  fetch_L,        op_OUT,         store_nop       ;69             ;OUT (C),L
+instr  fetch_HL,       op_ADCHL,       store_nop       ;6A             ;ADC HL,HL
+instr  fetch_DIR16,    op_RMEM16,      store_HL        ;6B nn nn       ;LD HL,(nn)
+instr  fetch_nop,      op_NEG,         store_nop       ;6C             ;NEG
+instr  fetch_nop,      op_RETN,        store_nop       ;6D             ;RETN
+instr  fetch_nop,      op_IM0,         store_nop       ;6E             ;IM 0
+instr  fetch2_mhl,     op_RLD,         store_mhl       ;6F             ;RLD
+instr  fetch_C,        op_IN,          store_nop       ;70             ;IN (C)
+instr  fetch_0,        op_OUT,         store_nop       ;71             ;OUT (C),0
+instr  fetch_SP,       op_SBCHL,       store_nop       ;72             ;SBC HL,SP
+instr  fetch_DIR16,    op_STSP,        store_nop       ;73 nn nn       ;LD (nn),SP
+instr  fetch_nop,      op_NEG,         store_nop       ;74             ;NEG
+instr  fetch_nop,      op_RETN,        store_nop       ;75             ;RETN
+instr  fetch_nop,      op_IM1,         store_nop       ;76             ;IM 1
+instr  fetch_nop,      op_nop,         store_nop       ;77             ;NOP
+instr  fetch_C,        op_IN,          store2_A        ;78             ;IN A,(C)
+instr  fetch_A,        op_OUT,         store_nop       ;79             ;OUT (C),A
+instr  fetch_SP,       op_ADCHL,       store_nop       ;7A             ;ADC HL,SP
+instr  fetch_DIR16,    op_RMEM16,      store_SP        ;7B nn nn       ;LD SP,(nn)
+instr  fetch_nop,      op_NEG,         store_nop       ;7C             ;NEG
+instr  fetch_nop,      op_RETN,        store_nop       ;7D             ;RETN
+instr  fetch_nop,      op_IM2,         store_nop       ;7E             ;IM 2
+instr  fetch_nop,      op_nop,         store_nop       ;7F             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;80             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;81             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;82             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;83             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;84             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;85             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;86             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;87             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;88             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;89             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;8A             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;8B             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;8C             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;8D             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;8E             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;8F             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;90             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;91             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;92             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;93             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;94             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;95             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;96             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;97             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;98             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;99             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;9A             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;9B             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;9C             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;9D             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;9E             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;9F             ;NOP
+instr  fetch_nop,      op_LDI,         store_nop       ;A0             ;LDI
+instr  fetch_nop,      op_CPI,         store_nop       ;A1             ;CPI
+instr  fetch_nop,      op_INI,         store_nop       ;A2             ;INI
+instr  fetch_nop,      op_OUTI,        store_nop       ;A3             ;OUTI
+instr  fetch_nop,      op_nop,         store_nop       ;A4             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;A5             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;A6             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;A7             ;NOP
+instr  fetch_nop,      op_LDD,         store_nop       ;A8             ;LDD
+instr  fetch_nop,      op_CPD,         store_nop       ;A9             ;CPD
+instr  fetch_nop,      op_IND,         store_nop       ;AA             ;IND
+instr  fetch_nop,      op_OUTD,        store_nop       ;AB             ;OUTD
+instr  fetch_nop,      op_nop,         store_nop       ;AC             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;AD             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;AE             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;AF             ;NOP
+instr  fetch_nop,      op_LDIR,        store_nop       ;B0             ;LDIR
+instr  fetch_nop,      op_CPIR,        store_nop       ;B1             ;CPIR
+instr  fetch_nop,      op_INIR,        store_nop       ;B2             ;INIR
+instr  fetch_nop,      op_OTIR,        store_nop       ;B3             ;OTIR
+instr  fetch_nop,      op_nop,         store_nop       ;B4             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;B5             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;B6             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;B7             ;NOP
+instr  fetch_nop,      op_LDDR,        store_nop       ;B8             ;LDDR
+instr  fetch_nop,      op_CPDR,        store_nop       ;B9             ;CPDR
+instr  fetch_nop,      op_INDR,        store_nop       ;BA             ;INDR
+instr  fetch_nop,      op_OTDR,        store_nop       ;BB             ;OTDR
+instr  fetch_nop,      op_nop,         store_nop       ;BC             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;BD             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;BE             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;BF             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C0             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C1             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C2             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C3             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C4             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C5             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C6             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C7             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C8             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;C9             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;CA             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;CB             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;CC             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;CD             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;CE             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;CF             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D0             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D1             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D2             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D3             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D4             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D5             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D6             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D7             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D8             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;D9             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;DA             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;DB             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;DC             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;DD             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;DE             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;DF             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E0             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E1             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E2             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E3             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E4             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E5             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E6             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E7             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E8             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;E9             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;EA             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;EB             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;EC             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;ED             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;EE             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;EF             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F0             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F1             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F2             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F3             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F4             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F5             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F6             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F7             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F8             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;F9             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;FA             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;FB             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;FC             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;FD             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;FE             ;NOP
+instr  fetch_nop,      op_nop,         store_nop       ;FF             ;NOP
+#endif
 
 #endif
 
@@ -4356,9 +4506,11 @@ instr    fetch_nop,      op_SET7,        store2_A        ;FF             ;SET 7,(Ix+d),A
 
 ; The S, Z, 5 and 3 bits and the parity of the lookup value 
 
-;      .org (PC+255) & 0xff00
+       checkspace PC, 256
+
+       .org (PC+255) & 0xff00
 ;      .org opcjmp + 256
-       .org sz53p_table_pos
+;      .org sz53p_table_pos
 ;      .org FLASHEND & 0xff00
 ;      .org 0x1fff & 0xff00