]> cloudbase.mooo.com Git - ddt180.git/blobdiff - ddt180.z80
New relocator
[ddt180.git] / ddt180.z80
index f8b82b865ccbddc9812d036684862753cb8f0bb5..fd160766604e2b28dd78be3e3dc79eb9b95b316a 100644 (file)
@@ -6,26 +6,8 @@
 ;   - Use Digital Research Link-80 to generate a .PRL file (op switch).\r
 ;   - Cut the .PRL header (first 256 byte) end rename the result to DDTZ.COM.\r
 \r
-;-------------------------------------------------------------------------------\r
-; Relocation loader\r
-;\r
-TPA    equ     0100h\r
-       cseg\r
-       .phase  TPA\r
-\r
-       jp      start\r
-       ds      3\r
 \r
-ldr_end:\r
-ldr_size       equ     $ - TPA\r
-current_phase  defl    $\r
-\r
-       .dephase\r
-current_cseg   defl    $\r
-\r
-;-------------------------------------------------------------------------------\r
-; DDT/Z core\r
-;\r
+       maclib  config.inc\r
 \r
 ; Some greneral definitions\r
 \r
@@ -41,147 +23,490 @@ CNTRX             equ     'X'-'@'
 BDOS           equ     5\r
 TPA            equ     0100h\r
 \r
-; BDOS function calls\r
-\r
-BDOS_PSTR      equ     9       ;Print String\r
-\r
 ; ddtz specific definitions\r
 \r
 STACK_SIZE     equ     80      ;ddtz internal stack\r
 CONBUF_SIZE    equ     80      ;Size of console input buffer\r
-EXPR_BUF_SIZE  equ     128     ;expressen buffer for conditional breakpoints\r
 BP_CNT         equ     12      ;Number of breakpoints\r
 BP_SIZE                equ     4       ;Size of a breakpoint record\r
 \r
+bitmap_size    equ     (prog_size+7)/8\r
+\r
 ;-------------------------------------------------------------------------------\r
 \r
+       cseg\r
+start:\r
 ddtz_base:\r
-       jp ddtz_bdos\r
+       jr reloc\r
+       nop\r
 l0003h:\r
-       rst 30h\r
-di_or_ei:\r
+       rst 30h                 ;rst used by ddtz\r
+di_or_ei:                      ;ints enabled/disabled while ddtz is running\r
        nop\r
        ret\r
-ddtz_bdos:\r
-       jp      0\r
 \r
-current_cseg   defl    $ - current_cseg\r
-       .phase  current_phase + current_cseg\r
+;-------------------------------------------------------------------------------\r
+\r
 signon:\r
        db      'DDTZ/180'\r
        db      ' - Version '\r
        maclib  version.inc\r
        defvers\r
-       db      CR,LF,'$'\r
-msgz80:\r
-       db      'Z80 or better required!',cr,lf,'$'\r
+       dc      '  ('\r
 \r
-current_phase  defl    $\r
-       .dephase\r
-current_cseg   defl    $\r
-       ds      STACK_SIZE - (current_phase - signon)\r
-\r
-\r
-stack:\r
-reg.l2:        db      000h\r
-reg.h2:        db      000h\r
-reg.e2:        db      000h\r
-reg.d2:        db      000h\r
-reg.c2:        db      000h\r
-reg.b2:        db      000h\r
-reg.f2:        db      000h\r
-reg.a2:        db      000h\r
-       db      000h\r
-reg.i: db      000h\r
-reg.iy:        dw      0000h\r
-reg.ix:        dw      0000h\r
-reg.f: db      000h\r
-reg.a: db      000h\r
-reg.c: db      000h\r
-reg.b: db      000h\r
-reg.e: db      000h\r
-reg.d: db      000h\r
-reg.l: db      000h\r
-reg.h: db      000h\r
-reg_sp:        dw      TPA\r
-reg.iff:\r
-       db      0f3h\r
-       db      0c3h\r
-reg.pc:        dw      TPA\r
+;-------------------------------------------------------------------------------\r
 \r
-cmd_rpt:dw     mainloop\r
+reloc_getbit   macro\r
+       local   nextbit\r
+       exx\r
+       djnz    nextbit\r
+       ld      b,8                     ;reload bit counter\r
+       ld      e,(hl)                  ;get next 8 relocation bits\r
+       inc     hl\r
+nextbit:\r
+       sla     e\r
+       exx\r
+       endm\r
 \r
 ;-------------------------------------------------------------------------------\r
+; Clear old position\r
 \r
-conbuf:\r
-       db      CONBUF_SIZE\r
+cmde_clr:\r
+       ld      (hl),0\r
+       inc     hl\r
+       dec     bc\r
+       ld      a,b\r
+       or      c\r
+       jr      nz,cmde_clr\r
 \r
-       ld sp,stack\r
+; Determine current position\r
+\r
+reloc:\r
+       ld      bc,(028h-2)\r
+       ld      de,(028h)\r
+       ld      a,i                     ;get iff2\r
+       ex      af,af'\r
+       di\r
+       ld      sp,028h                 ;rst instr needs a minimal stack\r
+       ld      hl,0e9e1h               ;opcpdes pop hl/jp (hl)\r
+       ld      (028h),hl\r
+       rst     028h\r
+wearehere:\r
+       ld      (028h-2),bc\r
+       ld      (028h),de\r
+       ld      de,-(wearehere-ddtz_base)\r
+       add     hl,de                   ; hl:\r
+\r
+       ld      de,ddtz_base            ; de:\r
+       or      a\r
+       sbc     hl,de\r
+       ex      de,hl                   ; de: reloc offset\r
+       ld      hl,stack\r
+       add     hl,de\r
+       ld      sp,hl\r
+       ex      af,af'\r
+       push    af\r
+       pop     bc\r
+       bit     2,c\r
+       jr      z,$+3\r
+       ei\r
+       ld      hl,ddtz_end             ;start of reloc bitmap\r
+       add     hl,de\r
+       push    hl\r
+       exx\r
+       pop     hl\r
+       ld      b,1                     ;init bit counter b\r
        exx\r
-       ld de,ddtz_base\r
-       call cp_hl_de\r
-       jr c,l0079h\r
-       ex de,hl\r
-l0079h:\r
-       ld de,TPA\r
-l007ch:\r
-       dec hl\r
-       ld (hl),000h\r
-       ld a,h\r
-       sub d\r
-       ld b,a\r
-       ld a,l\r
-       sub e\r
-       or b\r
-       jr nz,l007ch\r
-       ld a,i\r
-       ld (reg.i),a\r
-       ld a,0f3h\r
-       jp po,l0093h\r
-       ld a,0fbh\r
-l0093h:\r
-       ld (reg.iff),a\r
-       call di_or_ei\r
-       ld hl,ddtz_base\r
-       ld l,000h\r
-       ld (reg_sp),hl\r
 \r
-       ld hl,(1)               ;wboot addr\r
-       ld de,?const\r
-       ld b,6\r
-vini_l:\r
-       inc     hl\r
-       inc     hl\r
+       LD      HL,ddtz_base\r
+       add     hl,de                   ;--> ddtz_base\r
+\r
+reloc_lp:\r
+       push    de\r
+       push    hl\r
+\r
+       ld      de,4\r
+       ld      a,2\r
+       ld      hl,0\r
+reloc_l:\r
+       reloc_getbit\r
+       jr      nc,reloc_got\r
+       cp      16\r
+       jr      z,reloc_done\r
+       add     hl,de\r
+       ld      b,a\r
+       ex      de,hl\r
+reloc_l1:\r
+       add     hl,hl\r
+       djnz    reloc_l1\r
+       ex      de,hl\r
+       add     a,a\r
+       jr      reloc_l\r
+reloc_got:\r
+       ex      de,hl\r
+       ld      hl,0\r
+       ld      b,a\r
+reloc_bitloop:\r
+       reloc_getbit\r
+       adc     hl,hl\r
+       djnz    reloc_bitloop\r
+       add     hl,de\r
+       pop     de\r
+       add     hl,de\r
+       pop     de\r
+\r
+       LD      A,(HL)\r
+       ADD     A,E\r
+       LD      (HL),A\r
+       INC     HL\r
+       LD      A,(HL)\r
+       ADC     A,D\r
+       LD      (HL),A\r
        inc     hl\r
+       jr      reloc_lp\r
+reloc_done:\r
+       exx\r
+       ld      (bitmap_end),hl\r
+;-------------------------------------------------------------------------------\r
+\r
+\r
+init:\r
+       LD      SP,stack\r
+\r
+    if CPM\r
+\r
+       ld      hl,(1)          ;wboot addr\r
+       ld      de,convec\r
        ex      de,hl\r
+       ld      b,3\r
+vini_l:\r
+       inc     de\r
+       inc     de\r
+       inc     de\r
        inc     hl\r
        ld      (hl),e\r
        inc     hl\r
        ld      (hl),d\r
        inc     hl\r
-       ex      de,hl\r
        djnz    vini_l\r
+    else\r
+       xor     a\r
+       dec     a\r
+       daa                     ; Z80: 099H, x180+: 0F9H\r
+       cp      99h             ; Result on 180 type cpus is F9 here. Thanks Hitachi\r
+       jr      z,ini_z80\r
+\r
+       xor     a\r
+       call    cinit\r
+       ld      a,1\r
+       call    cinit\r
+       jr      ini_sign\r
+ini_z80:\r
+;      if ...\r
+;      .printx Error: Not yet implemented!\r
+;      db "Stop\r
+;      endif\r
+    endif      ; CPM\r
+\r
+ini_sign:\r
+       ld      hl,signon\r
+       call    pstr\r
+       ld      hl,ddtz_base\r
+       call    out_hl\r
+       call    pstr_inl\r
+       dc      ' - '\r
+       ld      hl,(bitmap_end)\r
+       dec     hl\r
+       call    out_hl\r
+       call    pstr_inl\r
+       dc      ')',CR,LF\r
+\r
+       ld      a,i\r
+       ld      (reg.i),a\r
+       ld      a,0f3h\r
+       jp      po,l0093h\r
+       ld      a,0fbh\r
+l0093h:\r
+       ld      (reg.iff),a\r
+       call    di_or_ei\r
+       ld      hl,ddtz_base\r
+       ld      l,000h\r
+       ld      (reg_sp),hl\r
+\r
+       jp      mainloop\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+    if CPM\r
+\r
+convec:\r
+const: jp      0               ; return console input status\r
+conin: jp      0               ; return console input character\r
+conout:        jp      0               ; send console output character\r
+\r
+    else\r
 \r
-       jr mainloop\r
+       include z180reg.inc\r
 \r
-       ds      CONBUF_SIZE + 3 - ($ - conbuf)\r
+iobyte equ     3\r
+\r
+max_device     equ 3\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+; init device\r
+cinit:                         ; a = device\r
+       call    vector_io_0\r
+       dw      as0init\r
+       dw      rret\r
+       dw      rret\r
+       dw      rret\r
+\r
+; character input status\r
+const:                         ; return a != 0 if character waiting\r
+       call    vector_io\r
+       dw      as0ista\r
+       dw      null$status\r
+       dw      csio_ista\r
+       dw      null$status\r
+\r
+; character input\r
+conin:                         ; return a = input char\r
+       call    vector_io\r
+       dw      as0inp\r
+       dw      null$input\r
+       dw      csio_inp\r
+       dw      null$input\r
+\r
+; character output\r
+conout:                                ; c = output char\r
+       call    vector_io\r
+       dw      as0out\r
+       dw      rret\r
+       dw      csio_out\r
+       dw      rret\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+vector_io:\r
+       ld      a,(iobyte)\r
+vector_io_0:\r
+       pop     hl\r
+       cp      max_device\r
+       jr      c,exist\r
+       ld      a,max_device    ; use null device if a >= max$device\r
+exist:\r
+       call    add_hl_a2\r
+       ld      a,(hl)\r
+       inc     hl\r
+       ld      h,(hl)\r
+       ld      l,a\r
+       jp      (hl)\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+null$input:\r
+       ld      a,1Ah\r
+rret:\r
+       ret\r
+ret$true:\r
+       or      0FFh\r
+       ret\r
+\r
+null$status:\r
+       xor     a\r
+       ret\r
+\r
+;-------------------------------------------------------------------------------\r
+;\r
+; TC = (f PHI /(2*baudrate*Clock_mode)) - 2\r
+;\r
+; TC = (f PHI / (32 * baudrate)) - 2\r
+;\r
+; Init Serial I/O for console input and output (ASCI1)\r
+;\r
+\r
+\r
+\r
+as0init:\r
+       ld      hl,initab0\r
+       jp      ioiniml\r
+\r
+as1init:\r
+       ld      hl,initab1\r
+       jp      ioiniml\r
+\r
+\r
+       ld      a,M_MPBT\r
+       out0    (cntlb1),a\r
+       ld      a,M_RE + M_TE + M_MOD2  ;Rx/Tx enable\r
+       out0    (cntla1),a\r
+       ld      a,M_RIE\r
+       out0    (stat1),a       ;Enable rx interrupts\r
+\r
+       ret                     ;\r
+\r
+\r
+initab0:\r
+       db      1,stat0,0               ;Disable rx/tx interrupts\r
+                                       ;Enable baud rate generator\r
+       db      1,asext0,M_BRGMOD+M_DCD0DIS+M_CTS0DIS\r
+       db      2,astc0l,low 28, high 28\r
+       db      1,cntlb0,M_MPBT         ;No MP Mode, X16\r
+       db      1,cntla0,M_RE+M_TE+M_MOD2 ;Rx/Tx enable, 8N1\r
+       db      0\r
+\r
+initab1:\r
+       db      1,stat1,0               ;Disable rx/tx ints, disable CTS1\r
+       db      1,asext1,M_BRGMOD       ;Enable baud rate generator\r
+       db      2,astc1l,low 3, high 3\r
+       db      1,cntlb1,M_MPBT         ;No MP Mode, X16\r
+       db      1,cntla1,M_RE+M_TE+M_MOD2 ;Rx/Tx enable, 8N1\r
+       db      0\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+ioiniml:\r
+       push    bc\r
+       xor     a\r
+ioml_lp:\r
+       ld      b,(hl)\r
+       inc     hl\r
+       cp      b\r
+       jr      z,ioml_e\r
+\r
+       ld      c,(hl)\r
+       inc     hl\r
+       otimr\r
+       jr      ioml_lp\r
+ioml_e:\r
+       pop     bc\r
+       ret\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+as0ista:\r
+       in0     a,(stat0)\r
+       rlca\r
+       sbc     a,a\r
+       ret\r
+\r
+as1ista:\r
+       in0     a,(stat1)\r
+       rlca\r
+       sbc     a,a\r
+       ret\r
+\r
+as0inp:\r
+       in0     a,(stat0)\r
+       rlca\r
+       jr      nc,as0inp\r
+       in0     a,rdr0\r
+       ret\r
+\r
+as1inp:\r
+       in0     a,(stat1)\r
+       rlca\r
+       jr      nc,as1inp\r
+       in0     a,rdr1\r
+       ret\r
+\r
+as0out:\r
+       in0     a,(stat0)\r
+       and     M_TDRE\r
+       jr      z,as0out\r
+       out0    (tdr0),c\r
+       ld      a,c\r
+       ret\r
+\r
+as1out:\r
+       in0     a,(stat1)\r
+       and     M_TDRE\r
+       jr      z,as1out\r
+       out0    (tdr1),c\r
+       ld      a,c\r
+       ret\r
 \r
 ;-------------------------------------------------------------------------------\r
 \r
-?const:        jp      0               ; return console input status\r
-?conin:        jp      0               ; return console input character\r
-?cono: jp      0               ; send console output character\r
-?list: jp      0               ; send list output character\r
-?auxo: jp      0               ; send auxiliary output character\r
-?auxi: jp      0               ; return auxiliary input character\r
+\r
+csio_rx_tmp:   db      0ffh\r
+\r
+csio_ista:\r
+       ld      hl,csio_rx_tmp\r
+       ld      a,(hl)\r
+       cp      0ffh\r
+       jr      nz,csist_1\r
+       ld      a,01\r
+       call    csio_wr\r
+       call    csio_rd\r
+       call    csio_rd\r
+       ld      (hl),a\r
+       sub     a,0ffh\r
+       ret     z\r
+csist_1:\r
+       or      0ffh\r
+       ret\r
+\r
+csio_inp:\r
+       ld      hl,csio_rx_tmp\r
+       ld      a,(hl)\r
+       ld      (hl),0ffh\r
+       cp      0ffh\r
+       ret     nz\r
+csin_1:\r
+       ld      a,01\r
+       call    csio_wr\r
+       call    csio_rd\r
+       call    csio_rd\r
+       cp      0ffh\r
+       jr      z,csin_1\r
+       ret\r
+\r
+csio_rd:\r
+       ld      a,M_CSIO_RE\r
+       call    csio_cmd_wait\r
+       in0     a,(trdr)\r
+       ret\r
+\r
+csio_out:\r
+       ld      a,02\r
+       call    csio_wr\r
+       call    csio_rd\r
+       call    csio_rd\r
+       or      a\r
+       jr      z,csio_out\r
+\r
+       ld      a,c\r
+       inc     a               ;ff..02 --> 00..03\r
+       cp      04h\r
+       jr      nc,csout_1\r
+       ld      a,00h\r
+       call    csio_wr\r
+csout_1:\r
+       ld      a,c\r
+csio_wr:\r
+       out0    (trdr),a\r
+       ld      a,M_CSIO_TE\r
+csio_cmd_wait:\r
+       out0    (cntr),a\r
+cswr_wait:\r
+       in0     a,(cntr)\r
+       and     M_CSIO_TE+M_CSIO_RE\r
+       jr      nz,cswr_wait\r
+       ret\r
+\r
+    endif ; CPM\r
+\r
+;-------------------------------------------------------------------------------\r
 \r
 CMDTAB:\r
-       dw      ERROR ;cmd_@    ;examine/substitute the displacement register @\r
-       dw      ERROR ;cmd_A    ;Assemble\r
+;      dw      ERROR ;cmd_@    ;examine/substitute the displacement register @\r
+;      dw      ERROR ;cmd_A    ;Assemble\r
        dw      cmd_B           ;Breakpoints display/set/clear\r
        dw      ERROR ;cmd_C    ;trace over Calls\r
        dw      cmd_D           ;Display memory in hex and ascii\r
-       dw      ERROR           ;\r
+       dw      cmd_E           ;rElocate debugger\r
        dw      ERROR ;cmd_F    ;specify Filename and command line\r
        dw      cmd_G           ;Go\r
        dw      cmd_H           ;compute Hex and other expressions\r
@@ -227,7 +552,7 @@ mainloop:
        push hl\r
        ld (cmd_rpt),hl\r
        inc de\r
-       sub '@'\r
+       sub 'B'\r
        jr c,ERROR\r
        cp 'Z'+1-'@'\r
        jr nc,ERROR\r
@@ -255,8 +580,7 @@ crlf:
 sub_01d9h:\r
        call    pstr_inl\r
        dc      '-'\r
-       dec hl\r
-       jp cpl.hl\r
+       jp neg.hl\r
 \r
 out_hl_dec_neg:\r
        push hl\r
@@ -323,9 +647,8 @@ out.bin.b:
 l01c9h:\r
        rlca\r
        push    af\r
-       ld      a,'0'/2\r
-       adc     a,a\r
-       call    outchar\r
+       and     1\r
+       call    out_dgt\r
        pop af\r
        djnz l01c9h\r
        ld a,'"'\r
@@ -376,7 +699,7 @@ outchar:
        push af\r
        and 07fh\r
        ld      c,a\r
-       call    ?cono\r
+       call    conout\r
        ld hl,con_col\r
        inc (hl)\r
        pop af\r
@@ -387,29 +710,6 @@ outchar:
        pop ix\r
        ret\r
 \r
-pstr_sel:\r
-       inc b\r
-       jr pstr_sel2\r
-pstr_sel1:\r
-       call sub_0345h\r
-pstr_sel2:\r
-       djnz pstr_sel1\r
-       ;fall thru\r
-pstr:\r
-       ld a,(hl)\r
-       inc hl\r
-       and a\r
-       ret z\r
-       call outchar\r
-       ret m\r
-       jr pstr\r
-\r
-pstr_inl:\r
-       ex      (sp),hl\r
-       call    pstr\r
-       ex      (sp),hl\r
-       ret\r
-\r
 p_goto_col:\r
        ld      a,(con_col)\r
        cp      c\r
@@ -432,10 +732,10 @@ inchar:
        push hl\r
        push de\r
        push bc\r
-       call    ?const\r
+       call    const\r
        and a\r
        jr      z,inch1\r
-       call    ?conin\r
+       call    conin\r
        scf\r
 inch1:\r
        pop bc\r
@@ -453,7 +753,6 @@ DELC:
        call    DELC1\r
        dec     hl\r
        dec     b\r
-       inc     c\r
        ld      a,(hl)\r
        cp      ' '\r
        ret     nc\r
@@ -474,13 +773,10 @@ DELL:
 get_line:\r
        push hl                 ;\r
        ld hl,conbuf            ;\r
-       ld c,(hl)               ;\r
-       inc hl                  ;\r
-       ld b,000h               ;\r
-       inc hl                  ;\r
+       ld b,0                  ;\r
 inlnxtch:\r
-       ld a,c                  ;\r
-       or a                    ;\r
+       ld a,b                  ;\r
+       cp CONBUF_SIZE          ;\r
        jr z,inl_e              ;\r
        call incharw            ;\r
        cp CR                   ;\r
@@ -516,16 +812,12 @@ gl_5:
        call outchar            ;\r
        inc hl                  ;\r
        inc b                   ;\r
-       dec c                   ;\r
        jr inlnxtch             ;\r
 \r
 inl_e:\r
        ld (hl),0\r
-       ld hl,conbuf+1          ;\r
-       ld (hl),b               ;\r
        call CRLF               ;\r
-       inc     hl\r
-       ex      de,hl\r
+       ld de,conbuf            ;\r
        pop hl                  ;\r
        ret                     ;\r
 \r
@@ -653,14 +945,23 @@ l031eh:
        pop bc\r
        ret\r
 l0336h:\r
-       call sub_0345h\r
+       call str_sel_next\r
 l0339h:\r
        pop de\r
        and a\r
        pop bc\r
        ret\r
 \r
-sub_0345h:\r
+str_sel:\r
+       inc b\r
+       jr str_sel2\r
+str_sel1:\r
+       call str_sel_next\r
+str_sel2:\r
+       djnz str_sel1\r
+       ret\r
+\r
+str_sel_next:\r
        ld a,(hl)\r
        and a\r
        ret z\r
@@ -671,12 +972,12 @@ l0348h:
        ret m\r
        jr l0348h\r
 \r
-sub_034eh:\r
+get_arg_range_target:\r
        call get_arg_range\r
        push hl\r
        push bc\r
        call next_arg\r
-       call sub_0363h\r
+       call get_arg_final\r
        ex de,hl\r
        pop bc\r
        pop hl\r
@@ -687,7 +988,7 @@ sub_035dh:
        jr c,error0\r
        ret\r
 \r
-sub_0363h:\r
+get_arg_final:\r
        call sub_035dh\r
 l0366h:\r
        jp assert_eol\r
@@ -951,6 +1252,9 @@ do_factor:
        ld hl,TPA\r
        cp 'L'\r
        ret z\r
+       ld hl,(reg.pc)\r
+       cp '$'\r
+       ret z\r
        cp '-'\r
        jr z,fact_factneg\r
        cp '~'\r
@@ -1009,8 +1313,13 @@ fact_reg.CPU:
        ld h,000h\r
        ret\r
 \r
+fact_factinv:\r
+       call fact_factor\r
+       jr cpl.hl\r
+\r
 fact_factneg:\r
        call fact_factor\r
+neg.hl:\r
        dec hl\r
 cpl.hl:\r
        ld a,h\r
@@ -1021,10 +1330,6 @@ cpl.hl:
        ld l,a\r
        ret\r
 \r
-fact_factinv:\r
-       call fact_factor\r
-       jr cpl.hl\r
-\r
 fact_mem:\r
        call expr1\r
        jr c,error1\r
@@ -1302,6 +1607,56 @@ b_0709_start:
        db      000h\r
        db      000h\r
 \r
+;-------------------------------------------------------------------------------\r
+; > E addr\r
+;      relocate debugger to addr\r
+; > ER addr\r
+;      relocate just below addr\r
+;\r
+; Move debugger to given address and restart.\r
+; New location must not overlap with current location.\r
+\r
+\r
+cmd_E:\r
+       call    skipbl\r
+       sub     'R'\r
+       jr      nz,$+3\r
+        inc    de\r
+       push    af\r
+       call    get_arg_final\r
+\r
+       ex      de,hl\r
+       ld      hl,(bitmap_end)\r
+       ld      bc,ddtz_base\r
+       or      a\r
+       sbc     hl,bc\r
+       ld      b,h\r
+       ld      c,l\r
+       ex      de,hl\r
+       pop     af\r
+       jr      nz,cmde_bottom\r
+       sbc     hl,bc\r
+cmde_bottom:\r
+       ld      ix,cmde_clr-ddtz_base\r
+       ex      de,hl                   ;de = dst\r
+       add     ix,de\r
+       ld      hl,ddtz_base            ;hl = src\r
+\r
+       push    hl\r
+       or      a\r
+       sbc     hl,de\r
+       call    c,neg.hl                ;abs(distance)\r
+       or      a\r
+       sbc     hl,bc\r
+       jp      c,error\r
+       pop     hl\r
+       push    hl\r
+       push    bc\r
+       ldir\r
+       pop     bc\r
+       pop     hl\r
+       jp      (ix)\r
+\r
 ;-------------------------------------------------------------------------------\r
 ; > G [startaddr] [;breakp..]\r
 ;      Go [to start] [with temporary breakpoints]\r
@@ -1691,7 +2046,7 @@ cmd_X:
        call get_line\r
        call skipbl\r
        jr z,l0c30h\r
-       call sub_0363h\r
+       call get_arg_final\r
        ex de,hl\r
        pop bc\r
        pop hl\r
@@ -1963,11 +2318,11 @@ cmd_O:
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
-; > Vstartaddr endaddr targetaddr\r
+; > V startaddr endaddr targetaddr\r
 ;      Verify (compare) two memory areas\r
 \r
 cmd_V:\r
-       call sub_034eh\r
+       call get_arg_range_target\r
 l0dedh:\r
        push bc\r
        ld a,(de)\r
@@ -1999,7 +2354,7 @@ l0e10h:
 ;      Move memory\r
 \r
 cmd_M:\r
-       call sub_034eh\r
+       call get_arg_range_target\r
        call cp_hl_de\r
        jr nc,cmdm_up\r
        add hl,bc\r
@@ -2009,7 +2364,7 @@ cmd_M:
        dec hl\r
        dec de\r
        lddr\r
-       db 01h          ;swallow ldir instruction (ld bc,...)\r
+       ret\r
 cmdm_up:\r
        ldir\r
        ret\r
@@ -2108,9 +2463,9 @@ l0ed3h:
        ret\r
 \r
 sub_0ee6h:\r
-       ld hl,conbuf+1\r
+       ld hl,conbuf\r
        call sub_0ef7h\r
-       ld de,conbuf+1\r
+       ld de,conbuf\r
        and a\r
        sbc hl,de\r
        ld b,l\r
@@ -2321,12 +2676,14 @@ i.getchar:
 i.storebyte:\r
        push af\r
        push de\r
-       ld de,TPA               ;lowest allowed load address\r
+       ld de,ddtz_base         ;don't load over ddtz\r
        call cp_hl_de\r
-       jr c,error2\r
-       ld de,(BDOS+1)          ;highest allowed load address\r
+       jr nc,ist_1\r
+\r
+       ld de,(bitmap_end)\r
        call cp_hl_de\r
        jr nc,error2\r
+ist_1:\r
        ld de,(high_load)\r
        call cp_hl_de\r
        jr c,l1157h\r
@@ -2439,8 +2796,7 @@ p_disas_instr:
        ld      c,a\r
        call    pstr                                    ;print mnemonic\r
        call    p_goto_col\r
-       ex de,hl\r
-       call CALL_HL                                    ;print arguments\r
+       call    pr_instr_args                           ;print arguments\r
        pop bc\r
        scf\r
        ret\r
@@ -2508,15 +2864,6 @@ disas_nopfx:
 \r
 disas_pfx.ED:\r
        inc iy\r
-       ld hl,b_1bc9_start              ;1 byte opcode, no arguments\r
-       call lookup_op\r
-       ld b,2\r
-       ret c\r
-       ld hl,b_1bf4_start\r
-       call lookup_op_arg\r
-       ld b,2\r
-       ret c\r
-\r
        ld hl,l228bh\r
        call lookup_op_arg\r
        ld b,3\r
@@ -2524,6 +2871,32 @@ disas_pfx.ED:
        ld hl,b_1c40_start\r
        call lookup_op_arg\r
        ld b,4\r
+       ret c\r
+\r
+       ld hl,b_1bc9_start              ;1 byte opcode, no arguments\r
+       call lookup_op\r
+       jr c,da_ed1\r
+\r
+       ld hl,b_1bf4_start\r
+       call lookup_op_arg\r
+       ret nc\r
+\r
+       ld a,e\r
+       cp a_noarg\r
+       jr nz,da_ed0\r
+       ld c,(iy+0)\r
+       ld a,c\r
+       rra\r
+       and 0ch\r
+       ld b,a\r
+       ld a,c\r
+       and 03h\r
+       call str_sel_ab\r
+\r
+da_ed0:\r
+       scf\r
+da_ed1:\r
+       ld b,2\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
@@ -2620,61 +2993,74 @@ l1a0ah:
 \r
 ;-------------------------------------------------------------------------------\r
 \r
+test_DDFD:\r
+       ld a,(hl)\r
+       and a\r
+       ret z\r
+       inc hl\r
+       cp (iy+000h)\r
+       jr nz,test_DDFD\r
+       scf\r
+       ret\r
+\r
 lookup_op:\r
        ld a,(hl)\r
+       inc hl\r
        cp 0ffh\r
        ret z\r
        cp (iy+000h)\r
        jr z,l1a7fh\r
        inc hl\r
-       inc hl\r
        jr lookup_op\r
 l1a7fh:\r
-       ld de,p_arg_none\r
-       inc hl\r
-       ld c,(hl)\r
+       ld b,(hl)\r
+       ld e,a_noarg\r
        jr get_mnemonic\r
 \r
+lookup_op_arg:\r
+       call lookup_branch_op\r
+       ret nc\r
+       ld a,e\r
+       ld e,d\r
+       cp a,0ffh\r
+       ret z                   ;carry clear\r
+       ld b,a\r
 \r
-test_DDFD:\r
-       ld a,(hl)\r
-       and a\r
-       ret z\r
-       inc hl\r
-       cp (iy+000h)\r
-       jr nz,test_DDFD\r
+get_mnemonic:\r
+       ld hl,t_MNEMONICS\r
+       bit 7,b\r
+       jr z,get_m1\r
+       res 7,b\r
+       ld a,(iy+000h)\r
+       rra\r
+       rra\r
+       rra\r
+       and 07h\r
+str_sel_ab:\r
+       add b\r
+       ld b,a\r
+get_m1:\r
+       call str_sel\r
        scf\r
        ret\r
 \r
-lookup_op_arg:\r
-       ld a,(iy+000h)\r
-       and (hl)\r
+lookup_branch_op               ;TODO\r
+       ld a,(hl)\r
+       and a\r
+       ret z\r
        inc hl\r
+       and (iy+000h)\r
        cp (hl)\r
-       jr z,l1aa8h\r
-       inc hl\r
        inc hl\r
+       jr z,l1aa8_br\r
        inc hl\r
        inc hl\r
-       ld a,(hl)\r
-       and a\r
-       jr nz,lookup_op_arg\r
-       ret\r
+       jr lookup_branch_op\r
 \r
-l1aa8h:\r
-       inc hl\r
-       ld c,(hl)\r
-       inc c\r
-       ret z\r
-       dec c\r
-       inc hl\r
+l1aa8_br:\r
        ld e,(hl)\r
        inc hl\r
        ld d,(hl)\r
-get_mnemonic:\r
-       ld hl,t_MNEMONICS\r
-       ld b,0\r
-       add hl,bc\r
        scf\r
        ret\r
 \r
@@ -2682,20 +3068,20 @@ get_mnemonic:
 ; 1 byte opcodes (no parameters)\r
 ; Format: db opcode, t_MNEMONICS-index\r
 b_1ab6_start:\r
-       db 076h,o_HALT          ;halt\r
-       db 0d9h,o_EXX           ;exx\r
-       db 0f3h,o_DI            ;di\r
-       db 0fbh,o_EI            ;ei\r
-       db 000h,o_NOP           ;nop\r
-       db 007h,o_RLCA          ;rlca\r
-       db 00fh,o_RRCA          ;rrca\r
-       db 017h,o_RLA           ;rla\r
-       db 01fh,o_RRA           ;rra\r
-       db 027h,o_DAA           ;daa\r
-       db 02fh,o_CPL           ;cpl\r
-       db 037h,o_SCF           ;scf\r
-       db 03fh,o_CCF           ;ccf\r
-       db 0c9h,o_RET           ;ret\r
+       db 076h,i_HALT          ;halt\r
+       db 0d9h,i_EXX           ;exx\r
+       db 0f3h,i_DI            ;di\r
+       db 0fbh,i_EI            ;ei\r
+       db 000h,i_NOP           ;nop\r
+;      db 007h,i_RLCA          ;rlca\r
+;      db 00fh,i_RRCA          ;rrca\r
+;      db 017h,i_RLA           ;rla\r
+;      db 01fh,i_RRA           ;rra\r
+;      db 027h,i_DAA           ;daa\r
+;      db 02fh,i_CPL           ;cpl\r
+;      db 037h,i_SCF           ;scf\r
+;      db 03fh,i_CCF           ;ccf\r
+       db 0c9h,i_RET           ;ret\r
        db 0ffh\r
 \r
 \r
@@ -2703,303 +3089,425 @@ b_1ab6_start:
 ; Format: db mask, match, t_MNEMONICS-index\r
 ;        dw argument formating function\r
 b_1ad1_start:\r
-       db 0c0h,040h,o_LD       ;ld r[y],r[z]\r
-       dw p_arg_ry_rz\r
-       db 0f8h,080h,o_ADD      ;add a,r[z]\r
-       dw p_arg_a_r\r
-       db 0f8h,088h,o_ADC      ;adc a,r[z]\r
-       dw p_arg_a_r\r
-       db 0f8h,090h,o_SUB      ;sub r[z]\r
-       dw p_rz\r
-       db 0f8h,098h,o_SBC      ;sbc a,r[z]\r
-       dw p_arg_a_r\r
-       db 0f8h,0a0h,o_AND      ;and r[z]\r
-       dw p_rz\r
-       db 0f8h,0a8h,o_XOR      ;xor r[z]\r
-       dw p_rz\r
-       db 0f8h,0b0h,o_OR       ;or r[z]\r
-       dw p_rz\r
-       db 0f8h,0b8h,o_CP       ;cp r[z]\r
-       dw p_rz\r
-       db 0c7h,0c0h,o_RET      ;ret cc\r
-       dw p_cc\r
-       db 0c7h,0c7h,o_RST      ;rst\r
-       dw p_arg_rst\r
-       db 0cfh,0c1h,o_POP      ;pop rp2\r
-       dw p_rp2\r
-       db 0cfh,0c5h,o_PUSH     ;push rp2\r
-       dw p_rp2\r
-       db 0ffh,0e3h,o_EX       ;ex (sp),hl\r
-       dw l1ca0h\r
-       db 0ffh,0e9h,o_JP       ;jp (hl)\r
-       dw l1caeh\r
-       db 0ffh,0ebh,o_EX       ;ex de,hl\r
-       dw p_arg_ex_dehl\r
-       db 0ffh,0f9h,o_LD       ;ld sp,hl\r
-       dw l1cc1h\r
-       db 0cfh,003h,o_INC      ;inc rp\r
-       dw p_rp\r
-       db 0cfh,00bh,o_DEC      ;dec rp\r
-       dw p_rp\r
-       db 0c7h,004h,o_INC      ;inc r[y]\r
-       dw p_ry\r
-       db 0c7h,005h,o_DEC      ;dec r[y]\r
-       dw p_ry\r
-       db 0ffh,008h,o_EX       ;ex af,af'\r
-       dw p_arg_ex_afaf\r
-       db 0cfh,009h,o_ADD      ;add hl,rp\r
-       dw l1dcah\r
-       db 0efh,002h,o_LD       ;ld (rp),a ;rp=bc,de\r
-       dw l1cdch\r
-       db 0efh,00ah,o_LD       ;ld a,(rp) ;rp=bc,de\r
-       dw l1ce5h\r
+       db 0c0h,040h,i_LD       ;ld r[y],r[z]\r
+       db a_rr\r
+\r
+       db 0c0h,080h,i_ADD+080h ;add a,r[z]\r
+       db a_r\r
+\r
+;      db 0f8h,080h,i_ADD      ;add a,r[z]\r
+;      db a_ar\r
+;      db 0f8h,088h,i_ADC      ;adc a,r[z]\r
+;      db a_ar\r
+;      db 0f8h,090h,i_SUB      ;sub r[z]\r
+;      db a_r\r
+;      db 0f8h,098h,i_SBC      ;sbc a,r[z]\r
+;      db a_ar\r
+;      db 0f8h,0a0h,i_AND      ;and r[z]\r
+;      db a_r\r
+;      db 0f8h,0a8h,i_XOR      ;xor r[z]\r
+;      db a_r\r
+;      db 0f8h,0b0h,i_OR       ;or r[z]\r
+;      db a_r\r
+;      db 0f8h,0b8h,i_CP       ;cp r[z]\r
+;      db a_r\r
+\r
+       db 0c7h,0c0h,i_RET      ;ret cc\r
+       db a_cc\r
+       db 0c7h,0c7h,i_RST      ;rst\r
+       db a_rst\r
+       db 0cfh,0c1h,i_POP      ;pop rp2\r
+       db a_p2\r
+       db 0cfh,0c5h,i_PUSH     ;push rp2\r
+       db a_p2\r
+       db 0ffh,0e3h,i_EX       ;ex (sp),hl\r
+       db a_esphl\r
+       db 0ffh,0e9h,i_JP       ;jp (hl)\r
+       db a_hl\r
+       db 0ffh,0ebh,i_EX       ;ex de,hl\r
+       db a_dehl\r
+       db 0ffh,0f9h,i_LD       ;ld sp,hl\r
+       db a_lsphl\r
+       db 0cfh,003h,i_INC      ;inc rp\r
+       db a_p\r
+       db 0cfh,00bh,i_DEC      ;dec rp\r
+       db a_p\r
+       db 0c7h,004h,i_INC      ;inc r[y]\r
+       db a_ry\r
+       db 0c7h,005h,i_DEC      ;dec r[y]\r
+       db a_ry\r
+       db 0ffh,008h,i_EX       ;ex af,af'\r
+       db a_eaf\r
+       db 0cfh,009h,i_ADD      ;add hl,rp\r
+       db a_hlp\r
+       db 0efh,002h,i_LD       ;ld (rp),a ;rp=bc,de\r
+       db a_pa\r
+       db 0efh,00ah,i_LD       ;ld a,(rp) ;rp=bc,de\r
+       db a_ap\r
+\r
+       db 0c7h,007h,i_RLCA+080h;rlca\r
+       db a_noarg\r
+\r
        db 0\r
 \r
-; 2 byte opdodes\r
+; 2 byte opcodes\r
 b_1b54_start:\r
-       db 0c7h,006h,o_LD       ;ld r[y],nn\r
-       dw l1cfah\r
-       db 0ffh,0c6h,o_ADD      ;add a,nn\r
-       dw l1cf5h\r
-       db 0ffh,0ceh,o_ADC      ;adc a,nn\r
-       dw l1cf5h\r
-       db 0ffh,0d6h,o_SUB      ;sub nn\r
-       dw l1d09h\r
-       db 0ffh,0deh,o_SBC      ;sbc a,nn\r
-       dw l1cf5h\r
-       db 0ffh,0e6h,o_AND      ;and nn\r
-       dw l1d09h\r
-       db 0ffh,0eeh,o_XOR      ;xor nn\r
-       dw l1d09h\r
-       db 0ffh,0f6h,o_OR       ;or nn\r
-       dw l1d09h\r
-       db 0ffh,0feh,o_CP       ;cp nn\r
-       dw l1d09h\r
-       db 0ffh,010h,o_DJNZ     ;djnz\r
-       dw p_arg_jrel\r
-       db 0ffh,018h,o_JR       ;jr\r
-       dw p_arg_jrel\r
-       db 0e7h,020h,o_JR       ;jr cc,\r
-       dw p_arg_cc_jrel\r
-       db 0ffh,0d3h,o_OUT      ;out (nn),a\r
-       dw l1d37h\r
-       db 0ffh,0dbh,o_IN       ;in a,(nn)\r
-       dw l1d29h\r
+       db 0c7h,006h,i_LD       ;ld r[y],nn\r
+       db a_rn\r
+\r
+       db 0c7h,0c6h,i_ADD+080h ;add a,r[z]\r
+       db a_n\r
+\r
+;      db 0ffh,0c6h,i_ADD      ;add a,nn\r
+;      db a_an\r
+;      db 0ffh,0ceh,i_ADC      ;adc a,nn\r
+;      db a_an\r
+;      db 0ffh,0d6h,i_SUB      ;sub nn\r
+;      db a_n\r
+;      db 0ffh,0deh,i_SBC      ;sbc a,nn\r
+;      db a_an\r
+;      db 0ffh,0e6h,i_AND      ;and nn\r
+;      db a_n\r
+;      db 0ffh,0eeh,i_XOR      ;xor nn\r
+;      db a_n\r
+;      db 0ffh,0f6h,i_OR       ;or nn\r
+;      db a_n\r
+;      db 0ffh,0feh,i_CP       ;cp nn\r
+;      db a_n\r
+\r
+       db 0ffh,010h,i_DJNZ     ;djnz\r
+       db a_j\r
+       db 0ffh,018h,i_JR       ;jr\r
+       db a_j\r
+       db 0e7h,020h,i_JR       ;jr cc,\r
+       db a_ccj\r
+       db 0ffh,0d3h,i_OUT      ;out (nn),a\r
+       db a_ma\r
+       db 0ffh,0dbh,i_IN       ;in a,(nn)\r
+       db a_am\r
        db 0\r
 \r
 ; 3 byte opcodes\r
 b_1b9b_start:\r
-       db 0c7h,0c2h,o_JP       ;jp cc,mn\r
-       dw p_arg_cc_mn\r
-       db 0c7h,0c4h,o_CALL     ;call cc,mn\r
-       dw p_arg_cc_mn\r
-       db 0cfh,001h,o_LD       ;ld ww,mn\r
-       dw p_arg_ww_mn\r
-       db 0ffh,0c3h,o_JP       ;jp mn\r
-       dw p_arg_mn\r
-       db 0ffh,0cdh,o_CALL     ;call mn\r
-       dw p_arg_mn\r
-       db 0ffh,022h,o_LD       ;ld (mn),hl\r
-       dw p_arg_addr_hl\r
-       db 0ffh,02ah,o_LD       ;ld hl,(mn)\r
-       dw p_arg_hl_addr\r
-       db 0ffh,032h,o_LD       ;ld (mn),a\r
-       dw p_arg_addr_a\r
-       db 0ffh,03ah,o_LD       ;ld a,(mn)\r
-       dw p_arg_a_addr\r
+       db 0c7h,0c2h,i_JP       ;jp cc,mn\r
+       db a_ccnn\r
+       db 0c7h,0c4h,i_CALL     ;call cc,mn\r
+       db a_ccnn\r
+       db 0cfh,001h,i_LD       ;ld ww,mn\r
+       db a_rnn\r
+       db 0ffh,0c3h,i_JP       ;jp mn\r
+       db a_nn\r
+       db 0ffh,0cdh,i_CALL     ;call mn\r
+       db a_nn\r
+       db 0ffh,022h,i_LD       ;ld (mn),hl\r
+       db a_mmhl\r
+       db 0ffh,02ah,i_LD       ;ld hl,(mn)\r
+       db a_hlmm\r
+       db 0ffh,032h,i_LD       ;ld (mn),a\r
+       db a_mma\r
+       db 0ffh,03ah,i_LD       ;ld a,(mn)\r
+       db a_amm\r
        db 0\r
 \r
 ; Prefix ED + 1 byte opcode, no arguments\r
 ; Format: opcode, t_MNEMONICS index\r
 b_1bc9_start:\r
-       db 044h,o_NEG           ;neg\r
-       db 045h,o_RETN          ;retn\r
-       db 04dh,o_RETI          ;reti\r
-       db 067h,o_RRD           ;rrd\r
-       db 06fh,o_RLD           ;rld\r
-       db 0a0h,o_LDI           ;ldi\r
-       db 0a1h,o_CPI           ;cpi\r
-       db 0a2h,o_INI           ;ini\r
-       db 0a3h,o_OUTI          ;outi\r
-       db 0a8h,o_LDD           ;ldd\r
-       db 0a9h,o_CPD           ;cpd\r
-       db 0aah,o_IND           ;ind\r
-       db 0abh,o_OUTD          ;outd\r
-       db 0b0h,o_LDIR          ;ldir\r
-       db 0b1h,o_CPIR          ;cpir\r
-       db 0b2h,o_INIR          ;inir\r
-       db 0b3h,o_OTIR          ;otir\r
-       db 0b8h,o_LDDR          ;lddr\r
-       db 0b9h,o_CPDR          ;cpdr\r
-       db 0bah,o_INDR          ;indr\r
-       db 0bbh,o_OTDR          ;otdr\r
-       db 08bh,o_OTDM          ;otdm\r
-       db 09bh,o_OTDMR         ;otdmr\r
-       db 083h,o_OTIM          ;otim\r
-       db 093h,o_OTIMR         ;otimr\r
-       db 076h,o_SLP           ;slp\r
+       db 044h,i_NEG           ;neg\r
+       db 045h,i_RETN          ;retn\r
+       db 04dh,i_RETI          ;reti\r
+       db 067h,i_RRD           ;rrd\r
+       db 06fh,i_RLD           ;rld\r
+;      db 0a0h,i_LDI           ;ldi\r
+;      db 0a1h,i_CPI           ;cpi\r
+;      db 0a2h,i_INI           ;ini\r
+;      db 0a3h,i_OUTI          ;outi\r
+;      db 0a8h,i_LDD           ;ldd\r
+;      db 0a9h,i_CPD           ;cpd\r
+;      db 0aah,i_IND           ;ind\r
+;      db 0abh,i_OUTD          ;outd\r
+;      db 0b0h,i_LDIR          ;ldir\r
+;      db 0b1h,i_CPIR          ;cpir\r
+;      db 0b2h,i_INIR          ;inir\r
+;      db 0b3h,i_OTIR          ;otir\r
+;      db 0b8h,i_LDDR          ;lddr\r
+;      db 0b9h,i_CPDR          ;cpdr\r
+;      db 0bah,i_INDR          ;indr\r
+;      db 0bbh,i_OTDR          ;otdr\r
+       db 08bh,i_OTDM          ;otdm\r
+       db 09bh,i_OTDMR         ;otdmr\r
+       db 083h,i_OTIM          ;otim\r
+       db 093h,i_OTIMR         ;otimr\r
+       db 076h,i_SLP           ;slp\r
        db 0ffh                 ;<end mark>\r
 \r
 b_1bf4_start:\r
-       db 0ffh,070h,o_IN       ;in (c)    ;\r
-       dw p_arg_in_c_0         ;\r
-       db 0c7h,040h,o_IN       ;in r,(c)  ;r=b,c,d,e,h,l,a\r
-       dw p_arg_in_c           ;\r
+       db 0e4h,0a0h,i_LDI\r
+       db a_noarg\r
+       db 0ffh,070h,i_IN       ;in (c)    ;\r
+       db a_c\r
+       db 0c7h,040h,i_IN       ;in r,(c)  ;r=b,c,d,e,h,l,a\r
+       db a_rc\r
        db 0ffh,071h,0ffh       ;out (c),0 ;\r
-       dw p_arg_out_c          ;\r
-       db 0c7h,041h,o_OUT      ;out (c),r ;r=b,c,d,e,h,l,a\r
-       dw p_arg_out_c          ;\r
-       db 0cfh,042h,o_SBC      ;sbc hl,rp\r
-       dw l1dcah               ;\r
-       db 0cfh,04ah,o_ADC      ;adc hl,rp\r
-       dw l1dcah               ;\r
-       db 0ffh,046h,o_IM       ;im 0\r
-       dw l1d85h               ;\r
-       db 0ffh,056h,o_IM       ;im 1\r
-       dw l1d89h               ;\r
-       db 0ffh,05eh,o_IM       ;im 2\r
-       dw l1d8dh               ;\r
-       db 0e7h,047h,o_LD       ;ld i,a ... ld a,r\r
-       dw p_arg_IR             ;\r
-       db 0cfh,04ch,o_MLT      ;mlt rr\r
-       dw p_rp\r
-       db 0c7h,004h,o_TST      ;tst r\r
-       dw p_ry\r
+       db a_cr\r
+       db 0c7h,041h,i_OUT      ;out (c),r ;r=b,c,d,e,h,l,a\r
+       db a_cr\r
+       db 0cfh,042h,i_SBC      ;sbc hl,rp\r
+       db a_hlp\r
+       db 0cfh,04ah,i_ADC      ;adc hl,rp\r
+       db a_hlp\r
+       db 0ffh,046h,i_IM       ;im 0\r
+       db a_im0\r
+       db 0ffh,056h,i_IM       ;im 1\r
+       db a_im1\r
+       db 0ffh,05eh,i_IM       ;im 2\r
+       db a_im2\r
+       db 0e7h,047h,i_LD       ;ld i,a ... ld a,r\r
+       db a_ai\r
+       db 0cfh,04ch,i_MLT      ;mlt rr\r
+       db a_p\r
+       db 0c7h,004h,i_TST      ;tst r\r
+       db a_ry\r
        db 0\r
 \r
 l228bh:\r
-       db 0ffh,030h,0ffh       ;in0 (m)\r
-       dw p_arg_r_m\r
-       db 0c7h,000h,o_IN0      ;in0 r,(m) ;r=b,c,d,e,h,l,a\r
-       dw p_arg_r_m\r
+       db 0ffh,030h,i_IN0      ;in0 (m)\r
+       db a_m\r
+       db 0c7h,000h,i_IN0      ;in0 r,(m) ;r=b,c,d,e,h,l,a\r
+       db a_rm\r
        db 0ffh,031h,0ffh       ;out0 (m),0\r
-       dw p_arg_m_r\r
-       db 0c7h,001h,o_OUT0     ;out0 (m),r ;r=b,c,d,e\r
-       dw p_arg_m_r\r
-       db 0ffh,064h,o_TST      ;tst m\r
-       dw l1d09h\r
-       db 0ffh,074h,o_TSTIO    ;tstio m\r
-       dw l1d09h\r
+       db a_mr\r
+       db 0c7h,001h,i_OUT0     ;out0 (m),r ;r=b,c,d,e\r
+       db a_mr\r
+       db 0ffh,064h,i_TST      ;tst m\r
+       db a_n\r
+       db 0ffh,074h,i_TSTIO    ;tstio m\r
+       db a_n\r
        db 0\r
 \r
 ; Prefix ED + 1 byte opcode + 2 byte address\r
 ; Format: db mask, match, t_MNEMONICS-index\r
 ;        dw argument formating function\r
 b_1c40_start:\r
-       db 0cfh,043h,o_LD       ;ld (mn),ww     ;ww=bc,de,hl,sp\r
-       dw p_arg_addr_ww\r
-       db 0cfh,04bh,o_LD       ;ld ww,(mn)     ;ww=bc,de,hl,sp\r
-       dw p_arg_ww_addr\r
+       db 0cfh,043h,i_LD       ;ld (mn),ww     ;ww=bc,de,hl,sp\r
+       db a_mmp\r
+       db 0cfh,04bh,i_LD       ;ld ww,(mn)     ;ww=bc,de,hl,sp\r
+       db a_pmm\r
        db 0\r
 \r
 ; CB\r
 b_1c55_start:\r
-       db 0f8h,000h,o_RLC      ;rlc g\r
-       dw p_rz_cb\r
-       db 0f8h,008h,o_RRC      ;rrc g\r
-       dw p_rz_cb\r
-       db 0f8h,010h,o_RL       ;rl g\r
-       dw p_rz_cb\r
-       db 0f8h,018h,o_RR       ;rr g\r
-       dw p_rz_cb\r
-       db 0f8h,020h,o_SLA      ;sla g\r
-       dw p_rz_cb\r
-       db 0f8h,028h,o_SRA      ;sra g\r
-       dw p_rz_cb\r
-       db 0f8h,038h,o_SRL      ;srl g\r
-       dw p_rz_cb\r
-       db 0c0h,040h,o_BIT      ;bit b,g\r
-       dw p_arg_bitop\r
-       db 0c0h,080h,o_RES      ;res b,g\r
-       dw p_arg_bitop\r
-       db 0c0h,0c0h,o_SET      ;set b,g\r
-       dw p_arg_bitop\r
+       db 0c0h,000h,i_RLC+080h ;rlc g\r
+       db a_cbr\r
+\r
+;      db 0f8h,000h,i_RLC      ;rlc g\r
+;      db a_cbr\r
+;      db 0f8h,008h,i_RRC      ;rrc g\r
+;      db a_cbr\r
+;      db 0f8h,010h,i_RL       ;rl g\r
+;      db a_cbr\r
+;      db 0f8h,018h,i_RR       ;rr g\r
+;      db a_cbr\r
+;      db 0f8h,020h,i_SLA      ;sla g\r
+;      db a_cbr\r
+;      db 0f8h,028h,i_SRA      ;sra g\r
+;      db a_cbr\r
+;      db 0f8h,038h,i_SRL      ;srl g\r
+;      db a_cbr\r
+       db 0c0h,040h,i_BIT      ;bit b,g\r
+       db a_bcbr\r
+       db 0c0h,080h,i_RES      ;res b,g\r
+       db a_bcbr\r
+       db 0c0h,0c0h,i_SET      ;set b,g\r
+       db a_bcbr\r
        db 0\r
 \r
 ;-------------------------------------------------------------------------------\r
+;-------------------------------------------------------------------------------\r
 \r
-p_arg_ry_rz:\r
-       call p_ry\r
-       call p_char_comma\r
-       jp p_rz\r
-p_arg_a_r:\r
-       call p_A_comma\r
-       jp p_rz\r
 \r
-p_arg_r_m:\r
-       call p_ry\r
-       call p_char_comma\r
-       jp sub_1d2ch\r
+pr_instr_args:\r
+       ld      hl,t_argf\r
+       ld      d,0\r
+       add     hl,de\r
+pria_l:\r
+       ld      a,(hl)          ;get next token\r
+       inc     hl\r
+       or      a\r
+       ret     z               ;\r
+       jp      m,pria_1\r
+       call    outchar         ;print as normal character\r
+       jr      pria_l\r
 \r
-p_arg_m_r:\r
-       call sub_1d2ch\r
-       call p_char_comma\r
-       jp p_ry\r
+pria_1:                                ;\r
+       push    hl\r
+       ld      hl,do_arg_n\r
+       and     07fh\r
+       call    add_hl_a2\r
+       ld      a,(hl)\r
+       inc     hl\r
+       ld      h,(hl)\r
+       ld      l,a\r
+       ld      a,(iy+000h)\r
+       call    CALL_HL\r
+       pop     hl\r
+       jr      pria_l\r
 \r
-p_arg_rst:\r
-       ld a,(iy+000h)\r
-       and 038h\r
-       jp out_hex\r
+;\r
+;      http://www.z80.info/decoding.htm\r
+;\r
+;      | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |\r
+;      |   x   |     y     |     z     |\r
+;              |   p   | q |\r
+;\r
 \r
-l1ca0h:\r
-       call pstr_inl\r
-       DC      '(SP),'\r
-       jp p_arg_hlixiy\r
+t_argf:\r
+;  1 byte opcodes\r
+a_rr   equ     $-t_argf\r
+       db      fi_ry,','               ;ld r[y],r[z]\r
+a_r    equ     $-t_argf\r
+       db      fi_rz,0                 ;op r[z]\r
+;a_ar  equ     $-t_argf\r
+;      db      'A,',fi_rz,0            ;op A,r[z]\r
+a_cc   equ     $-t_argf\r
+       db      fi_ccy,0                ;op cc[y]\r
+a_rst  equ     $-t_argf\r
+       db      fi_rst,0                ;rst y*8\r
+a_p2   equ     $-t_argf\r
+       db      fi_rp2,0                ;rp2[p]\r
+a_esphl        equ     $-t_argf\r
+       db      '(SP),',fi_hlixiy,0     ;ex (sp),hl\r
+a_hl   equ     $-t_argf\r
+       db      '(',fi_hlixiy,')',0     ;jp (hl)\r
+a_dehl equ     $-t_argf\r
+       db      'DE,HL',0\r
+a_lsphl        equ     $-t_argf\r
+       db      'SP,',fi_hlixiy,0       ;ld SP,HL\r
+a_eaf  equ     $-t_argf\r
+       db      'AF,AF''',0             ;ex af,af'\r
+a_hlp  equ     $-t_argf\r
+       db      fi_hlixiy,','           ;add hl,rp\r
+a_p    equ     $-t_argf\r
+       db      fi_rp,0                 ;rp[p]\r
+a_pa   equ     $-t_argf\r
+       db      '(',fi_rp,'),A',0       ;ld (rp),a ;rp=bc,de\r
+a_ap   equ     $-t_argf\r
+       db      'A,(',fi_rp,')',0       ;ld a,(rp) ;rp=bc,de\r
 \r
-l1caeh:\r
-       call p_char_lparen\r
-       call p_arg_hlixiy\r
-       jr out_rparen\r
+;  2 byte opcodes\r
+a_rn   equ     $-t_argf\r
+       db      fi_ry,',',fi_n,0        ;ld r[y],n\r
+;a_an  equ     $-t_argf\r
+;      db      'A,'                    ;op a,n\r
+a_n    equ     $-t_argf\r
+       db      fi_n,0                  ;op n\r
+a_ccj  equ     $-t_argf\r
+       db      fi_ccy2,','             ;jr cc,j        ;cc = nz,z,nc,c\r
+a_j    equ     $-t_argf\r
+       db      fi_j,0                  ;jr j\r
+a_ma   equ     $-t_argf\r
+       db      '(',fi_n,'),A',0        ;out (n),a\r
+a_am   equ     $-t_argf\r
+       db      'A,(',fi_n,')',0        ;in a,(n)\r
+\r
+;  3 byte opcodes\r
+a_ccnn equ     $-t_argf\r
+       db      fi_ccy,',',fi_nn,0      ;op cc[y],nn\r
+a_rnn  equ     $-t_argf\r
+       db      fi_rp,','               ;ld rp[p],nn\r
+a_nn   equ     $-t_argf\r
+       db      fi_nn,0                 ;jp nn\r
+a_mmhl equ     $-t_argf\r
+       db      '(',fi_nn,'),',fi_hlixiy,0 ;ld (nn),hl\r
+a_hlmm equ     $-t_argf\r
+       db      fi_hlixiy,',(',fi_nn,')',0 ;ld hl,(nn)\r
+a_mma  equ     $-t_argf\r
+       db      '(',fi_nn,'),A',0       ;ld (nn),a\r
+a_amm  equ     $-t_argf\r
+       db      'A,(',fi_nn,')',0       ;ld a,(nn)\r
 \r
-p_arg_ex_dehl:\r
-       call pstr_inl\r
-       DC      'DE,HL'\r
-p_arg_none:\r
-       ret\r
+;  Prefix ED + 1 byte opcode\r
+a_rc   equ     $-t_argf\r
+       db      fi_ry,','               ;in r[y],(c)\r
+a_c    equ     $-t_argf\r
+       db      '(C)',0                 ;in (c)\r
+a_cr   equ     $-t_argf\r
+       db      '(C),'                  ;out (c),r[y]\r
+a_ry   equ     $-t_argf\r
+       db      fi_ry,0                 ;inc r[y]\r
+a_im0  equ     $-t_argf\r
+       db      '0',0                   ;im 0\r
+a_im1  equ     $-t_argf\r
+       db      '1',0                   ;im 1\r
+a_im2  equ     $-t_argf\r
+       db      '2',0                   ;im 2\r
+a_ai   equ     $-t_argf\r
+       db      fi_ir,0                 ;ld a,i ... r,a\r
 \r
-l1cc1h:\r
-       call pstr_inl\r
-       DC      'SP,'\r
-       jp p_arg_hlixiy\r
+;  Prefix ED + 2 byte (opcode + immediate)\r
+a_rm   equ     $-t_argf\r
+       db      fi_ry,','               ;in0 r[y],(n)\r
+a_m    equ     $-t_argf\r
+       db      '(',fi_n,')',0          ;in0 (n)\r
+a_mr   equ     $-t_argf\r
+       db      '(',fi_n,'),',fi_ry,0   ;out0 (n),r[y]\r
 \r
-p_arg_ex_afaf:\r
-       call pstr_inl\r
-       DC      'AF,AF'''\r
-       ret\r
-\r
-l1cdch:\r
-       call sub_1ce8h\r
-       call p_char_comma\r
-       jp p_char_A\r
-\r
-l1ce5h:\r
-       call p_A_comma\r
-sub_1ce8h:\r
-       call p_char_lparen\r
-       call p_rp\r
-       jr out_rparen\r
-\r
-l1cf5h:\r
-       call p_A_comma\r
-       jr l1d09h\r
-l1cfah:\r
-       call p_ry\r
-       call p_char_comma\r
+;  Prefix ED + 3 byte (opcode + address)\r
+a_mmp  equ     $-t_argf\r
+       db      '(',fi_nn,'),',fi_rp,0  ;ld (nn),rp\r
+a_pmm  equ     $-t_argf\r
+       db      fi_rp,',(',fi_nn,')',0  ;ld rp,(nn)\r
+\r
+;  Prefix CB + 1 byte opcode\r
+a_bcbr equ     $-t_argf\r
+       db      fi_y,','                ;op y,r[z]\r
+a_cbr  equ     $-t_argf\r
+       db      fi_rz_cb,0              ;op r[z]\r
+a_noarg        equ     $-t_argf\r
+       db      0\r
+\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+argpf_index    defl    0\r
+\r
+argpf  macro   x\r
+fi_&x  equ     80h+argpf_index\r
+       dw      p_&x\r
+argpf_index    defl    argpf_index+1\r
+       endm\r
+\r
+do_arg_n:\r
+       argpf   ry\r
+       argpf   rz\r
+       argpf   ccy\r
+       argpf   ccy2\r
+       argpf   rst\r
+       argpf   rp\r
+       argpf   rp2\r
+       argpf   hlixiy\r
+       argpf   n\r
+       argpf   j\r
+       argpf   nn\r
+       argpf   ir\r
+       argpf   rz_cb\r
+       argpf   y\r
+\r
+\r
+p_n:\r
        ld a,(isprefix_ixiy)\r
        and a\r
-       ld a,(iy+002h)\r
-       jr nz,l1d0ch\r
-l1d09h:\r
        ld a,(iy+001h)\r
-l1d0ch:\r
+       jr z,out_hex_0\r
+       ld a,(iy+002h)\r
+       jr out_hex_0\r
+\r
+p_rst:\r
+       and 038h\r
+out_hex_0:\r
        jp out_hex\r
 \r
-p_arg_cc_jrel:\r
-       ld a,(iy+000h)\r
-       and 018h\r
-       call p_arg_cc0\r
-       call p_char_comma\r
-p_arg_jrel:\r
+\r
+p_j:\r
        ld c,(iy+001h)\r
        ld a,c\r
        rla\r
@@ -3010,162 +3518,48 @@ p_arg_jrel:
        add hl,bc\r
        inc hl\r
        inc hl\r
-       jr l1d4eh\r
-\r
-l1d29h:\r
-       call p_A_comma\r
-sub_1d2ch:\r
-       call p_char_lparen\r
-       ld a,(iy+001h)\r
-p_arg_nn_rp:\r
-       call out_hex\r
-out_rparen:\r
-       jr p_char_rparen\r
-\r
-l1d37h:\r
-       call sub_1d2ch\r
-       jr p_char_comma_A\r
+       jr out_hl_0\r
 \r
-p_arg_cc_mn:\r
-       call p_arg_cc\r
-       call p_char_comma\r
-p_arg_mn:\r
+p_nn:\r
        ld l,(iy+001h)\r
        ld h,(iy+002h)\r
-l1d4eh:\r
+out_hl_0:\r
        jp out_hl\r
 \r
-p_arg_ww_mn:\r
-       call p_rp\r
-       call p_char_comma\r
-       jr p_arg_mn\r
-\r
-p_arg_addr_hl:\r
-       call p_arg_addr\r
-       call p_char_comma\r
-       jp p_arg_hlixiy\r
-\r
-p_arg_hl_addr:\r
-       call p_arg_hlixiy\r
-       call p_char_comma\r
-       jp p_arg_addr\r
-\r
-p_arg_addr_a:\r
-       call p_arg_addr\r
-p_char_comma_A:\r
-       call p_char_comma\r
-       jr p_char_A\r
-\r
-p_A_comma:\r
-       call p_char_A\r
-p_char_comma:\r
-       ld a,','\r
-       db 021h\r
-p_char_A:\r
-       ld a,'A'\r
-       db 021h\r
-l1d85h:\r
-       ld a,'0'\r
-       db 021h\r
-l1d89h:\r
-       ld a,'1'\r
-       db 021h\r
-l1d8dh:\r
-       ld a,'2'\r
-       db 021h\r
-p_char_rparen:\r
-       ld a,')'\r
-       db 021h\r
-p_char_lparen:\r
-       ld a,'('\r
-       jp outchar\r
-\r
-p_arg_IR:\r
-       ld a,(iy+000h)\r
+p_ir:\r
        rra\r
        rra\r
        rra\r
        and 03\r
        ld hl,t_arg_IR\r
-       jp p_arg\r
+       jr p_arg\r
 \r
-t_arg_IR:\r
-       DC      'I,A'\r
-       DC      'R,A'\r
-       DC      'A,I'\r
-       DC      'A,R'\r
-       db      0\r
 \r
-p_arg_in_c:\r
-       call p_ry\r
-       call p_char_comma\r
-p_arg_in_c_0:\r
-       ld hl,t__C_\r
-       jp pstr\r
+get_cb_opc:\r
+       ld a,(isprefix_ixiy)\r
+       and a\r
+       ld a,(iy+001h)\r
+       ret z\r
+       ld a,(iy+002h)\r
+       ret\r
 \r
-p_arg_out_c:\r
-       ld hl,t__C_\r
-       call pstr\r
-       call p_char_comma\r
-       jr p_ry\r
-\r
-l1dcah:\r
-       call p_arg_hlixiy\r
-       call p_char_comma\r
-       jp p_rp\r
-\r
-p_arg_addr_ww:\r
-       call p_arg_addr\r
-       call p_char_comma\r
-       jp p_rp\r
-\r
-p_arg_ww_addr:\r
-       call p_rp\r
-       call p_char_comma\r
-       jr p_arg_addr\r
-\r
-p_arg_a_addr:\r
-       call p_A_comma\r
-p_arg_addr:\r
-       call p_char_lparen\r
-       call p_arg_mn\r
-       jr p_char_rparen\r
-\r
-p_arg_bitop:\r
+p_y:\r
        call get_cb_opc\r
-       push af\r
        rra\r
        rra\r
        rra\r
        and 007h\r
-;      add a,'0'\r
-;      call outchar\r
-       call out_dgt\r
-       call p_char_comma\r
-       pop af\r
-       jr p_r0\r
+       jp out_dgt\r
 \r
 p_rz_cb:\r
        call get_cb_opc\r
-       jr p_r0\r
-\r
-get_cb_opc:\r
-       ld a,(isprefix_ixiy)\r
-       and a\r
-       ld a,(iy+001h)\r
-       ret z\r
-       ld a,(iy+002h)\r
-       ret\r
+       jr p_rz\r
 \r
 p_ry:\r
-       ld a,(iy+000h)\r
        rra\r
        rra\r
        rra\r
-       jr p_r0\r
 p_rz:\r
-       ld a,(iy+000h)\r
-p_r0:\r
        and 007h\r
        cp 006h\r
        ld b,a\r
@@ -3189,39 +3583,30 @@ p_r0:
 l1e61h:\r
        call outchar\r
        pop af\r
-       jp p_arg_nn_rp\r
-\r
-t_lp_IXIY:\r
-       DC      '(IX'\r
-       DC      '(IY'\r
-\r
-p_arg_hlixiy:\r
-       ld a,(isprefix_ixiy)\r
-       ld hl,t_HL.IX.IY\r
-       jr p_arg\r
+       call out_hex\r
+       ld a,')'\r
+       jp outchar\r
 \r
 p_rp2:\r
-p_arg_zz:\r
        ld hl,t_arg_rp2\r
-       jr l1e8eh\r
+       db 0ddh                 ;swallow t_arg_rp in ix\r
 p_rp:\r
-p_arg_ww:\r
        ld hl,t_arg_rp\r
-l1e8eh:\r
-       ld a,(iy+000h)\r
        rra\r
        rra\r
        rra\r
        rra\r
        and 003h\r
        cp 002h\r
-       jr z,p_arg_hlixiy\r
+       jr nz,p_arg\r
+p_hlixiy:\r
+       ld a,(isprefix_ixiy)\r
+       ld hl,t_HL.IX.IY\r
        jr p_arg\r
 \r
-p_cc:\r
-p_arg_cc:\r
-       ld a,(iy+000h)\r
-p_arg_cc0:\r
+p_ccy2:\r
+       and 018h\r
+p_ccy:\r
        rra\r
        rra\r
        rra\r
@@ -3230,51 +3615,42 @@ p_arg_cc0:
 p_arg:\r
        ld b,a\r
 p_arg0:\r
-       jp pstr_sel\r
+       ;fall thru\r
 \r
-;-------------------------------------------------------------------------------\r
+pstr_sel:\r
+       call str_sel\r
+       ;fall thru\r
+pstr:\r
+       ld a,(hl)\r
+       inc hl\r
+       and a\r
+       ret z\r
+       call outchar\r
+       ret m\r
+       jr pstr\r
 \r
-if 0\r
-p_bli:\r
-       ld a,(iy+000h)\r
-       rra\r
-       and 00ch\r
-       ld b,a\r
-       ld a,(iy+000h)\r
-       and 003h\r
-       or b\r
-       ld hl,t_mn_bli\r
-       jr p_arg\r
-endif\r
+pstr_inl:\r
+       ex      (sp),hl\r
+       call    pstr\r
+       ex      (sp),hl\r
+       ret\r
 \r
 ;-------------------------------------------------------------------------------\r
 \r
 opc    macro   x\r
 \r
 i_&x   equ     opc_index\r
-o_&x   equ     $-opc_tabstart\r
+;o_&x  equ     $-opc_tabstart\r
        dc      '&x'\r
 opc_index      defl    opc_index+1\r
        endm\r
 \r
-opc1   macro   x,y\r
-\r
-i_&x&y equ     opc_index\r
-o_&x&y equ     $-opc_tabstart\r
-       db      '&x'\r
-i_&y   equ     opc_index+1\r
-o_&y   equ     $-opc_tabstart\r
-       dc      '&y'\r
-opc_index      defl    opc_index+2\r
-       endm\r
-\r
-\r
 t_MNEMONICS:\r
-opc_tabstart   defl    $\r
+;opc_tabstart  defl    $\r
 opc_index      defl    0\r
 ; 1-byte other\r
        opc NOP\r
-       opc1 R,LD\r
+       opc LD\r
        opc INC\r
        opc DEC\r
        opc DJNZ\r
@@ -3296,8 +3672,8 @@ opc_index defl    0
        opc SUB\r
        opc SBC\r
        opc AND\r
-;      opc XOR\r
-       opc1 X,OR\r
+       opc XOR\r
+       opc OR\r
        opc CP\r
 \r
        opc RET\r
@@ -3310,17 +3686,17 @@ opc_index       defl    0
        opc EXX\r
        opc IN\r
        opc EX\r
-       opc1 L,DI\r
+       opc DI\r
        opc EI\r
 ; CB\r
        opc RLC\r
        opc RRC\r
-       opc1 S,RL\r
+       opc RL\r
        opc RR\r
        opc SLA\r
        opc SRA\r
-;          SLL\r
-;      opc SRL\r
+       opc SLL\r
+       opc SRL\r
        opc BIT\r
        opc RES\r
        opc SET\r
@@ -3329,13 +3705,12 @@ opc_index       defl    0
        opc NEG\r
        opc RETN\r
        opc RETI\r
-       opc1 OT,IM\r
+       opc IM\r
        opc RRD\r
-;      opc RLD\r
+       opc RLD\r
 \r
-;Block instructions\r
-t_mn_bli:\r
-;      opc LDI\r
+; Block instructions\r
+       opc LDI\r
        opc CPI\r
        opc INI\r
        opc OUTI\r
@@ -3352,14 +3727,14 @@ t_mn_bli:
        opc INDR\r
        opc OTDR\r
 \r
-;Z180\r
+; Z180\r
        opc IN0\r
        opc OUT0\r
        opc TST\r
        opc MLT\r
        opc TSTIO\r
        opc SLP\r
-;      opc OTIM\r
+       opc OTIM\r
        opc OTDM\r
        opc OTIMR\r
        opc OTDMR\r
@@ -3403,138 +3778,19 @@ t_arg_cc:
        DC      'P'\r
        DC      'M'\r
        DB      0\r
-t__C_:\r
-       DC      '(C)'\r
-       DB      0\r
-\r
-;-------------------------------------------------------------------------------\r
-;-------------------------------------------------------------------------------\r
-if 0\r
-\r
-lookup_argstr:\r
-       ;todo\r
-       ret\r
-\r
-\r
-pr_instr_args:\r
-       ld      hl,t_argf\r
-       call    lookup_argstr\r
-\r
-       ret     z\r
-\r
-pria_l:\r
-       ld      a,(hl)          ;get next token\r
-       inc     hl\r
-       or      a\r
-       ret     z               ;\r
-       jp      m,pria_1\r
-       call    outchar         ;print as normal character\r
-       jr      pria_l\r
-\r
-pria_1:                                ;\r
-       push    hl\r
-       ld      hl,do_arg_n\r
-       and     07fh\r
-       call    add_hl_a2\r
-       ld      a,(hl)\r
-       inc     hl\r
-       ld      h,(hl)\r
-       ld      l,a\r
-       call    CALL_HL\r
-       pop     hl\r
-       jr      pria_l\r
-\r
-;\r
-;      http://www.z80.info/decoding.htm\r
-;\r
-;      | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |\r
-;      |   x   |     y     |     z     |\r
-;              |   p   | q |\r
-;\r
-\r
-t_argf:\r
-       db      fi_ry,',',fi_rz,0       ;ld r[y],r[z]\r
-       db      'A,',fi_rz,0            ;op A,r[z]\r
-       db      fi_rz,0                 ;op r[z]\r
-       db      fi_ccy,0                ;op cc[y]\r
-       db      fi_rst,0                ;\r
-       db      fi_rp2,0                ;rp2[p]\r
-       db      '(SP),',fi_hlixiy,0     ;ex (sp),hl\r
-       db      fi_hlixiy,0             ;jp (hl)\r
-       db      'DE,HL',0\r
-       db      'SP,',fi_hlixiy,0       ;ld SP,HL\r
-       db      fi_rp,0                 ;rp[p]\r
-       db      fi_ry,0                 ;inc r[y]\r
-       db      'AF,AF''',0             ;ex af,af'\r
-       db      fi_hlixiy,fi_rp,0       ;add hl,rp\r
-       db      '(',fi_rp,'),A',0       ;ld (rp),a ;rp=bc,de\r
-       db      'A,(',fi_rp,')',0       ;ld a,(rp) ;rp=bc,de\r
-\r
-       db      fi_ry,fi_n,0            ;ld r[y],n\r
-       db      'A,',fi_n,0             ;op a,n\r
-       db      fi_n,0                  ;op n\r
-       db      fi_j,0                  ;jr j\r
-       db      fi_ccy2,fi_j,0          ;jr cc,j        ;cc = nz,z,nc,c\r
-       db      '(',fi_n,'),',fi_ry,0   ;out (n),a\r
-       db      fi_ry,',(',fi_n,')',0   ;in a,(n)\r
-\r
-       db      fi_ccy,fi_nn,0          ;op cc[y],nn\r
-       db      fi_rp,fi_nn,0           ;ld rp[p],nn\r
-       db      fi_nn,0                 ;jp nn\r
-       db      '(',fi_nn,'),',fi_hlixiy,0 ;ld (nn),hl\r
-       db      fi_hlixiy,',(',fi_nn,')',0 ;ld hl,(nn)\r
-       db      '(',fi_nn,'),A',0       ;ld (nn),a\r
-       db      'A,(',fi_nn,')',0       ;ld a,(nn)\r
 \r
-       db      fi_ry,'(C)',0           ;in r[y],(c)\r
-       db      '(C)',0                 ;in (c)\r
-       db      '(C)',fi_ry,0           ;out (c),r[y]\r
-       db      '0',0                   ;im 0\r
-       db      '1',0                   ;im 1\r
-       db      '2',0                   ;im 2\r
-       db      fi_ir,0                 ;ld a,i ... r,a\r
-\r
-       db      fi_ry,'(',fi_n,')',0    ;in0 r[y],(n)\r
-       db      '(',fi_n,')',0          ;in0 (n)\r
-       db      '(',fi_n,')',fi_ry,0    ;out0 (n),r[y]\r
-\r
-       db      '(',fi_nn,'),',fi_rp,0  ;ld (nn),rp\r
-       db      fi_rp,',(',fi_nn,')',0  ;ld rp,(nn)\r
-\r
-       db      fi_rz_cb,0              ;op r[z]\r
-       db      fi_y,',',fi_rz_cb,0     ;op y,r[z]\r
-\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-argpf_index    defl    0\r
-\r
-argpf  macro   x\r
-fi_&x  equ     80h+argpf_index\r
-       dw      p_&x\r
-argpf_index    defl    argpf_index+1\r
-       endm\r
-\r
-do_arg_n:\r
-       argpf   ry\r
-       argpf   rz\r
-       argpf   m8\r
-       argpf   rst\r
-       argpf   hlixiy\r
-       argpf   rp\r
-       argpf   rp2\r
+t_lp_IXIY:\r
+       DC      '(IX'\r
+       DC      '(IY'\r
 \r
-p_ry:\r
-p_rz:\r
-p_m8:\r
-p_rst:\r
-p_hlixiy:\r
-p_rp:\r
-p_rp2:\r
+t_arg_IR:\r
+       DC      'I,A'\r
+       DC      'R,A'\r
+       DC      'A,I'\r
+       DC      'A,R'\r
+       db      0\r
 \r
 \r
-endif\r
-;-------------------------------------------------------------------------------\r
 ;-------------------------------------------------------------------------------\r
 \r
 tc_set_bp:\r
@@ -3557,7 +3813,7 @@ tc_set_bp:
        call bp_trace_enter\r
        ld iy,(reg.pc)\r
        ld hl,t_op_branch\r
-       call lookup_op_arg\r
+       call lookup_branch_op\r
        ccf\r
        ret c\r
        ex de,hl\r
@@ -3571,34 +3827,34 @@ l2037h:
 ;-------------------------------------------------------------------------------\r
 \r
 t_op_branch:\r
-       db 0ffh,0ddh,0          ;Prefix DD\r
+       db 0ffh,0ddh            ;Prefix DD\r
        dw l20a7h\r
-       db 0ffh,0fdh,0          ;Prefix FD\r
+       db 0ffh,0fdh            ;Prefix FD\r
        dw l20ach\r
-       db 0ffh,0edh,0          ;Prefix ED\r
+       db 0ffh,0edh            ;Prefix ED\r
        dw l20b8h\r
-t_op_branch0:\r
-       db 0ffh,0cdh,0          ;call mn\r
+\r
+       db 0ffh,0cdh            ;call mn\r
        dw l2080h\r
-       db 0ffh,0c3h,0          ;jp mn\r
+       db 0ffh,0c3h            ;jp mn\r
        dw l208bh\r
-       db 0ffh,0e9h,0          ;jp ()\r
+       db 0ffh,0e9h            ;jp ()\r
        dw l20a2h\r
-       db 0ffh,0c9h,0          ;ret\r
+       db 0ffh,0c9h            ;ret\r
        dw l20dch\r
-       db 0ffh,0cfh,0          ;rst 8\r
+       db 0ffh,0cfh            ;rst 8\r
        dw l2115h\r
-       db 0c7h,0c7h,0          ;rst n\r
+       db 0c7h,0c7h            ;rst n\r
        dw l20f9h\r
-       db 0c7h,0c4h,0          ;call cc,mn\r
+       db 0c7h,0c4h            ;call cc,mn\r
        dw l2080h\r
-       db 0f7h,010h,0          ;djnz d; jr d\r
+       db 0f7h,010h            ;djnz d; jr d\r
        dw l2093h\r
-       db 0e7h,020h,0          ;jr cc,d\r
+       db 0e7h,020h            ;jr cc,d\r
        dw l2093h\r
-       db 0c7h,0c2h,0          ;jp cc,mn\r
+       db 0c7h,0c2h            ;jp cc,mn\r
        dw l208bh\r
-       db 0c7h,0c0h,0          ;ret cc\r
+       db 0c7h,0c0h            ;ret cc\r
        dw l20c5h\r
        db 0\r
 \r
@@ -3760,91 +4016,6 @@ bp_tab:
         endm\r
        endm\r
 \r
-expr_buf:\r
-current_cseg   defl    $ - current_cseg\r
-       .phase  current_phase + current_cseg\r
-\r
-start:\r
-       LD      SP,ldr_end+(stack-ddtz_base)\r
-       LD      DE,signon               ;ldr_end+(expr_buf-ddtz_base)\r
-       LD      C,BDOS_PSTR\r
-       CALL    BDOS\r
-\r
-       xor     a\r
-       dec     a\r
-       jp      po,reloc\r
-       ld      de,msgz80\r
-       LD      C,BDOS_PSTR\r
-       CALL    BDOS\r
-       jp      0\r
-\r
-reloc:\r
-       LD      HL,ldr_end+ddtz_size    ;start of reloc bitmap\r
-       ld      bc,0108h                ;init bit counter\r
-\r
-       EXX\r
-       LD      HL,(BDOS+1)\r
-       LD      (ldr_end+(ddtz_bdos+1-ddtz_base)),HL\r
-       LD      BC,ddtz_size-1\r
-       LD      D,B\r
-       LD      E,0FFH\r
-       INC     DE                      ;size rounded up to next page boundary\r
-       INC     BC                      ;ddtz_size\r
-       OR      A\r
-       SBC     HL,DE                   ;BDOS - size\r
-       LD      (BDOS+1),HL             ;-> new BDOS entry\r
-\r
-       push    hl\r
-       PUSH    BC\r
-       ld      de,ldr_end\r
-       sbc     hl,de\r
-       EX      DE,HL                   ;-> DE\r
-       LD      HL,ldr_size\r
-       add     hl,bc\r
-       ld      b,h\r
-       ld      c,l\r
-       LD      HL,TPA\r
-reloc_lp:\r
-       EXX\r
-       djnz    reloc_nl\r
-       ld      b,c                     ;reload bit counter\r
-       LD      e,(HL)                  ;get next 8 relocation bits\r
-       INC     HL\r
-reloc_nl:\r
-       sla     e\r
-       EXX\r
-       JR      NC,reloc_next\r
-       DEC     HL\r
-       LD      A,(HL)\r
-       ADD     A,E\r
-       LD      (HL),A\r
-       INC     HL\r
-       LD      A,(HL)\r
-       ADC     A,D\r
-       LD      (HL),A\r
-reloc_next:\r
-       cpi\r
-       jp      pe,reloc_lp\r
-       dec     hl\r
-\r
-       POP     BC\r
-       pop     de\r
-       EX      DE,HL\r
-       ADD     HL,BC\r
-       EX      DE,HL\r
-       DEC     DE\r
-       LDDR\r
-       LD      HL,conbuf+2-ddtz_base\r
-       ADD     HL,DE\r
-       JP      (HL)\r
-\r
-current_phase  defl    $\r
-       .dephase\r
-current_cseg   defl    $\r
-\r
-       ds      EXPR_BUF_SIZE - ($ - expr_buf)\r
-expr_bufe:\r
-\r
 ;-------------------------------------------------------------------------------\r
 \r
 last_S:\r
@@ -3872,9 +4043,54 @@ last_L:
        dw      TPA\r
 \r
 pbl_loop_adr:\r
+       dw      0addeh\r
+\r
+bitmap_end:\r
        dw      0\r
 \r
+;-------------------------------------------------------------------------------\r
+\r
+conbuf:\r
+       ds      CONBUF_SIZE+1\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+       rept    (STACK_SIZE+3)/4\r
+       db      0deh,0adh,0beh,0efh\r
+       endm\r
+stack:\r
+reg.l2:        db      000h\r
+reg.h2:        db      000h\r
+reg.e2:        db      000h\r
+reg.d2:        db      000h\r
+reg.c2:        db      000h\r
+reg.b2:        db      000h\r
+reg.f2:        db      000h\r
+reg.a2:        db      000h\r
+       db      000h\r
+reg.i: db      000h\r
+reg.iy:        dw      0000h\r
+reg.ix:        dw      0000h\r
+reg.f: db      000h\r
+reg.a: db      000h\r
+reg.c: db      000h\r
+reg.b: db      000h\r
+reg.e: db      000h\r
+reg.d: db      000h\r
+reg.l: db      000h\r
+reg.h: db      000h\r
+reg_sp:        dw      TPA\r
+reg.iff:\r
+       db      0f3h\r
+       db      0c3h\r
+reg.pc:        dw      TPA\r
+\r
+cmd_rpt:dw     mainloop\r
+       db      0ffh,0ffh,0ffh\r
+;-------------------------------------------------------------------------------\r
+\r
 ddtz_size      equ     $-ddtz_base\r
+prog_size      equ     $-start\r
 ddtz_end:\r
 \r
 ;-------------------------------------------------------------------------------\r