]> cloudbase.mooo.com Git - ddt180.git/blobdiff - ddt180.z80
New relocator
[ddt180.git] / ddt180.z80
index ed3d7f2649cf58590580d579f19f22c6d400ed71..fd160766604e2b28dd78be3e3dc79eb9b95b316a 100644 (file)
 ;   - 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
-TAB            equ     9\r
-LF             equ     10\r
-CR             equ     13\r
+BS             equ     08h\r
+TAB            equ     09h\r
+CR             equ     0dh\r
+LF             equ     0ah\r
+DEL            equ     7fh\r
+CNTRX          equ     'X'-'@'\r
 \r
 ; CP/M memory layout\r
 \r
 BDOS           equ     5\r
-dfcb1          equ     05ch\r
-dfcb2          equ     06ch\r
-DMA_BUF                equ     080h\r
 TPA            equ     0100h\r
 \r
-; BDOS function calls\r
-\r
-BDOS_CIN       equ     1       ;Console Input\r
-BDOS_COUT      equ     2       ;Console Output\r
-BDOS_PSTR      equ     9       ;Print String\r
-BDOS_CBUF      equ     10      ;Read Console Buffer\r
-BDOS_CSTAT     equ     11      ;Get Console Status\r
-BDOS_OPEN      equ     15      ;Open File\r
-BDOS_CLOSE     equ     16      ;Close File\r
-BDOS_DELETE    equ     19      ;Delete File\r
-BDOS_READ      equ     20      ;Read Sequential\r
-BDOS_WRITE     equ     21      ;Write Sequential\r
-BDOS_CREATE    equ     22      ;Make File\r
-BDOS_SETDMA    equ     26      ;Set DMA Address\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     8       ;Size of a breakpoint record\r
-YREG_CNT       equ     10      ;Number of Y registers (0..9)\r
+BP_SIZE                equ     4       ;Size of a breakpoint record\r
 \r
-SYMCASE_SENS   equ     0       ;Symbols are case sensitive\r
-SYMCASE_CONV   equ     1       ;Convert case when symbols are loaded\r
-SYMCASE_LOWER  equ     2       ;Convert to lower case if set, else to upper case\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
-sub_0004h:\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
-screen_width:\r
-       db      80\r
-symlen_max:\r
-       db      16\r
-\r
-symattrib:\r
-       db      0\r
 \r
+;-------------------------------------------------------------------------------\r
 \r
-current_cseg   defl    $ - current_cseg\r
-       .phase  current_phase + current_cseg\r
 signon:\r
-       db      'Symbolic DDTZ/180'\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
+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
-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
-l004eh:        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
-var.$: dw      0000h\r
-var.@: dw      0\r
+;-------------------------------------------------------------------------------\r
+; Clear old position\r
 \r
-error_func:dw  p_msg_error\r
-cmd_rpt:dw     mainloop\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
-;-------------------------------------------------------------------------------\r
+; Determine current position\r
 \r
-conbuf:\r
-       db      CONBUF_SIZE\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
 \r
-       ld sp,stack\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 de,ddtz_base\r
-       or a\r
-       sbc hl,de\r
-       add 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
+       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
+       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 sub_0004h\r
-       ld hl,ddtz_base\r
-       ld l,000h\r
-       ld (reg_sp),hl\r
-       call cpy_fcb2\r
-       ld a,(dfcb1+1)\r
-       cp ' '\r
-       ld hl,0\r
-       call nz,read_file\r
-       jr mainloop\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
-       ds      CONBUF_SIZE + 3 - ($ - conbuf)\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
+       include z180reg.inc\r
+\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
+\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      cmd_@           ;examine/substitute the displacement register @\r
-       dw      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      cmd_C           ;trace over Calls\r
+       dw      ERROR ;cmd_C    ;trace over Calls\r
        dw      cmd_D           ;Display memory in hex and ascii\r
-       dw      ERROR           ;\r
-       dw      cmd_F           ;specify Filename and command line\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
        dw      cmd_I           ;Input a byte from port\r
@@ -204,25 +519,27 @@ CMDTAB:
        dw      cmd_O           ;Output a byte to port\r
        dw      ERROR           ;\r
        dw      cmd_Q           ;Qery memory for byte string\r
-       dw      cmd_R           ;Read binary or hex file and/or symbol file\r
+       dw      cmd_R           ;Read binary or hex file\r
        dw      cmd_S           ;Substitute memory\r
        dw      cmd_T           ;Trace\r
        dw      ERROR           ;\r
        dw      cmd_V           ;Verify (compare) two memory areas\r
-       dw      cmd_W           ;Write a file to disk\r
+       dw      ERROR ;cmd_W    ;Write a file to disk\r
        dw      cmd_X           ;eXamine [and substitute] registers\r
-       dw      cmd_Y           ;examine [and substitute] Y variables\r
+       dw      ERROR ;cmd_Y    ;examine [and substitute] Y variables\r
        dw      cmd_Z           ;Zap (fill) memory with a byte string\r
 \r
+ERROR:\r
+       call    pstr_inl\r
+       dc      '?',CR,LF\r
+       ;fall thru\r
 mainloop:\r
        ld sp,stack\r
-       ld hl,p_msg_error\r
-       ld (error_func),hl\r
        ld hl,(reg.pc)\r
-       ld (var.$),hl\r
        call bp_clr_temporary\r
        ld hl,(cmd_rpt)\r
        ld de,mainloop\r
+       push de\r
        call cp_hl_de\r
        ld a,'>'\r
        call outchar\r
@@ -231,67 +548,39 @@ mainloop:
        call get_line\r
        call skipbl\r
        jr z,exe_hl\r
-       ld hl,mainloop\r
+       pop hl\r
+       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
-       add a,a\r
        ld hl,CMDTAB\r
-       call add_hl_a\r
+       call add_hl_a2\r
        ld a,(hl)\r
        inc hl\r
        ld h,(hl)\r
        ld l,a\r
-       jr exe_hl\r
-\r
-ERROR:\r
-       ld hl,(error_func)\r
 exe_hl:\r
-       call CALL_HL\r
-       jr mainloop\r
+CALL_HL:\r
+       jp (hl)\r
 \r
 ;-------------------------------------------------------------------------------\r
 \r
-p_msg_error:\r
-       call    pstr_inl\r
-       dc      '?'\r
-       ;fall thru\r
 crlf:\r
        call    pstr_inl\r
-       db      CR,LF+80h\r
-       call inchar\r
-       ld a,0\r
+       dc      CR,LF\r
+       xor a\r
        ld (con_col),a\r
+       call inchar\r
        jr c,mainloop\r
        ret\r
 \r
-out.hl.@:\r
-       call out_hl\r
-       push de\r
-       push hl\r
-       ld de,(var.@)\r
-       ld a,d\r
-       or e\r
-       jr z,l01bfh\r
-       call outbl\r
-       call    pstr_inl\r
-       dc      '@'\r
-       and a\r
-       sbc hl,de\r
-       call out_hl\r
-l01bfh:\r
-       pop hl\r
-       pop de\r
-       ret\r
-\r
 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
@@ -358,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
@@ -373,7 +661,8 @@ out.ascii:
        cp ' '\r
        push af\r
        call nc,outbl\r
-       call outquote\r
+       call    pstr_inl\r
+       dc      ''''\r
        pop af\r
        jr nc,l0242h\r
        sub 0c0h\r
@@ -385,7 +674,8 @@ l0242h:
        call outchar\r
        cp ''''\r
        call z,outchar\r
-       call outquote\r
+       call    pstr_inl\r
+       dc      ''''\r
        sla c\r
        pop bc\r
        ret nc\r
@@ -400,10 +690,6 @@ outbl2:
        call outbl\r
 outbl:\r
        ld a,' '\r
-       jr outchar\r
-\r
-outquote:\r
-       ld a,''''\r
 outchar:\r
        push ix\r
        push iy\r
@@ -412,9 +698,8 @@ outchar:
        push bc\r
        push af\r
        and 07fh\r
-       ld e,a\r
-       ld c,BDOS_COUT\r
-       call ddtz_bdos\r
+       ld      c,a\r
+       call    conout\r
        ld hl,con_col\r
        inc (hl)\r
        pop af\r
@@ -425,33 +710,6 @@ outchar:
        pop ix\r
        ret\r
 \r
-pstr:\r
-       ld a,(hl)\r
-       inc hl\r
-       and a\r
-       ret z\r
-       call outchar\r
-       and a\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_align_@_sym:\r
-       push    de\r
-       ld      de,(var.@)\r
-       ld      a,d\r
-       or      e\r
-       pop     de\r
-       ld      a,(symlen_cur)\r
-       jr      z,$+4\r
-       add     a,6\r
-       add     a,c\r
-       ld      c,a\r
 p_goto_col:\r
        ld      a,(con_col)\r
        cp      c\r
@@ -462,42 +720,107 @@ p_goto_col:
 \r
 ;-------------------------------------------------------------------------------\r
 \r
+incharw:\r
+       call inchar\r
+       jr nc,incharw\r
+       ret\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
 inchar:\r
        push ix\r
        push hl\r
        push de\r
        push bc\r
-       ld c,BDOS_CSTAT\r
-       call ddtz_bdos\r
+       call    const\r
        and a\r
-       jr z,l0284h\r
-       ld c,BDOS_CIN\r
-       call ddtz_bdos\r
+       jr      z,inch1\r
+       call    conin\r
        scf\r
-l0284h:\r
+inch1:\r
        pop bc\r
        pop de\r
        pop hl\r
        pop ix\r
        ret\r
 \r
-get_line:\r
-       push hl\r
-       ld de,conbuf\r
-       ld c,BDOS_CBUF\r
-       call ddtz_bdos\r
-       call crlf\r
-       ld hl,conbuf+1\r
-       ld      e,(hl)\r
-       xor     a\r
-       ld      d,a\r
-       inc     hl\r
-       ex      de,hl\r
-       add     hl,de\r
-       ld      (hl),a\r
-       pop hl\r
+;-------------------------------------------------------------------------------\r
+\r
+DELC:\r
+       ld      a,b\r
+       or      a\r
+       ret     z\r
+       call    DELC1\r
+       dec     hl\r
+       dec     b\r
+       ld      a,(hl)\r
+       cp      ' '\r
+       ret     nc\r
+DELC1:\r
+       call    pstr_inl\r
+       dc      BS,' ',BS\r
        ret\r
 \r
+DELL:\r
+       ld a,b                  ;\r
+       or a                    ;\r
+       ret z                   ;\r
+       call DELC               ;\r
+       jr DELL                 ;\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+get_line:\r
+       push hl                 ;\r
+       ld hl,conbuf            ;\r
+       ld b,0                  ;\r
+inlnxtch:\r
+       ld a,b                  ;\r
+       cp CONBUF_SIZE          ;\r
+       jr z,inl_e              ;\r
+       call incharw            ;\r
+       cp CR                   ;\r
+       jr z,inl_e              ;Accept line\r
+       cp LF                   ;\r
+       jr z,inl_e              ;Accept line\r
+\r
+       cp BS                   ;\r
+       jr z,gl_1               ;\r
+       cp DEL                  ;\r
+       jr nz,gl_2              ;\r
+gl_1:\r
+       call DELC               ;Delete Char\r
+       jr inlnxtch             ;\r
+gl_2:\r
+       cp CNTRX                ;\r
+       jr nz,gl_3              ;\r
+       call DELL               ;Delete Line\r
+       jr inlnxtch             ;\r
+gl_3:\r
+       cp TAB                  ;\r
+       jr nz,gl_4              ;\r
+       ld a,' '                ;\r
+gl_4:\r
+       ld (hl),a               ;\r
+       cp ' '                  ;\r
+       jr nc,gl_5              ;\r
+       ld a,'^'                ;Controll characters\r
+       call outchar            ;\r
+       ld a,(hl)               ;\r
+       add a,'@'               ;\r
+gl_5:\r
+       call outchar            ;\r
+       inc hl                  ;\r
+       inc b                   ;\r
+       jr inlnxtch             ;\r
+\r
+inl_e:\r
+       ld (hl),0\r
+       call CRLF               ;\r
+       ld de,conbuf            ;\r
+       pop hl                  ;\r
+       ret                     ;\r
+\r
 ;-------------------------------------------------------------------------------\r
 \r
 get_char_upper:\r
@@ -511,32 +834,24 @@ toupper:
        and 05fh\r
        ret\r
 \r
-tolower:\r
-       cp 'A'\r
-       ret c\r
-       cp 'Z'+1\r
-       ccf\r
-       ret c\r
-       or 020h\r
-       ret\r
-\r
 ;-------------------------------------------------------------------------------\r
 \r
 skipbl0:\r
        inc de\r
 skipbl:\r
        call get_char_upper\r
-       call test_whitespace\r
+       cp ' '\r
        jr z,skipbl0\r
        or a\r
        ret\r
 \r
+;-------------------------------------------------------------------------------\r
+\r
 next_arg:\r
        call skipbl\r
        cp ','\r
        ret nz\r
-       inc de\r
-       call skipbl\r
+       call skipbl0\r
        cp a\r
        ret\r
 \r
@@ -562,6 +877,8 @@ chk_stack:
 \r
 ;-------------------------------------------------------------------------------\r
 \r
+add_hl_a2:\r
+       add a,a\r
 add_hl_a:\r
        add a,l\r
        ld l,a\r
@@ -575,85 +892,6 @@ cp_hl_de:
        add hl,de\r
        ret\r
 \r
-sub_hl_a1:\r
-       dec     hl\r
-sub_hl_a:\r
-       push    bc\r
-       ld      c,a\r
-       ld      b,0\r
-       or      a\r
-       sbc     hl,bc\r
-       pop     bc\r
-       ret\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-sym_getname:\r
-       push    de\r
-       push    hl\r
-       ld      hl,ddtz_base+2\r
-sgn_l:\r
-       ld      d,(hl)\r
-       dec     hl\r
-       ld      e,(hl)\r
-       dec     hl\r
-       ld      a,(hl)\r
-       cp      0c3h\r
-       jr      z,sgn_e\r
-\r
-       ex      (sp),hl\r
-       call    cp_hl_de\r
-       jr      z,sgn_e\r
-       ex      (sp),hl\r
-       call    sub_hl_a1\r
-       jr      sgn_l\r
-sgn_e:\r
-       sub     0c3h\r
-       pop     hl\r
-       pop     de\r
-       ret\r
-\r
-p_symstr:\r
-       push    bc\r
-       ld      b,(hl)\r
-pss_l:\r
-       dec     hl\r
-       ld      a,(hl)\r
-       call    outchar\r
-       djnz    pss_l\r
-       dec     hl\r
-       pop     bc\r
-       ret\r
-\r
-p_symbol:\r
-  if 0\r
-       ld      a,(dash_flag)\r
-       or      a\r
-       ret     nz\r
-  endif\r
-       push    hl\r
-       call    sym_getname\r
-       call    nz,p_symstr\r
-       pop     hl\r
-       ret\r
-\r
-p_label:\r
-  if 0\r
-       ld      a,(dash_flag)\r
-       or      a\r
-       ret     nz\r
-  endif\r
-       push    hl\r
-       call    sym_getname\r
-       jr      z,pl_e\r
-       call    p_symstr\r
-       call    pstr_inl\r
-       dc      ':'\r
-       call    crlf\r
-pl_e:\r
-       pop     hl\r
-       ret\r
-\r
 ;-------------------------------------------------------------------------------\r
 \r
 lookupch:\r
@@ -676,10 +914,6 @@ l0300h:
 sub_0303h:\r
        ld hl,t_reg_names\r
        ld b,07fh\r
-       jr l030ch\r
-\r
-sub_030ah:\r
-       ld b,0ffh\r
 l030ch:\r
        inc b\r
        ld a,(hl)\r
@@ -690,10 +924,6 @@ l030ch:
        res 7,b\r
        ret\r
 \r
-sub_0318h:\r
-       push bc\r
-       res 7,b\r
-       defb 03eh               ;ld a,nn\r
 sub_031ch:\r
        push bc\r
        push de\r
@@ -715,22 +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
-sel_dc_string:\r
+str_sel:\r
        inc b\r
-l033eh:\r
-       dec b\r
-       ret z\r
-       call sub_0345h\r
-       jr l033eh\r
+       jr str_sel2\r
+str_sel1:\r
+       call str_sel_next\r
+str_sel2:\r
+       djnz str_sel1\r
+       ret\r
 \r
-sub_0345h:\r
+str_sel_next:\r
        ld a,(hl)\r
        and a\r
        ret z\r
@@ -741,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
@@ -757,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
@@ -843,91 +1074,6 @@ l03b8h:
 expr:\r
        call skipbl\r
 expr1:\r
-       call do_subexpr\r
-       ret c\r
-       call do_rel_op\r
-       ret nc\r
-       push bc\r
-       push hl\r
-       call do_subexpr\r
-       jr c,error0\r
-       ex de,hl\r
-       ex (sp),hl\r
-       and a\r
-       sbc hl,de\r
-       ld hl,0ffffh\r
-       pop de\r
-       ret\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-do_op_eq:\r
-       jr z,l03edh\r
-       jr l03ech\r
-do_op_ne:\r
-       jr nz,l03edh\r
-       jr l03ech\r
-do_op_le:\r
-       jr z,l03edh\r
-do_op_lt:\r
-       jr c,l03edh\r
-       jr l03ech\r
-do_op_gt:\r
-       jr z,l03ech\r
-do_op_ge:\r
-       jr nc,l03edh\r
-l03ech:\r
-       inc hl\r
-l03edh:\r
-       and a\r
-       ret\r
-do_rel_op:\r
-       push hl\r
-       ld hl,tab_eq_le_ge\r
-       call lookupch\r
-       jr nc,l041dh\r
-       ld a,b\r
-       or a\r
-       jr z,l0411h\r
-       ld a,(de)\r
-       cp '='\r
-       jr nz,l0406h\r
-       inc de\r
-       inc b\r
-       inc b\r
-       jr l0411h\r
-l0406h:\r
-       bit 0,b\r
-       jr z,l0411h\r
-       cp '>'\r
-       jr nz,l0411h\r
-       inc de\r
-       ld b,005h\r
-l0411h:\r
-       ld hl,tab_func_eqlege\r
-       ld a,b\r
-       add a,a\r
-       call add_hl_a\r
-       ld c,(hl)\r
-       inc hl\r
-       ld b,(hl)\r
-       scf\r
-l041dh:\r
-       pop hl\r
-       ret\r
-\r
-tab_eq_le_ge:\r
-       db      '=<>',0\r
-\r
-tab_func_eqlege:\r
-       dw      do_op_eq\r
-       dw      do_op_lt\r
-       dw      do_op_gt\r
-       dw      do_op_le\r
-       dw      do_op_ge\r
-       dw      do_op_ne\r
-\r
-do_subexpr:\r
        call do_factor\r
        ret c\r
 l0433h:\r
@@ -999,40 +1145,33 @@ doop_mod:
 ;     de: r  (x%y)\r
 \r
 div_hl_de:\r
-       push bc\r
-       ex de,hl\r
-       ld b,h\r
-       ld c,l\r
-       ld hl,0\r
-       ld a,16\r
+       push    bc\r
+       ex      de,hl           ;de: x\r
+       ld      b,h             ;bc: y\r
+       ld      c,l\r
+       ld      hl,0            ;hl: r\r
+       ld      a,16\r
 \r
 ;  de: x   (x shifted out, q shifted in)\r
 ;  bc: y\r
 ;  hl: r   (initially 0)\r
 \r
-l047eh:\r
-       push af\r
-       add hl,hl\r
-       ex de,hl\r
-       xor a\r
-       add hl,hl\r
-       ex de,hl\r
-       adc a,l\r
-       sub c\r
-       ld l,a\r
-       ld a,h\r
-       sbc a,b\r
-       ld h,a\r
-       inc de\r
-       jr nc,l048fh\r
-       add hl,bc\r
-       dec de\r
-l048fh:\r
-       pop af\r
-       dec a\r
-       jr nz,l047eh\r
-       ex de,hl\r
-       pop bc\r
+div_lp:\r
+       ex      de,hl\r
+       add     hl,hl           ;x <<= 1\r
+       ex      de,hl\r
+       adc     hl,hl           ;r <<= 1\r
+       inc     de\r
+       or      a\r
+       sbc     hl,bc\r
+       jr      nc,div_norestore\r
+       dec     de\r
+       add     hl,bc\r
+div_norestore:\r
+       dec     a\r
+       jr      nz,div_lp\r
+       ex      de,hl\r
+       pop     bc\r
        ret\r
 \r
 doop_and:\r
@@ -1068,8 +1207,7 @@ do_binary_op:
        call lookupch\r
        ld a,b\r
        ld hl,tblf_opa\r
-       add a,a\r
-       call add_hl_a\r
+       call add_hl_a2\r
        ld c,(hl)\r
        inc hl\r
        ld b,(hl)\r
@@ -1102,7 +1240,7 @@ do_factor:
        call get.number\r
        ret nc\r
        inc de\r
-       ld hl,(BDOS+1)\r
+       ld hl,ddtz_base-1\r
        cp 'T'\r
        ret z\r
        ld hl,(high_load)\r
@@ -1114,15 +1252,9 @@ do_factor:
        ld hl,TPA\r
        cp 'L'\r
        ret z\r
-       ld hl,(var.@)\r
-       cp '@'\r
-       ret z\r
-       ld hl,(var.$)\r
+       ld hl,(reg.pc)\r
        cp '$'\r
        ret z\r
-       ld hl,ddtz_base\r
-       cp 'Z'\r
-       ret z\r
        cp '-'\r
        jr z,fact_factneg\r
        cp '~'\r
@@ -1131,37 +1263,18 @@ do_factor:
        jr z,fact_factor\r
        cp '^'\r
        jr z,fact_reg.CPU\r
-       cp 'Y'\r
-       jr z,fact_reg.Y\r
        cp '('\r
        jr z,fact_mem\r
        cp '['\r
        jr z,expr_brckt\r
        cp ''''\r
        jr z,fact_factstring\r
-       cp '.'\r
-       jr z,fact_symbol\r
        dec de\r
        scf\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
 \r
-fact_reg.Y:\r
-       call get.decdigit\r
-       jr c,error1\r
-       inc de\r
-get_y_val:\r
-       add a,a\r
-       ld hl,reg_Y\r
-       call add_hl_a\r
-       ld a,(hl)\r
-       inc hl\r
-       ld h,(hl)\r
-       ld l,a\r
-       and a\r
-       ret\r
-\r
 fact_factstring:\r
        ld hl,0\r
 l054bh:\r
@@ -1200,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
@@ -1212,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
@@ -1246,59 +1360,6 @@ expr_brckt:
 error1:\r
        jp ERROR\r
 \r
-fact_symbol:\r
-       push    bc\r
-       ld      hl,ddtz_base            ;symtbl start\r
-       ld      a,(symattrib)\r
-       ld      c,07fh\r
-       rra\r
-       jr      c,fs_nxtsym\r
-       res     5,c\r
-\r
-fs_nxtsym:\r
-       ld      a,(hl)                  ;symlen\r
-       cp      0c3h\r
-       jr      z,error1\r
-       ld      b,a                     ;symlen\r
-       inc     b\r
-       push    hl                      ;symtbl ptr\r
-       push    de                      ;inpsym ptr\r
-fs_nxtchar:\r
-       ld      a,(de)\r
-       djnz    fs_3\r
-       call    test_sym_char\r
-       jr      z,fs_cont\r
-       pop     hl                      ;inpsym ptr (discard)\r
-       inc     de\r
-       cp      a,':'\r
-       jr      z,fs_cont_1\r
-       dec     de\r
-\r
-       pop     hl                      ;symtbl ptr\r
-       inc     hl\r
-       ld      a,(hl)                  ;symval h\r
-       inc     hl\r
-       ld      h,(hl)                  ;symval l\r
-       ld      l,a\r
-       or      a                       ;clear carry\r
-       pop     bc\r
-       ret\r
-\r
-fs_3:\r
-       inc     de\r
-       dec     hl\r
-       xor     (hl)\r
-       and     c\r
-       jr      z,fs_nxtchar\r
-fs_cont:                               ;start over\r
-       pop     de                      ;inpsym ptr\r
-fs_cont_1:\r
-       pop     hl                      ;symtbl ptr\r
-       ld      a,(hl)\r
-       add     a,3\r
-       call    sub_hl_a\r
-       jr      fs_nxtsym\r
-\r
 ;-------------------------------------------------------------------------------\r
 \r
 get.number:\r
@@ -1420,13 +1481,13 @@ p_cpustat:
 l063eh:\r
        call p_regs\r
        djnz l063eh\r
+       call outbl6\r
        push hl\r
        push de\r
        ld iy,(reg.pc)\r
        call p_disas_instr\r
        pop de\r
-       ex (sp),hl\r
-       push af\r
+       pop hl\r
        call crlf\r
        call p_f2\r
        call outbl2\r
@@ -1434,10 +1495,6 @@ l063eh:
 l065bh:\r
        call p_regs\r
        djnz l065bh\r
-       pop af\r
-       pop hl\r
-       call nz,outbl6\r
-       call nz,p_offset\r
        jp crlf\r
 \r
 p_f:\r
@@ -1445,13 +1502,13 @@ p_f:
        call p_flags\r
        ld a,(reg.iff)\r
        cp 0f3h\r
-       jp z,outbl\r
+       jr z,outbl_1\r
        ld a,'E'\r
        jp outchar\r
 p_f2:\r
        ld a,(reg.f2)\r
        call p_flags\r
-       jp outbl\r
+       jr outbl_1\r
 \r
 p_flags:\r
        push    hl\r
@@ -1494,22 +1551,16 @@ p_regs:
        inc hl\r
        ld d,(hl)\r
        ex de,hl\r
-       dec a\r
-       jr z,l06d9h\r
-       call out.hl.@\r
-       call z,outbl6\r
-       jr l06e2h\r
-l06d9h:\r
        call out_hl\r
        jr l06e2h\r
 l06deh:\r
        ld a,(de)\r
        call out_hex\r
 l06e2h:\r
-       call outbl\r
        pop de\r
        pop hl\r
-       ret\r
+outbl_1:\r
+       jp outbl\r
 \r
 b_06e9_start:\r
        DC      'A '\r
@@ -1557,24 +1608,74 @@ b_0709_start:
        db      000h\r
 \r
 ;-------------------------------------------------------------------------------\r
-; > G [startaddr] [;breakp..]\r
-;      Go [to start] [with temporary breakpoints]\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
-cmd_G:\r
-       sub a\r
-       ld (trace_call_flag),a\r
-       ld (l0941h),a\r
-       call expr\r
-       jr c,l0740h\r
-       ld (reg.pc),hl\r
-l0740h:\r
-       call skipbl\r
-       jp z,user_go\r
-       cp ';'\r
-       jp nz,ERROR\r
-       inc de\r
-       ld a,002h\r
-       call bp_enter\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
+\r
+cmd_G:\r
+       sub a\r
+       ld (bp_p_cpu_flag),a\r
+       call expr\r
+       jr c,l0740h\r
+       ld (reg.pc),hl\r
+l0740h:\r
+       call skipbl\r
+       jr z,user_go0\r
+       cp ';'\r
+       jp nz,ERROR\r
+       inc de\r
+       ld a,002h\r
+       call bp_enter\r
+user_go0:\r
        jp user_go\r
 \r
 ;-------------------------------------------------------------------------------\r
@@ -1589,7 +1690,9 @@ bpl_init:
 \r
 bpl_next:\r
        ld      de,BP_SIZE\r
+       push    af\r
        add     ix,de\r
+       pop     af\r
        dec     b\r
        ret     z\r
 \r
@@ -1604,7 +1707,6 @@ bp_clr_temporary:
        ld a,(ix+000h)\r
        and 0f1h\r
        ld (ix+000h),a\r
-       call bp_clr_condition\r
 \r
        call bpl_next\r
        ret\r
@@ -1616,11 +1718,10 @@ bp_clr_temporary:
 ;      set breakpoints\r
 ; > BX\r
 ;      clear all breakpoints\r
-; > BX address [address..]\r
+; > BX breakp [breakp..]\r
 ;      clear breakpoints\r
 ;\r
-; where breakp is:\r
-;      [R] expression [I condition]\r
+; breakp can be any valid expression\r
 \r
 cmd_B:\r
        call skipbl\r
@@ -1631,6 +1732,7 @@ cmd_B:
        dec de\r
        ld a,001h\r
        jp bp_enter\r
+\r
 bp_clr0:\r
        call skipbl\r
        jr z,bp_clr_all\r
@@ -1656,49 +1758,27 @@ bp_clr:
        jr nz,l07aeh\r
 l07a7h:\r
        ld (ix+000h),000h\r
-       call bp_clr_condition\r
 l07aeh:\r
        pop af\r
        call bpl_next\r
        ret\r
 \r
 bp_print:\r
+       ld      c,0\r
        call    bpl_init\r
 \r
        bit 0,(ix+000h)\r
        jr z,bp_pr_cont\r
-       ld a,'R'\r
-       bit 4,(ix+000h)\r
-       jr nz,l07cdh\r
-       ld a,' '\r
-l07cdh:\r
-       call outchar\r
-       call outbl\r
        ld l,(ix+002h)\r
        ld h,(ix+003h)\r
-       call out.hl.@\r
-       call    outbl\r
-       call    p_symbol\r
-       ld      c,9\r
-       call    p_align_@_sym\r
-       call    pstr_inl\r
-       dc      ':'\r
-       ld l,(ix+004h)\r
-       ld h,(ix+005h)\r
        call out_hl\r
-       ld l,(ix+006h)\r
-       ld h,(ix+007h)\r
-       ld a,h\r
-       or l\r
-       jr z,l0805h\r
-       call outbl4\r
-       call    pstr_inl\r
-       dc      'I  '\r
-       call pstr\r
-l0805h:\r
-       call crlf\r
+       call outbl2\r
+       inc     c\r
 bp_pr_cont:\r
        call bpl_next\r
+       ld      a,c\r
+       or      a\r
+       call    nz,crlf\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
@@ -1710,11 +1790,7 @@ bp_enter:
        ld b,a\r
        call skipbl\r
        ret z\r
-       cp 'R'\r
-       jr nz,bp_e_1\r
-       inc de\r
-       set 4,b\r
-bp_e_1:\r
+\r
        push bc\r
        call expr\r
        jr c,error12\r
@@ -1729,12 +1805,6 @@ bp_e_1:
        pop de\r
        ld (ix+002h),l\r
        ld (ix+003h),h\r
-       call bp_get_count\r
-       ld (ix+004h),l\r
-       ld (ix+005h),h\r
-       call bp_get_condition\r
-       ld (ix+006h),l\r
-       ld (ix+007h),h\r
        call next_arg\r
        pop af\r
        ld (ix+000h),a\r
@@ -1752,52 +1822,9 @@ bp_get_freeslot:
 error12\r
        jp ERROR\r
 \r
-bp_get_count:\r
-       call skipbl\r
-       ld hl,1\r
-       cp ':'\r
-       ret nz\r
-       inc de\r
-       call expr\r
-       jr c,error12\r
-       ret\r
-\r
-bp_get_condition:\r
-       call skipbl\r
-       cp 'I'\r
-       ld hl,0\r
-       ret nz\r
-       inc de\r
-       call skipbl\r
-       push de\r
-       call expr\r
-       jr c,error12\r
-       ex de,hl\r
-       pop de\r
-       push de\r
-       sbc hl,de\r
-       ld b,h\r
-       ld c,l\r
-       ld hl,(expr_p1)\r
-       push hl\r
-       add hl,bc\r
-       ld de,expr_bufe\r
-       call cp_hl_de\r
-       jr nc,error12\r
-       pop hl\r
-       ld (expr_p2),hl\r
-       pop de\r
-       ex de,hl\r
-       ldir\r
-       xor a\r
-       ld (de),a\r
-       inc de\r
-       ex de,hl\r
-       ld (expr_p1),hl\r
-       ld hl,(expr_p2)\r
-       ret\r
 \r
 ;-------------------------------------------------------------------------------\r
+; Breakpoint handling routine.\r
 \r
 bpddtz:\r
        ld (reg.l),hl\r
@@ -1812,13 +1839,13 @@ bpddtz:
        push ix\r
        push iy\r
        ld a,i\r
-       call sub_0004h\r
+       call di_or_ei\r
        ld h,a\r
        ld l,000h\r
        push hl\r
-       ld a,0f3h\r
+       ld a,0f3h               ; EI\r
        jp po,l08dfh\r
-       ld a,0fbh\r
+       ld a,0fbh               ; DI\r
 l08dfh:\r
        ld (reg.iff),a\r
        ex af,af'\r
@@ -1827,18 +1854,18 @@ l08dfh:
        push bc\r
        push de\r
        push hl\r
-       call sub_097ah\r
+       call bp_restore_mem\r
        ld a,(b_21e2_start)\r
        dec a\r
        jr z,l090bh\r
-       call inchar\r
-       jr c,l0902h\r
+       call inchar             ;Keyboard hit?\r
+       jr c,do_break           ;yes\r
        call sub_0913h\r
        and a\r
        jp z,user_go\r
        and 083h\r
        jp z,l2151h\r
-l0902h:\r
+do_break:\r
        call bp_clr_temporary\r
        call p_cpustat\r
        jp mainloop\r
@@ -1852,7 +1879,7 @@ sub_0913h:
        ld a,080h\r
        ex af,af'\r
        sub a\r
-       ld (l0941h),a\r
+       ld (bp_p_cpu_flag),a\r
        call    bpl_init\r
 \r
        ld a,(ix+000h)\r
@@ -1862,49 +1889,17 @@ sub_0913h:
        ld d,(ix+003h)\r
        ld hl,(reg.pc)\r
        call cp_hl_de\r
-       push bc\r
-       call z,sub_0942h\r
-       pop bc\r
-l0938h:\r
-\r
-       call    bpl_next\r
-       ex af,af'\r
-       ret\r
-\r
-sub_0942h:\r
+       jr nz,l0938h\r
        ex af,af'\r
        res 7,a\r
-       ex af,af'\r
-       ld e,(ix+006h)\r
-       ld d,(ix+007h)\r
-       ld a,d\r
-       or e\r
-       ld hl,0ffffh\r
-       call nz,expr\r
-       ld a,h\r
-       or l\r
-       jr z,l0969h\r
-       ld e,(ix+004h)\r
-       ld d,(ix+005h)\r
-       dec de\r
-       ld a,d\r
-       or e\r
-       jr z,l0974h\r
-       ld (ix+004h),e\r
-       ld (ix+005h),d\r
-l0969h:\r
-       bit 4,(ix+000h)\r
-       ret z\r
-       ld a,001h\r
-       ld (l0941h),a\r
-       ret\r
-l0974h:\r
-       ex af,af'\r
        or (ix+000h)\r
        ex af,af'\r
+l0938h:\r
+       call    bpl_next\r
+       ex af,af'\r
        ret\r
 \r
-sub_097ah:\r
+bp_restore_mem:\r
        call    bpl_init\r
 \r
        bit 5,(ix+000h)\r
@@ -1923,38 +1918,33 @@ l099ah:
        call    bpl_next\r
        ret\r
 \r
-sub_09a6h:\r
+bp_tst_@pc:\r
        call    bpl_init\r
 \r
        ld a,(ix+000h)\r
        and 003h\r
-       jr z,l09c0h\r
+       jr z,bp_tst_e\r
        ld e,(ix+002h)\r
        ld d,(ix+003h)\r
        ld hl,(reg.pc)\r
        call cp_hl_de\r
        ret z\r
-l09c0h:\r
-\r
+bp_tst_e:\r
        call    bpl_next\r
        sub a\r
        inc a\r
        ret\r
 \r
-sub_09cah:\r
+bp_trace_enter:\r
        call bp_get_freeslot\r
-       ld (ix+004h),001h\r
-       ld (ix+005h),000h\r
        ld (ix+002h),l\r
        ld (ix+003h),h\r
-       ld (ix+006h),000h\r
-       ld (ix+007h),000h\r
        ld a,(b_21e2_start)\r
        and a\r
        ld a,008h\r
-       jr nz,l09edh\r
+       jr nz,bp_t_e\r
        rra\r
-l09edh:\r
+bp_t_e:\r
        ld (ix+000h),a\r
        ret\r
 \r
@@ -1990,15 +1980,15 @@ l0a1dh:
 user_go:\r
        sub a\r
        ld (b_21e2_start),a\r
-       ld a,(l0941h)\r
+       ld a,(bp_p_cpu_flag)\r
        and a\r
        call nz,p_cpustat\r
-       call sub_09a6h\r
+       call bp_tst_@pc\r
        ld c,007h\r
        jr nz,l0a41h\r
        ld a,001h\r
        ld (b_21e2_start),a\r
-       call sub_1ffeh\r
+       call tc_set_bp\r
        ld c,008h\r
 l0a41h:\r
        call bp_set_to_mem\r
@@ -2020,113 +2010,12 @@ l0a41h:
        ld sp,(reg_sp)\r
        jp reg.iff\r
 \r
-;-------------------------------------------------------------------------------\r
-\r
-bp_clr_condition:\r
-       ld a,(ix+000h)\r
-       and 003h\r
-       ret nz\r
-       ld e,(ix+006h)\r
-       ld d,(ix+007h)\r
-       ld a,d\r
-       or e\r
-       ret z\r
-       push bc\r
-       ld h,d\r
-       ld l,e\r
-       sub a\r
-       ld (ix+006h),a\r
-       ld (ix+007h),a\r
-       ld bc,0ffffh\r
-       cpir\r
-l0a7dh:\r
-       push de\r
-       ld de,(expr_p1)\r
-       call cp_hl_de\r
-       pop de\r
-       jr nc,l0a93h\r
-       call sub_0a99h\r
-l0a8bh:\r
-       ld a,(hl)\r
-       ldi\r
-       and a\r
-       jr nz,l0a8bh\r
-       jr l0a7dh\r
-l0a93h:\r
-       ld (expr_p1),de\r
-       pop bc\r
-       ret\r
-\r
-sub_0a99h:\r
-       ld iy,bp_tab\r
-       push de\r
-l0a9eh:\r
-       ld e,(iy+006h)\r
-       ld d,(iy+007h)\r
-       call cp_hl_de\r
-       jr z,l0ab0h\r
-       ld de,BP_SIZE\r
-       add iy,de\r
-       jr l0a9eh\r
-l0ab0h:\r
-       pop de\r
-       ld (iy+006h),e\r
-       ld (iy+007h),d\r
-       ret\r
-\r
 ;-------------------------------------------------------------------------------\r
 ; > Y\r
 ;      examine all Y variables\r
 ; > Y[0..9]\r
 ;      examine (and substitute) an Y variable\r
 \r
-cmd_Y:\r
-       call get.decdigit\r
-       jr c,l0bc3h\r
-       inc de\r
-       push af\r
-       call assert_eol\r
-       pop af\r
-       call sub_0bdch\r
-       jp l0c15h\r
-l0bc3h:\r
-       call assert_eol\r
-       xor a\r
-l0bc7h:\r
-       push af\r
-       call sub_0bdch\r
-       call    outbl\r
-       pop af\r
-       push af\r
-       call get_y_val\r
-       call p_symbol\r
-       pop af\r
-       inc a\r
-       push af\r
-       rra\r
-       push    af\r
-       ld      c,11\r
-       call    c,p_align_@_sym\r
-       pop     af\r
-       call    nc,crlf\r
-       pop af\r
-       cp YREG_CNT\r
-       jr c,l0bc7h\r
-       ret\r
-\r
-sub_0bdch:\r
-       ld c,a\r
-       ld b,0\r
-       add a,'0'+080h\r
-       ld de,msg_Y+1\r
-       ld (de),a\r
-       dec de\r
-       ld hl,reg_Y\r
-       add hl,bc\r
-       add hl,bc\r
-       ex de,hl\r
-       ld c,003h\r
-       jp l0c33h\r
 \r
 ;-------------------------------------------------------------------------------\r
 ; > X\r
@@ -2142,25 +2031,22 @@ cmd_X:
        jp nc,p_cpustat0\r
        call assert_eol\r
        ld a,b\r
-       cp 01eh\r
+       cp 25\r
        jr z,l0c5fh\r
-       cp 01fh\r
+       cp 26\r
        jr z,l0c4fh\r
-       cp 01dh\r
-       jp z,ERROR\r
        ex de,hl\r
        ld hl,t_reg_names\r
-       call sel_dc_string\r
-l0c12h:\r
+       call pstr_sel\r
        call l0c33h\r
-l0c15h:\r
+\r
        call outbl\r
        push de\r
        push bc\r
        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
@@ -2176,7 +2062,6 @@ l0c30h:
        ret\r
 \r
 l0c33h:\r
-       call pstr\r
        call    pstr_inl\r
        dc      '='\r
        ld a,(de)\r
@@ -2187,9 +2072,7 @@ l0c33h:
        ld a,(de)\r
        dec de\r
        ld h,a\r
-       bit 1,c\r
-       jp z,out_hl\r
-       jp out.hl.@\r
+       jp out_hl\r
 \r
 l0c4fh:\r
        call p_f\r
@@ -2263,38 +2146,33 @@ sub_0caeh:
        ret\r
 \r
 t_reg_names:\r
-       DC      'BC'''\r
-       DC      'DE'''\r
-       DC      'HL'''\r
-       DC      'BC'\r
-       DC      'DE'\r
-       DC      'HL'\r
-       DC      'A'''\r
-       DC      'B'''\r
-       DC      'C'''\r
-       DC      'D'''\r
-       DC      'E'''\r
-       DC      'H'''\r
-       DC      'L'''\r
-       DC      'A'\r
-       DC      'B'\r
-       DC      'C'\r
-       DC      'D'\r
-       DC      'E'\r
-       DC      'H'\r
-       DC      'L'\r
-       DC      'IX'\r
-       DC      'IY'\r
-       DC      'SP'\r
-       DC      'PC'\r
-       DC      'X'\r
-       DC      'Y'\r
-       DC      'S'\r
-       DC      'P'\r
-       DC      'I'\r
-       DC      'IP'\r
-       DC      'F'''\r
-       DC      'F'\r
+       DC      'BC'''          ;0\r
+       DC      'DE'''          ;1\r
+       DC      'HL'''          ;2\r
+       DC      'BC'            ;3\r
+       DC      'DE'            ;4\r
+       DC      'HL'            ;5\r
+       DC      'A'''           ;6\r
+       DC      'B'''           ;7\r
+       DC      'C'''           ;8\r
+       DC      'D'''           ;9\r
+       DC      'E'''           ;10\r
+       DC      'H'''           ;11\r
+       DC      'L'''           ;12\r
+       DC      'A'             ;13\r
+       DC      'B'             ;14\r
+       DC      'C'             ;15\r
+       DC      'D'             ;16\r
+       DC      'E'             ;17\r
+       DC      'H'             ;18\r
+       DC      'L'             ;19\r
+       DC      'IX'            ;20\r
+       DC      'IY'            ;21\r
+       DC      'SP'            ;22\r
+       DC      'PC'            ;23\r
+       DC      'I'             ;24\r
+       DC      'F'''           ;25\r
+       DC      'F'             ;26\r
        DB      0\r
 \r
 b_0cfa_start:\r
@@ -2346,18 +2224,8 @@ b_0cfa_start:
        dw      reg_sp\r
        db      003h\r
        dw      reg.pc\r
-       db      003h\r
-       dw      reg.ix\r
-       db      003h\r
-       dw      reg.iy\r
-       db      003h\r
-       dw      reg_sp\r
-       db      003h\r
-       dw      reg.pc\r
        db      000h\r
        dw      reg.i\r
-       db      003h\r
-       dw      l004eh\r
        db      000h\r
        dw      reg.f2\r
        db      000h\r
@@ -2372,7 +2240,7 @@ cmd_S:
        call get_lastarg_def\r
 l0d60h:\r
        ld (last_S),hl\r
-       call out.hl.@\r
+       call out_hl\r
        call outbl\r
        ld a,(hl)\r
        call out_hex\r
@@ -2407,22 +2275,13 @@ l0d8ah:
 ; > @\r
 ;      examine (substitute) displacement register @\r
 \r
-cmd_@:\r
-       call assert_eol\r
-       ld hl,msg_@\r
-       ld de,var.@\r
-       ld c,001h\r
-       jp l0c12h\r
-\r
-msg_@:\r
-       dc      '@'\r
+;cmd_@:\r
 \r
 ;-------------------------------------------------------------------------------\r
 ; >>I [port]\r
 ;      Input a byte from port\r
 \r
 cmd_I:\r
-       ld hl,cmd_I\r
        ld (cmd_rpt),hl\r
        ld hl,(last_I)\r
        call get_lastarg_def\r
@@ -2442,7 +2301,6 @@ cmd_I:
 ;      Output a byte to a port\r
 \r
 cmd_O:\r
-       ld hl,cmd_O\r
        ld (cmd_rpt),hl\r
        ld hl,(last_O_val)\r
        call get_arg_def\r
@@ -2460,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
@@ -2472,7 +2330,7 @@ l0dedh:
        cp b\r
        jr z,l0e10h\r
        ld c,a\r
-       call out.hl.@\r
+       call out_hl\r
        call outbl\r
        ld a,b\r
        call out_hex\r
@@ -2481,34 +2339,22 @@ l0dedh:
        call out_hex\r
        call outbl\r
        ex de,hl\r
-       call out.hl.@\r
+       call out_hl\r
        ex de,hl\r
        call crlf\r
 l0e10h:\r
        pop bc\r
-       inc hl\r
        inc de\r
-       dec bc\r
-       ld a,b\r
-       or c\r
-       jr nz,l0dedh\r
+       cpi\r
+       jp pe,l0dedh\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
-; > M[V] startaddr endaddr destaddr\r
-;      Move memory [and verify]\r
+; > M startaddr endaddr destaddr\r
+;      Move memory\r
 \r
 cmd_M:\r
-       call get_char_upper\r
-       cp 'V'\r
-       jr nz,l0e1fh\r
-       inc de\r
-l0e1fh:\r
-       push af\r
-       call sub_034eh\r
-       push hl\r
-       push de\r
-       push bc\r
+       call get_arg_range_target\r
        call cp_hl_de\r
        jr nc,cmdm_up\r
        add hl,bc\r
@@ -2518,52 +2364,22 @@ l0e1fh:
        dec hl\r
        dec de\r
        lddr\r
-       db 01h          ;swallow ldir instruction (ld bc,...)\r
+       ret\r
 cmdm_up:\r
        ldir\r
-       pop bc\r
-       pop de\r
-       pop hl\r
-       pop af\r
-       jr z,l0dedh\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
 ; > H\r
 ;      display Highest load address of last filed loaded, Maximum "High"\r
 ;      off all loaded files, and Top address of available memory\r
-; > HS\r
-;      display symbol list\r
 ; > H expression\r
 ;      evaluate expression and display result in hex, decimal and other formats\r
-; > H expression expression\r
-;      display sum und difference of expressions\r
 \r
 cmd_H:\r
-       call get_char_upper\r
-       cp 'S'\r
-       jr z,p_sym_list\r
-\r
        call expr\r
        jp c,p_max_high0\r
-       call next_arg\r
-       push hl\r
-       call expr\r
-       push af\r
        call assert_eol\r
-       pop af\r
-       ex de,hl\r
-       pop hl\r
-       jr c,l0e5eh\r
-       push hl\r
-       push de\r
-       add hl,de\r
-       call l0e5eh\r
-       pop de\r
-       pop hl\r
-       and a\r
-       sbc hl,de\r
-l0e5eh:\r
        call out_hl\r
        call outbl2\r
        call out_hl_neg\r
@@ -2573,87 +2389,41 @@ l0e5eh:
        call out_hl_dec_neg\r
        call outbl4\r
        call out.bin.w\r
-       call outbl\r
+       call outbl2\r
        ld a,l\r
        call out.ascii\r
-       call    outbl2\r
-       call p_symbol\r
        jp crlf\r
 \r
-p_sym_list:\r
-       inc     de\r
-       call    assert_eol\r
-       ld      a,(symlen_cur)\r
-       add     a,7\r
-       ld      b,a\r
-       ld      c,0\r
-       ld      hl,ddtz_base+2\r
-psym_nxtsym:\r
-       ld      d,(hl)\r
-       dec     hl\r
-       ld      e,(hl)\r
-       dec     hl\r
-       ld      a,(hl)\r
-       cp      0c3h\r
-       jr      z,psym_e\r
-\r
-       call    p_goto_col\r
-       ex      de,hl\r
-       call    out_hl\r
-       call    outbl\r
-       ex      de,hl\r
-       call    p_symstr\r
-\r
-       ld      a,c\r
-       add     b\r
-       ld      c,a\r
-       ld      a,(screen_width)\r
-       sub     b\r
-       cp      c\r
-       jr      nc,psym_nxtsym\r
-\r
-       call    crlf\r
-       ld      c,0\r
-       jr      psym_nxtsym\r
-\r
-psym_e:\r
-       ld      a,c\r
-       or      a\r
-       ret     z\r
-       jp      crlf\r
-\r
-\r
-;-------------------------------------------------------------------------------\r
-; > Q[J] startaddr endaddr bytes\r
-;      Query memory for a byte string [Justified]\r
+;-------------------------------------------------------------------------------\r
+; > Q[J] startaddr endaddr bytes\r
+;      Query memory for a byte string [Justified]\r
 \r
 cmd_Q:\r
-       call get_char_upper\r
-       sub 'J'\r
-       ld (cmd_Q_jopt),a\r
-       jr nz,l0e8dh\r
-       inc de\r
-l0e8dh:\r
        call get_arg_range\r
        push bc\r
        push hl\r
        call sub_0ee6h\r
        pop hl\r
 l0e96h:\r
-       call sub_0ed7h\r
+       push    hl\r
+       push    de\r
+       push bc\r
+l0edah:\r
+       ld a,(de)\r
+       cp (hl)\r
+       jr nz,l0ee2h\r
+       inc de\r
+       inc hl\r
+       djnz l0edah\r
+l0ee2h:\r
+       pop bc\r
+       pop de\r
+       pop hl\r
        jr nz,l0eb0h\r
        push bc\r
-       push hl\r
-       ld a,(cmd_Q_jopt)\r
-       or a\r
-       jr nz,l0ea7h\r
-       ld bc,-8\r
-       add hl,bc\r
-l0ea7h:\r
        ld bc,16\r
-       and a\r
+       and a                   ;clear carry\r
        call sub_0f58h\r
-       pop hl\r
        pop bc\r
 l0eb0h:\r
        inc hl\r
@@ -2692,53 +2462,23 @@ l0ed3h:
        pop hl\r
        ret\r
 \r
-sub_0ed7h:\r
-       push    hl\r
-       push    de\r
-       push bc\r
-l0edah:\r
-       ld a,(de)\r
-       cp (hl)\r
-       jr nz,l0ee2h\r
-       inc de\r
-       inc hl\r
-       djnz l0edah\r
-l0ee2h:\r
-       pop bc\r
-       pop de\r
-       pop hl\r
-       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
        ret nz\r
        jp ERROR\r
 \r
-sub_0ef7h:\r
-       db      0e6h            ; and 037h (clear carry)\r
-sub_0ef8h:\r
+sub_0ef7h:                     ;from cmd_Q, cmd_Z\r
+       db      0e6h            ;and 037h (clear carry)\r
+sub_0ef8h:                     ;from cmd_S\r
        scf\r
 l0ef9h:\r
        push af\r
        call next_arg\r
-       cp 'W'\r
-       jr nz,l0f0eh\r
-       inc de\r
-       push hl\r
-       call sub_035dh\r
-       ex de,hl\r
-       ex (sp),hl\r
-       ld (hl),e\r
-       inc hl\r
-       ld a,d\r
-       pop de\r
-       jr l0f1ah\r
-l0f0eh:\r
        cp ''''\r
        jr z,l0f1eh\r
        push hl\r
@@ -2746,7 +2486,6 @@ l0f0eh:
        ld a,l\r
        pop hl\r
        jr c,l0f42h\r
-l0f1ah:\r
        ld (hl),a\r
        inc hl\r
        jr l0f3ah\r
@@ -2788,7 +2527,6 @@ l0f42h:
 ;      Display memory in hex and ASCII\r
 \r
 cmd_D:\r
-       ld hl,cmd_D\r
        ld (cmd_rpt),hl\r
        ld hl,(last_D)\r
        ld bc,128\r
@@ -2800,9 +2538,8 @@ sub_0f58h:
        push hl\r
        push af\r
 l0f5ch:\r
-       call out.hl.@\r
-       call z,outbl2\r
-       call outbl\r
+       call out_hl\r
+       call outbl2\r
        ld de,0\r
 l0f68h:\r
        ld a,(hl)\r
@@ -2859,246 +2596,63 @@ l0fach:
 ; > Fcommandline\r
 ;      specifiy filenames and command line\r
 \r
-cmd_F:\r
-       push de\r
-       ld hl,DMA_BUF+1\r
-       ld (hl),' '\r
-       inc hl\r
-l0fb6h:\r
-       call get_char_upper\r
-       ld (hl),a\r
-       inc hl\r
-       inc de\r
-       and a\r
-       jr nz,l0fb6h\r
-       ld a,l\r
-       sub DMA_BUF+2\r
-       ld (DMA_BUF),a\r
-       pop hl\r
-       ld de,dfcb1\r
-       call parse_filename\r
-       ld de,dfcb2\r
-       call parse_filename\r
-       ;fall thru\r
-\r
-cpy_fcb2:\r
-       ld hl,dfcb2\r
-       ld de,fcbsym\r
-       ld bc,16\r
-       ldir\r
-       ret\r
-\r
-parse_filename:\r
-       call sub_102ch\r
-       push de\r
-       push bc\r
-       ld b,(hl)\r
-       inc hl\r
-       ld a,(hl)\r
-       cp ':'\r
-       jr nz,l0fe1h\r
-       inc hl\r
-       ld a,b\r
-       sub 040h\r
-       and 01fh\r
-       jr l0fe3h\r
-l0fe1h:\r
-       dec hl\r
-       xor a\r
-l0fe3h:\r
-       ld (de),a\r
-       inc de\r
-       ld b,8\r
-       call sub_0ff2h\r
-       ld b,3\r
-       call sub_0ff2h\r
-       pop bc\r
-       pop de\r
-       ret\r
-\r
-sub_0ff2h:\r
-       call sub_1012h\r
-       jr z,l0ffeh\r
-       inc hl\r
-       ld (de),a\r
-       inc de\r
-       djnz sub_0ff2h\r
-       jr l1003h\r
-l0ffeh:\r
-       ld a,c\r
-l0fffh:\r
-       ld (de),a\r
-       inc de\r
-       djnz l0fffh\r
-l1003h:\r
-       call sub_1012h\r
-       inc hl\r
-       jr nz,l1003h\r
-       cp '*'\r
-       jr z,l1003h\r
-       cp '.'\r
-       ret z\r
-       dec hl\r
-       ret\r
-\r
-sub_1012h:\r
-       ld a,(hl)\r
-       ld c,' '\r
-       and 01fh\r
-       ret z\r
-       ld a,(hl)\r
-       cp ' '\r
-       ret z\r
-       call sub_1043h\r
-       ret z\r
-       cp '/'\r
-       ret z\r
-       cp '.'\r
-       ret z\r
-       ld c,'?'\r
-       call toupper\r
-       cp '*'\r
-       ret\r
-\r
-l102bh:\r
-       inc hl\r
-sub_102ch:\r
-       ld a,(hl)\r
-       cp '/'\r
-       jr z,l103bh\r
-       call sub_1043h\r
-       jr z,l102bh\r
-l1036h:\r
-       cp ' '\r
-       jr z,l102bh\r
-       ret\r
-\r
-l103bh:\r
-       ld a,(hl)\r
-       cp ' '+1\r
-       jr c,l1036h\r
-       inc hl\r
-       jr l103bh\r
-\r
-sub_1043h:\r
-       cp '='\r
-       ret z\r
-       cp '_'\r
-       ret z\r
-       cp ','\r
-       ret\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-setup_fcb:\r
-       push de\r
-       ld hl,12\r
-       add hl,de\r
-       xor a\r
-       ld b,21\r
-l1052h:\r
-       ld (hl),a\r
-       inc hl\r
-       djnz l1052h\r
-       ld de,DMA_BUF\r
-       ld c,BDOS_SETDMA\r
-       call ddtz_bdos\r
-       pop de\r
-       ret\r
+;cmd_F:\r
 \r
 ;-------------------------------------------------------------------------------\r
+; > R [displacement]\r
+;      Read Intel Hex File from console [add displacement]\r
 \r
-file_open:\r
-       ld (cur_fcb),de\r
-       call setup_fcb\r
-       ld c,BDOS_OPEN\r
-       call ddtz_bdos\r
-       inc a\r
-       jp z,ERROR\r
-       ld a,080h\r
-       ld (cmdR_rindex),a\r
-       ret\r
-\r
-read_byte:\r
-       ld a,(cmdR_rindex)\r
-       cp 080h\r
-       jr nz,l1111h\r
-       call read_sector\r
-       ld a,01ah\r
-       ret z\r
-       sub a\r
-l1111h:\r
-       inc a\r
-       ld (cmdR_rindex),a\r
+cmd_R:\r
+       ld hl,0\r
+       call get_lastarg_def    ;get offset from command line\r
        push hl\r
-       add a,07fh\r
+       ld hl,0\r
+       ld (high_load),hl\r
+w_recstart:\r
+       call i.getchar\r
+       jr z,rdhex_done\r
+       cp ':'\r
+       jr nz,w_recstart\r
+       ld c,0                  ;init checksum\r
+       call i.gethexbyte       ;record len\r
+       ld b,a\r
+       call i.gethexbyte       ;address high\r
+       ld h,a\r
+       call i.gethexbyte       ;address low\r
        ld l,a\r
-       ld h,000h\r
-       ld a,(hl)\r
-       pop hl\r
-       cp 01ah\r
-       ret\r
-\r
-read_sector:\r
-       push hl\r
+       call i.gethexbyte       ;record type (ignored)\r
+       ld a,b\r
+       and a                   ;record len == 0?\r
+       jr z,rdhex_done\r
+l16c6h:\r
+       call i.gethexbyte\r
+       pop de                  ;offset\r
        push de\r
-       push bc\r
-       ld de,(cur_fcb)\r
-       ld c,BDOS_READ\r
-       call ddtz_bdos\r
-       sub a,1\r
-       jr z,l1132h\r
-       jr nc,error2\r
-l1132h:\r
-       pop bc\r
-       pop de\r
+       push hl\r
+       add hl,de\r
+       call i.storebyte\r
        pop hl\r
-       ret\r
-\r
-cmdR_storebyte:\r
-       push af\r
-       push de\r
-       ld de,TPA\r
-       call cp_hl_de\r
-       jr c,error2\r
-       ld de,(BDOS+1)\r
-       call cp_hl_de\r
-       jr nc,error2\r
-       ld de,(high_load)\r
-       call cp_hl_de\r
-       jr c,l1157h\r
-       ld (high_load),hl\r
-l1157h:\r
-       ld de,(max_load)\r
-       call cp_hl_de\r
-       jr c,l1163h\r
-       ld (max_load),hl\r
-l1163h:\r
-       pop de\r
-       pop af\r
-       ld (hl),a\r
-       ret\r
-\r
-strncmp:\r
-       ld a,(de)\r
-       cp (hl)\r
-       inc de\r
        inc hl\r
-       ret nz\r
-       djnz strncmp\r
-       ret\r
+       djnz l16c6h             ;repeat for record len\r
+       call i.gethexbyte       ;checksum\r
+       ld a,c\r
+       and a\r
+       jr nz,error2            ;exit if checksum error\r
+       jr w_recstart           ;next record\r
 \r
-str_hex:\r
-       db      'HEX'\r
+rdhex_done:\r
+       pop hl\r
+       call i.gethexbyte\r
+       jp p_max_high\r
 \r
-read_hexchar:\r
-       call read_hexdigit\r
+i.gethexbyte:\r
+       call sub_16f6h\r
        rlca\r
        rlca\r
        rlca\r
        rlca\r
        ld d,a\r
-       call read_hexdigit\r
+       call sub_16f6h\r
        add a,d\r
        ld d,a\r
        add a,c\r
@@ -3106,1525 +2660,81 @@ read_hexchar:
        ld a,d\r
        ret\r
 \r
-read_hexdigit:\r
-       call read_byte\r
+sub_16f6h:\r
+       call i.getchar\r
        jr z,error2\r
-hex_digit_v:\r
        call hex_digit\r
        ret nc\r
 error2:\r
        jp ERROR\r
 \r
-read_hexbyte:\r
-       call    read_byte\r
-read_hexbyte0:\r
-       push    bc\r
-       call    hex_digit_v\r
-       rlca\r
-       rlca\r
-       rlca\r
-       rlca\r
-       ld      c,a\r
-       call    read_byte\r
-       call    hex_digit_v\r
-       or      c\r
-       pop     bc\r
+i.getchar:\r
+       call incharw\r
+       cp 01ah\r
        ret\r
 \r
-;-------------------------------------------------------------------------------\r
-; > R [displacement]\r
-;      Read a binary or hex file and or symbol file [add displacement]\r
-\r
-cmd_R:\r
-       ld hl,0\r
-       call get_lastarg_def\r
-read_file:\r
-       ld de,dfcb1+1\r
-       ld a,(de)\r
-       cp '?'\r
-       jr z,read_symfile\r
-       dec de\r
-       push hl\r
-       ld hl,0\r
-       ld (high_load),hl\r
-       call file_open\r
-       ld hl,dfcb1+9\r
-       ld de,str_hex\r
-       ld b,3\r
-       call strncmp\r
-       pop hl\r
-       jr z,read_hexfile\r
-       ld de,TPA\r
-       push hl\r
-       add hl,de\r
-l108eh:\r
-       call read_sector\r
-       jr nz,read_file_nxt\r
-       pop hl\r
-       jr read_symfile\r
-\r
-read_file_nxt:\r
-       ld de,DMA_BUF\r
-       ld b,080h\r
-l109ah:\r
-       ld a,(de)\r
-       call cmdR_storebyte\r
-       inc de\r
-       inc hl\r
-       djnz l109ah\r
-       jr l108eh\r
-\r
-read_hexfile:\r
-       push hl\r
-l10aeh:\r
-       call read_byte          ; RECORD MARK\r
-       jr z,rdhex_done\r
-       cp ':'\r
-       jr nz,l10aeh\r
-       ld c,0\r
-       call read_hexchar       ; RECLEN\r
-       ld b,a\r
-       call read_hexchar       ; LOAD ADDR H\r
-       ld h,a\r
-       call read_hexchar       ; LOAD ADDR L\r
-       ld l,a\r
-       ld a,b\r
-       and a\r
-       jr z,rdhex_done\r
-       call read_hexchar       ; RECTYP\r
-l10cch:\r
-       call read_hexchar       ; DATA\r
-       pop de\r
+i.storebyte:\r
+       push af\r
        push de\r
-       push hl\r
-       add hl,de\r
-       call cmdR_storebyte\r
-       pop hl\r
-       inc hl\r
-       djnz l10cch\r
-       call read_hexchar       ; CHKSUM\r
-       ld a,c\r
-       and a\r
-       jr nz,error3\r
-       jr l10aeh\r
-rdhex_done:\r
-       pop hl\r
-       jr read_symfile\r
-\r
-read_symfile:\r
-       ld de,fcbsym+1\r
-       ld a,(de)\r
-       cp ' '\r
-       jp z,p_max_high\r
-\r
-       push    hl              ; offset\r
-       call pstr_inl\r
-       db      'SYMBOLS',CR,LF+80h\r
+       ld de,ddtz_base         ;don't load over ddtz\r
+       call cp_hl_de\r
+       jr nc,ist_1\r
 \r
-       dec     de\r
-       call    file_open\r
-       ld      a,(symattrib)\r
-       ld      c,a\r
-rs_1:\r
-       call    read_byte\r
-rs_2:\r
-       pop     de              ; offset\r
-       cp      1ah\r
-       jp      z,p_max_high\r
-       push    de              ; offset\r
-       cp      '!'\r
-       jr      c,rs_1\r
-       call    read_hexbyte0   ; symval H\r
-       ld      h,a\r
-       call    read_hexbyte    ; symval L\r
-       ld      l,a\r
-       add     hl,de\r
-       call    read_byte\r
-       cp      ' '\r
-       jr      z,rs_4\r
-rs_3:  call    read_byte\r
-       cp      ' '\r
-       jr      nc,rs_3\r
-       jr      rs_2\r
-\r
-rs_4:\r
-       push    hl              ; symval\r
-       ld      hl,(BDOS+1)     ;\r
-       ld      b,0             ; setup symlen\r
-rs_5:\r
-       dec     hl              ;\r
-       call    read_byte       ; next char of symbol name\r
-       call    test_sym_char   ; valid char?\r
-       jr      nz,rs_6\r
-       bit     SYMCASE_CONV,c\r
-       jr      z,rs_51\r
-       call    toupper\r
-       bit     SYMCASE_LOWER,c\r
-       call    nz,tolower\r
-rs_51:\r
-       ld      (hl),a          ;\r
-       inc     b               ; symlen++\r
-       ld      a,(symlen_max)  ;\r
-       cp      b               ;\r
-       jr      nc,rs_5         ;\r
-error3:\r
-       jp      ERROR           ;\r
-\r
-rs_6:\r
-       call    test_symterm_ch\r
-       jr      nz,error3\r
-\r
-       push    bc              ; symlen\r
-       ex      de,hl           ;\r
-       ld      hl,(BDOS+1)     ;\r
-       inc     hl              ;\r
-       ld      c,(hl)          ;\r
-       inc     hl              ;\r
-       ld      b,(hl)          ;\r
-       ex      de,hl\r
-       ld      (hl),b          ;\r
-       dec     hl              ;\r
-       ld      (hl),c          ;\r
-       dec     hl              ;\r
-       ld      (hl),0c3h       ;\r
-\r
-       ld      de,(max_load)   ;\r
-       call    cp_hl_de        ;\r
-       jr      c,error3        ;\r
-       ld      de,(reg_sp)     ;\r
-       call    cp_hl_de        ;\r
-       jr      nc,rs_61        ;\r
-       ld      (reg_sp),hl     ;\r
-rs_61:\r
-       ld      de,(BDOS+1)     ;\r
-       ld      (BDOS+1),hl     ;\r
-       ex      de,hl           ;\r
-       pop     bc              ; symlen\r
-       ld      (hl),b          ;\r
-       inc     hl              ;\r
-       pop     de              ; symval\r
-       ld      (hl),e          ;\r
-       inc     hl              ;\r
-       ld      (hl),d          ;\r
-       ld      a,b             ;\r
-       ld      hl,symlen_cur   ;\r
-       cp      (hl)            ; new max?\r
-       jr      c,$+3           ;\r
-       ld      (hl),a          ;\r
-       jp      rs_1            ;\r
-\r
-\r
-; test for valid character for symbols\r
-; return z if valid\r
-\r
-test_sym_char:\r
-       cp      '$'\r
-       ret     z\r
-       cp      '%'\r
-       ret     z\r
-       cp      '.'\r
-       ret     z\r
-       cp      '_'\r
-       ret     z\r
-       call    test_alphanum\r
-       ret     c               ; cy == 1 --> z == 0\r
-       cp      a               ; return z\r
-       ret\r
-\r
-\r
-; check if char is in [0..9,?,@,A..Z,a..z]\r
-; return cy if invalid\r
-; return nc if valid alfanumeric char\r
-\r
-test_alphanum:\r
-       cp      'z'\r
-       ret     z\r
-       ccf\r
-       ret     c\r
-       cp      'a'\r
-       ret     nc\r
-       cp      'Z'\r
-       ret     z\r
-       ccf\r
-       ret     c\r
-       cp      '?'\r
-       ret     nc\r
-test_numeral:\r
-       cp      '9'\r
-       ret     z\r
-       ccf\r
-       ret     c\r
-       cp      '0'\r
-       ret\r
-\r
-test_symterm_ch:\r
-       cp      CR\r
-       ret     z\r
-       cp      LF\r
-       ret     z\r
-test_whitespace:\r
-       cp      ' '\r
-       ret     z\r
-       cp      TAB\r
-       ret\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-p_max_high0:\r
-       call assert_eol\r
-p_max_high:\r
-       call pstr_inl\r
-       DC      'High = '\r
-       ld hl,(high_load)\r
-       call out_hl\r
-       call pstr_inl\r
-       DC      '  Max = '\r
-       ld hl,(max_load)\r
-       call out_hl\r
-       call pstr_inl\r
-       DC      '  Top = '\r
-       ld hl,(BDOS+1)\r
-       call out_hl\r
-       jp crlf\r
-\r
-;-------------------------------------------------------------------------------\r
-; > Wstartaddr endaddr\r
-;      Write a file to disk\r
-\r
-cmd_W:\r
-       call get_arg_range\r
-       call assert_eol\r
-       push hl\r
-       ld a,c\r
-       add a,07fh\r
-       jr nc,l11adh\r
-       inc b\r
-l11adh:\r
-       and 080h\r
-       ld c,a\r
-       push bc\r
-       ld a,(dfcb1+1)\r
-       cp ' '\r
-       jr z,error4\r
-       ld de,dfcb1\r
-       call setup_fcb\r
-       push de\r
-       ld c,BDOS_DELETE\r
-       call ddtz_bdos\r
-       pop de\r
-       ld c,BDOS_CREATE\r
-       call ddtz_bdos\r
-       inc a\r
-       jr z,error4\r
-       pop bc\r
-       pop hl\r
-l11cch:\r
-       ld a,b\r
-       or c\r
-       jr z,close_file\r
-       push bc\r
-       ld de,080h              ; DMA_BUF\r
-       ld b,d\r
-       ld c,e\r
-       ldir\r
-       call write_sector\r
-       ex (sp),hl\r
-       ld bc,0ff80h\r
-       add hl,bc\r
-       ex (sp),hl\r
-       pop bc\r
-       jr l11cch\r
-\r
-write_sector:\r
-       push hl\r
-       ld de,dfcb1\r
-       ld c,BDOS_WRITE\r
-       call ddtz_bdos\r
-       pop hl\r
-       and a\r
-       ret z\r
-       call close_file\r
-error4:\r
-       jp ERROR\r
-\r
-close_file:\r
-       ld de,dfcb1\r
-       ld c,BDOS_CLOSE\r
-       jp ddtz_bdos\r
-\r
-;-------------------------------------------------------------------------------\r
-; > A [startaddr]\r
-;      Assemble Zilog Z180 mnemonics\r
-\r
-cmd_A:\r
-       ld hl,(last_A)\r
-       call get_lastarg_def\r
-       ld (last_A),hl\r
-       ld (cmd_A_prev),hl\r
-       ld hl,cmda_restart\r
-       ld (error_func),hl\r
-       ld (l1262h),sp\r
-cmda_loop:\r
-       ld hl,(last_A)\r
-       ld (var.$),hl\r
-       push hl\r
-       call p_disas_line\r
-       ld c,19\r
-       call p_align_@_sym\r
-       ld c,b\r
-       push bc\r
-       call get_line\r
-       pop bc\r
-       pop hl\r
-       call skipbl\r
-       cp '.'\r
-       ret z\r
-       cp '-'\r
-       jr nz,l124bh\r
-       ld hl,(cmd_A_prev)\r
-       jr cmda_lpend\r
-l124bh:\r
-       push hl\r
-       pop iy\r
-       push hl\r
-       and a\r
-       call nz,asemble_line\r
-       ld b,0\r
-       pop hl\r
-       ld (cmd_A_prev),hl\r
-       add hl,bc\r
-cmda_lpend:\r
-       ld (last_A),hl\r
-       jr cmda_loop\r
-\r
-cmda_restart:\r
-       call p_msg_error\r
-       ld sp,(l1262h)\r
-       jr cmda_loop\r
-\r
-asemble_line:\r
-       call skipbl\r
-       ld hl,t_MNEMONICS\r
-       call sub_030ah\r
-       jr nc,error4\r
-       call skipbl\r
-       push de\r
-       ld a,b\r
-       add a,b\r
-       add a,b\r
-       ld hl,b_1289_start\r
-       call add_hl_a\r
-       ld e,(hl)\r
-       inc hl\r
-       ld d,(hl)\r
-       inc hl\r
-       ld b,(hl)\r
-       ex de,hl\r
-       pop de\r
-\r
-CALL_HL:\r
-       jp (hl)\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-b_1289_start:\r
-       dw      as.ADC_SBC              ;ADC\r
-       db      088h                    ;\r
-       dw      as.ADD                  ;ADD\r
-       db      080h                    ;\r
-       dw      as.AND_CP_OR_SUB_XOR    ;AND\r
-       db      0a0h                    ;\r
-       dw      as.BITOP                ;BIT\r
-       db      040h                    ;\r
-       dw      as.CALL                 ;CALL\r
-       db      0c4h                    ;\r
-       dw      as.opc.noarg            ;CCF\r
-       db      03fh                    ;\r
-       dw      as.AND_CP_OR_SUB_XOR    ;CP\r
-       db      0b8h                    ;\r
-       dw      gen.opc.ED2             ;CPD\r
-       db      0a9h                    ;\r
-       dw      gen.opc.ED2             ;CPDR\r
-       db      0b9h                    ;\r
-       dw      gen.opc.ED2             ;CPI\r
-       db      0a1h                    ;\r
-       dw      gen.opc.ED2             ;CPIR\r
-       db      0b1h                    ;\r
-       dw      as.opc.noarg            ;CPL\r
-       db      02fh                    ;\r
-       dw      as.opc.noarg            ;DAA\r
-       db      027h                    ;\r
-       dw      as.DEC_INC              ;DEC\r
-       db      005h                    ;\r
-       dw      as.opc.noarg            ;DI\r
-       db      0f3h                    ;\r
-       dw      as.DJNZ                 ;DJNZ\r
-       db      010h                    ;\r
-       dw      as.opc.noarg            ;EI\r
-       db      0fbh                    ;\r
-       dw      as.EX                   ;EX\r
-       db      0e3h                    ;\r
-       dw      as.opc.noarg            ;EXX\r
-       db      0d9h                    ;\r
-       dw      as.opc.noarg            ;HALT\r
-       db      076h                    ;\r
-       dw      as.IM                   ;IM\r
-       db      046h                    ;\r
-       dw      as.IN                   ;IN\r
-       db      040h                    ;\r
-       dw      as.DEC_INC              ;INC\r
-       db      004h                    ;\r
-       dw      gen.opc.ED2             ;IND\r
-       db      0aah                    ;\r
-       dw      gen.opc.ED2             ;INDR\r
-       db      0bah                    ;\r
-       dw      gen.opc.ED2             ;INI\r
-       db      0a2h                    ;\r
-       dw      gen.opc.ED2             ;INIR\r
-       db      0b2h                    ;\r
-       dw      as.JP                   ;JP\r
-       db      0c2h                    ;\r
-       dw      as.JR                   ;JR\r
-       db      020h                    ;\r
-       dw      as.LD                   ;LD\r
-       db      040h                    ;\r
-       dw      gen.opc.ED2             ;LDD\r
-       db      0a8h                    ;\r
-       dw      gen.opc.ED2             ;LDDR\r
-       db      0b8h                    ;\r
-       dw      gen.opc.ED2             ;LDI\r
-       db      0a0h                    ;\r
-       dw      gen.opc.ED2             ;LDIR\r
-       db      0b0h                    ;\r
-       dw      gen.opc.ED2             ;NEG\r
-       db      044h                    ;\r
-       dw      as.opc.noarg            ;NOP\r
-       db      000h                    ;\r
-       dw      as.AND_CP_OR_SUB_XOR    ;OR\r
-       db      0b0h                    ;\r
-       dw      gen.opc.ED2             ;OTDR\r
-       db      0bbh                    ;\r
-       dw      gen.opc.ED2             ;OTIR\r
-       db      0b3h                    ;\r
-       dw      as.OUT                  ;OUT\r
-       db      041h                    ;\r
-       dw      gen.opc.ED2             ;OUTD\r
-       db      0abh                    ;\r
-       dw      gen.opc.ED2             ;OUTI\r
-       db      0a3h                    ;\r
-       dw      as.POP_PUSH             ;POP\r
-       db      0c1h                    ;\r
-       dw      as.POP_PUSH             ;PUSH\r
-       db      0c5h                    ;\r
-       dw      as.BITOP                ;RES\r
-       db      080h                    ;\r
-       dw      as.RET                  ;RET\r
-       db      0c0h                    ;\r
-       dw      gen.opc.ED2             ;RETI\r
-       db      04dh                    ;\r
-       dw      gen.opc.ED2             ;RETN\r
-       db      045h                    ;\r
-       dw      as.SHIFTOP              ;RL\r
-       db      010h                    ;\r
-       dw      as.opc.noarg            ;RLA\r
-       db      017h                    ;\r
-       dw      as.SHIFTOP              ;RLC\r
-       db      000h                    ;\r
-       dw      as.opc.noarg            ;RLCA\r
-       db      007h                    ;\r
-       dw      gen.opc.ED2             ;RLD\r
-       db      06fh                    ;\r
-       dw      as.SHIFTOP              ;RR\r
-       db      018h                    ;\r
-       dw      as.opc.noarg            ;RRA\r
-       db      01fh                    ;\r
-       dw      as.SHIFTOP              ;RRC\r
-       db      008h                    ;\r
-       dw      as.opc.noarg            ;RRCA\r
-       db      00fh                    ;\r
-       dw      gen.opc.ED2             ;RRD\r
-       db      067h                    ;\r
-       dw      as.RST                  ;RST\r
-       db      0c7h                    ;\r
-       dw      as.ADC_SBC              ;SBC\r
-       db      098h                    ;\r
-       dw      as.opc.noarg            ;SCF\r
-       db      037h                    ;\r
-       dw      as.BITOP                ;SET\r
-       db      0c0h                    ;\r
-       dw      as.SHIFTOP              ;SLA\r
-       db      020h                    ;\r
-       dw      as.SHIFTOP              ;SRA\r
-       db      028h                    ;\r
-       dw      as.SHIFTOP              ;SRL\r
-       db      038h                    ;\r
-       dw      as.AND_CP_OR_SUB_XOR    ;SUB\r
-       db      090h                    ;\r
-       dw      as.AND_CP_OR_SUB_XOR    ;XOR\r
-       db      0a8h                    ;\r
-\r
-       dw      as.IN0                  ;IN0\r
-       db      000h                    ;\r
-       dw      as.MLT                  ;MLT\r
-       db      04ch                    ;\r
-       dw      gen.opc.ED2             ;OTDM\r
-       db      08bh                    ;\r
-       dw      gen.opc.ED2             ;OTDMR\r
-       db      09bh                    ;\r
-       dw      gen.opc.ED2             ;OTIM\r
-       db      083h                    ;\r
-       dw      gen.opc.ED2             ;OTIMR\r
-       db      093h                    ;\r
-       dw      as.OUTO                 ;OUT0\r
-       db      001h                    ;\r
-       dw      gen.opc.ED2             ;SLP\r
-       db      076h                    ;\r
-       dw      as.TST                  ;TST\r
-       db      004h                    ;\r
-       dw      as.TSTIO                ;TSTIO\r
-       db      074h                    ;\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-as.TST:\r
-       call arg.r_HL_A         ;\r
-       jr nc,as.tst_0\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,b\r
-       ld b,a\r
-       jp gen.opc.ED2\r
-as.tst_0:\r
-       ld b,064h\r
-as.TSTIO:\r
-       call arg.imm_8bit       ;\r
-       jr as.store_io0\r
-\r
-as.IN0:\r
-       call arg.r_HL_A         ;\r
-       jr nc,error5\r
-       cp 006h\r
-       jr z,error5\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,b\r
-       ld b,a\r
-       call assert_comma       ;\r
-       call arg.addr_8bit      ;\r
-       jr as.store_io0\r
-\r
-as.OUTO:\r
-       call arg.addr_8bit      ;\r
-       call assert_comma       ;\r
-       call arg.r_HL_A         ;\r
-       jr nc,error5\r
-       cp 006h\r
-       jr z,error5\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,b\r
-       ld b,a\r
-\r
-as.store_io0:\r
-       call assert_eol\r
-       ld (iy+000h),0edh\r
-       ld (iy+001h),b\r
-       ld (iy+002h),l\r
-       ld c,003h\r
-       ret\r
-\r
-as.MLT:\r
-       call arg.ww             ;\r
-       jr nc,error5\r
-       add a,b\r
-       ld b,a\r
-       jp gen.opc.ED2\r
-\r
-error5:\r
-       jp ERROR\r
-\r
-as.LD:\r
-       call arg.r_HL_A\r
-       jr c,l13d4h\r
-       call arg.IDX_displcmnt\r
-       jp c,l1471h\r
-       call arg.ww\r
-       jp c,l149ch\r
-       call arg.IX_IY\r
-       jp c,l14f5h\r
-       call get_char_upper\r
-       cp 'I'\r
-       jp z,l1511h\r
-       cp 'R'\r
-       jp z,l1519h\r
-       cp '('\r
-       jr nz,error5\r
-       inc de\r
-       call arg.ww\r
-       jp c,l1528h\r
-       call test_expr\r
-       call test_paren_close\r
-       call assert_comma\r
-       call arg.ww\r
-       jr c,l13c2h\r
-       call arg.IX_IY\r
-       jr nc,l13aah\r
-       ld b,022h\r
-l1395h:\r
-       call assert_eol\r
-       ld a,(prefix_ixiy)\r
-l139bh:\r
-       ld (iy+000h),a\r
-       ld (iy+001h),b\r
-       ld (iy+002h),l\r
-       ld (iy+003h),h\r
-       ld c,004h\r
-       ret\r
-\r
-l13aah:\r
-       call get_char_upper\r
-       cp 'A'\r
-       jr nz,error5\r
-       inc de\r
-       ld b,032h\r
-\r
-as.store_3:\r
-       call assert_eol\r
-       ld (iy+000h),b\r
-       ld (iy+001h),l\r
-       ld (iy+002h),h\r
-       ld c,003h\r
-       ret\r
-\r
-l13c2h:\r
-       cp 020h\r
-       jr z,l13d0h\r
-       add a,043h\r
-       ld b,a\r
-l13c9h:\r
-       call assert_eol\r
-       ld a,0edh\r
-       jr l139bh\r
-l13d0h:\r
-       ld b,022h\r
-       jr as.store_3\r
-\r
-l13d4h:\r
-       ld b,a\r
-       call assert_comma\r
-       call arg.r_HL_A\r
-       jr nc,l13f0h\r
-       push af\r
-       ld a,b\r
-       rlca\r
-       rlca\r
-       rlca\r
-       ld b,a\r
-       pop af\r
-       add a,b\r
-       add a,040h\r
-       cp 076h\r
-       jr z,error60\r
-l13ech:\r
-       ld b,a\r
-       jp as.opc.noarg\r
-\r
-l13f0h:\r
-       call arg.IDX_displcmnt\r
-       jr nc,l1413h\r
-       ld a,b\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,046h\r
-       cp 076h\r
-       jr z,error60\r
-\r
-l1400h:\r
-       ld b,a\r
-       call assert_eol\r
-       ld (iy+001h),b\r
-       ld (iy+002h),c\r
-       ld a,(prefix_ixiy)\r
-       ld (iy+000h),a\r
-       ld c,003h\r
-       ret\r
-\r
-l1413h:\r
-       call get_char_upper\r
-       cp 'I'\r
-       jr z,l1426h\r
-       cp 'R'\r
-       jr nz,l1432h\r
-       ld a,b\r
-       cp 007h\r
-       jr nz,error60\r
-       ld b,05fh\r
-       jr l142eh\r
-\r
-l1426h:\r
-       ld a,b\r
-       cp 007h\r
-       jr nz,error60\r
-       ld b,057h\r
-l142eh:\r
-       inc de\r
-       jp gen.opc.ED2\r
-l1432h:\r
-       cp '('\r
-       jr z,l144ch\r
-       call arg.imm_8bit\r
-       ld a,b\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,006h\r
-l143fh:\r
-       ld b,a\r
-as.store_2:\r
-       call assert_eol\r
-       ld (iy+000h),b\r
-       ld (iy+001h),l\r
-       ld c,002h\r
-       ret\r
-l144ch:\r
-       inc de\r
-       ld a,b\r
-       cp 007h\r
-       jr nz,error60\r
-       call arg.ww\r
-       jr nc,l1466h\r
-       cp 030h\r
-       jr nc,error60\r
-       add a,00ah\r
-       ld b,a\r
-       call test_paren_close\r
-       jp as.opc.noarg\r
-\r
-error60:\r
-       jp error\r
-\r
-l1466h:\r
-       call test_expr\r
-       call test_paren_close\r
-       ld b,03ah\r
-       jp as.store_3\r
-\r
-l1471h:\r
-       call assert_comma\r
-       call arg.r_HL_A\r
-       jr nc,l1483h\r
-       cp 006h\r
-       jr z,error60\r
-       add a,070h\r
-       jp l1400h\r
-\r
-l1483h:\r
-       call arg.imm_8bit\r
-       call assert_eol\r
-       ld a,(prefix_ixiy)\r
-       ld (iy+000h),a\r
-       ld (iy+001h),036h\r
-       ld (iy+002h),c\r
-       ld (iy+003h),l\r
-       ld c,004h\r
-       ret\r
-l149ch:\r
-       ld b,a\r
-       call assert_comma\r
-       ld hl,t_HL.AF\r
-       call sub_0318h\r
-       jr c,l14c3h\r
-       call arg.IX_IY\r
-       jr nc,l14cch\r
-       ld a,b\r
-       cp 030h\r
-       jr nz,error6\r
-       ld b,0f9h\r
-l14b4h:\r
-       call assert_eol\r
-       ld a,(prefix_ixiy)\r
-       ld (iy+000h),a\r
-       ld (iy+001h),b\r
-       ld c,002h\r
-       ret\r
-\r
-l14c3h:\r
-       ld a,b\r
-       cp 030h\r
-       jr nz,error6\r
-       ld b,0f9h\r
-       jr as.opc.noarg ;14ca\r
-\r
-l14cch:\r
-       call get_char_upper\r
-       cp '('\r
-       jr nz,l14e8h\r
-       inc de\r
-       call test_expr\r
-       call test_paren_close\r
-       ld a,b\r
-       cp 020h\r
-       jr z,l14e3h\r
-       add a,04bh\r
-       ld b,a\r
-       jp l13c9h\r
-\r
-l14e3h:\r
-       ld b,02ah\r
-       jp as.store_3\r
-\r
-l14e8h:\r
-       call test_expr\r
-       call assert_eol\r
-       ld a,001h\r
-       add a,b\r
-       ld b,a\r
-       jp as.store_3\r
-l14f5h:\r
-       call assert_comma\r
-       call get_char_upper\r
-       cp '('\r
-       jr nz,l1509h\r
-       inc de\r
-       call test_expr\r
-       call test_paren_close\r
-       ld b,02ah\r
-       jp l1395h\r
-\r
-l1509h:\r
-       call test_expr\r
-       ld b,021h\r
-       jp l1395h\r
-\r
-l1511h:\r
-       inc de\r
-       call assert_comma\r
-       ld b,047h\r
-       jr l151fh\r
-\r
-l1519h:\r
-       inc de\r
-       call assert_comma\r
-       ld b,04fh\r
-l151fh:\r
-       call get_char_upper\r
-       inc de\r
-       cp 'A'\r
-       jr z,gen.opc.ED2\r
-error6:\r
-       jp ERROR\r
-\r
-l1528h:\r
-       cp 020h\r
-       jr nc,error6\r
-       add a,002h\r
-       ld b,a\r
-       call test_paren_close\r
-       call assert_comma\r
-       call get_char_upper\r
-       cp 'A'\r
-       jr nz,error6\r
-       inc de\r
-as.opc.noarg:\r
-       call assert_eol\r
-       ld (iy+000h),b\r
-       ld c,001h\r
-       ret\r
-\r
-gen.opc.ED2:\r
-       call assert_eol\r
-       ld (iy+000h),0edh\r
-       ld (iy+001h),b\r
-       ld c,002h\r
-       ret\r
-\r
-as.ADC_SBC:\r
-       ld hl,t_HL.AF\r
-       call sub_0318h\r
-       jr nc,as.AND_CP_OR_SUB_XOR\r
-       call assert_comma\r
-       call arg.ww\r
-       jr nc,error6\r
-       push af\r
-       ld a,b\r
-       cp 088h\r
-       ld b,04ah\r
-       jr z,l156ch\r
-       ld b,042h\r
-l156ch:\r
-       pop af\r
-       add a,b\r
-l156eh:\r
-       ld b,a\r
-       jr gen.opc.ED2\r
-\r
-as.ADD:\r
-       ld hl,t_HL.AF\r
-       call sub_0318h\r
-       jr c,l159ah\r
-       call arg.IX_IY\r
-       jr nc,as.AND_CP_OR_SUB_XOR\r
-       call assert_comma\r
-       ld hl,t_BC.DE.IX.SP\r
-       ld a,(prefix_ixiy)\r
-       cp 0fdh\r
-       jr nz,l158eh\r
-       ld hl,t_BC.DE.IY.SP\r
-l158eh:\r
-       call arg.reg_16bit\r
-       jr nc,error6\r
-       add a,009h\r
-l1596h:\r
-       ld b,a\r
-       jp l14b4h\r
-l159ah:\r
-       call assert_comma\r
-       call arg.ww\r
-error61nc:\r
-       jr nc,error6\r
-       add a,009h\r
-       jp l13ech\r
-as.AND_CP_OR_SUB_XOR:\r
-       call get_char_upper\r
-       cp 'A'\r
-       jr nz,l15b8h\r
-       push de\r
-       inc de\r
-       call next_arg\r
-       jr z,l15b7h\r
-       pop de\r
-       jr l15b8h\r
-l15b7h:\r
-       pop af\r
-l15b8h:\r
-       call arg.r_HL_A\r
-       jr c,l15cbh\r
-       call arg.IDX_displcmnt\r
-       jr c,l15cfh\r
-       call arg.imm_8bit\r
-       ld a,b\r
-       add a,046h\r
-       jp l143fh\r
-l15cbh:\r
-       add a,b\r
-       jp l13ech\r
-l15cfh:\r
-       ld a,b\r
-       add a,006h\r
-       jp l1400h\r
-\r
-as.SHIFTOP:\r
-       call arg.r_HL_A\r
-       jr c,l15fah\r
-       call arg.IDX_displcmnt\r
-       jr nc,error61nc\r
-       ld a,b\r
-       add a,006h\r
-       ld b,a\r
-l15e4h:\r
-       call assert_eol\r
-       ld a,(prefix_ixiy)\r
-       ld (iy+000h),a\r
-       ld (iy+001h),0cbh\r
-       ld (iy+002h),c\r
-       ld (iy+003h),b\r
-       ld c,004h\r
-       ret\r
-\r
-l15fah:\r
-       add a,b\r
-l15fbh:\r
-       ld b,a\r
-       call assert_eol\r
-       ld (iy+001h),b\r
-       ld (iy+000h),0cbh\r
-       ld c,002h\r
-       ret\r
-\r
-as.BITOP:\r
-       call arg.bit\r
-       call assert_comma\r
-       call arg.r_HL_A\r
-       jr c,l1624h\r
-       call arg.IDX_displcmnt\r
-       jr nc,error61nc\r
-       ld a,l\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,006h\r
-       add a,b\r
-       ld b,a\r
-       jr l15e4h\r
-l1624h:\r
-       add a,b\r
-       ld b,a\r
-       ld a,l\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,b\r
-       jr l15fbh\r
-\r
-as.CALL:\r
-       push de\r
-       call arg.cc_ZCPS\r
-       jr nc,l163ch\r
-       add a,b\r
-       ld b,a\r
-       call next_arg\r
-       jr z,l163eh\r
-       pop de\r
-       push de\r
-l163ch:\r
-       ld b,0cdh\r
-l163eh:\r
-       pop af\r
-       call test_expr\r
-       jp as.store_3\r
-\r
-as.RET:\r
-       call arg.cc_ZCPS\r
-       jr nc,l164eh\r
-       add a,b\r
-       ld b,a\r
-       jr l1650h\r
-l164eh:\r
-       ld b,0c9h\r
-l1650h:\r
-       jp as.opc.noarg\r
-\r
-as.JP:\r
-       push de\r
-       call arg.cc_ZCPS\r
-       jr c,l1666h\r
-l1659h:\r
-       pop de\r
-       ld hl,l168ch\r
-       call sub_030ah\r
-       jr c,l1674h\r
-       ld b,0c3h\r
-       jr l166eh\r
-\r
-l1666h:\r
-       add a,b\r
-       ld b,a\r
-       call next_arg\r
-       jr nz,l1659h\r
-       pop af\r
-l166eh:\r
-       call test_expr\r
-       jp as.store_3\r
-l1674h:\r
-       call assert_eol\r
-       ld a,b\r
-       and a\r
-       jr nz,l1680h\r
-       ld b,0e9h\r
-       jp as.opc.noarg\r
-l1680h:\r
-       ld b,0ddh\r
-       dec a\r
-       jr z,l1687h\r
-       ld b,0fdh\r
-l1687h:\r
-       ld l,0e9h\r
-       jp as.store_2\r
-\r
-l168ch:\r
-       DC      '(HL)'\r
-       DC      '(IX)'\r
-       DC      '(IY)'\r
-       DB      0\r
-\r
-as.DJNZ:\r
-       call next_arg\r
-       ld b,010h\r
-       jr l16aeh\r
-as.JR:\r
-       call arg.cc_ZC\r
-       jr c,l16a9h\r
-       ld b,018h\r
-       jr l16aeh\r
-l16a9h:\r
-       add a,b\r
-       ld b,a\r
-       call assert_comma\r
-l16aeh:\r
-       call arg.j_displ\r
-       jp as.store_2\r
-\r
-as.IM:\r
-       call arg.imm_8bit\r
-       ld a,l\r
-       cp 003h\r
-       jr nc,error7\r
-       and a\r
-       jr z,l16c7h\r
-       ld b,056h\r
-       cp 001h\r
-       jr z,l16c7h\r
-       ld b,05eh\r
-l16c7h:\r
-       jp gen.opc.ED2\r
-\r
-as.RST:\r
-       call arg.imm_8bit\r
-       ld a,l\r
-       push af\r
-       add a,b\r
-       ld b,a\r
-       pop af\r
-       and 0c7h\r
-       jr nz,error7\r
-       jp as.opc.noarg\r
-\r
-as.POP_PUSH:\r
-       call arg.IX_IY\r
-       jr c,l16e7h\r
-       call arg.zz\r
-       jr nc,error7\r
-       add a,b\r
-       jp l13ech\r
-l16e7h:\r
-       ld a,b\r
-       add a,020h\r
-       jp l1596h\r
-\r
-as.IN:\r
-       call arg.r_HL_A\r
-       jr nc,error7\r
-       cp 006h\r
-       jr z,error7\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,b\r
-       ld b,a\r
-       cp 078h\r
-       jr nz,l170fh\r
-       call assert_comma\r
-       call sub_171bh\r
-       jr c,l1715h\r
-       call arg.addr_8bit\r
-       ld b,0dbh\r
-       jp as.store_2\r
-l170fh:\r
-       call assert_comma\r
-       call sub_171bh\r
-l1715h:\r
-       jp c,gen.opc.ED2\r
-error7:\r
-       jp ERROR\r
-\r
-sub_171bh:\r
-       ld hl,t__C_\r
-       jp sub_0318h\r
-\r
-as.OUT:\r
-       call sub_171bh\r
-       jr nc,l1739h\r
-       call assert_comma\r
-       call arg.r_HL_A\r
-       jr nc,error7\r
-       cp 006h\r
-       jr z,error7\r
-       rlca\r
-       rlca\r
-       rlca\r
-       add a,b\r
-       jp l156eh\r
-\r
-l1739h:\r
-       call arg.addr_8bit\r
-       call assert_comma\r
-       cp 'A'\r
-       jr nz,error7\r
-       inc de\r
-       ld b,0d3h\r
-       jp as.store_2\r
-\r
-as.EX:\r
-       ld hl,b_176d_start\r
-       call sub_030ah\r
-       jr nc,error7\r
-       ld c,b\r
-       call assert_eol\r
-       ld b,000h\r
-       ld hl,l178eh\r
-       add hl,bc\r
-       add hl,bc\r
-       ld a,(hl)\r
-       ld (iy+000h),a\r
-       ld c,001h\r
-       inc hl\r
-       ld a,(hl)\r
-       and a\r
-       ret z\r
-       ld (iy+001h),a\r
-       ld c,002h\r
-       ret\r
-\r
-b_176d_start:\r
-       DC      'AF,AF'''\r
-l1773h:\r
-       DC      'DE,HL'\r
-       DC      '(SP),HL'\r
-       DC      '(SP),IX'\r
-       DC      '(SP),IY'\r
-       db      0\r
-l178eh:\r
-       db      008h,000h\r
-       db      0ebh,000h\r
-       db      0e3h,000h\r
-       db      0ddh,0e3h\r
-       db      0fdh,0e3h\r
-\r
-as.DEC_INC:\r
-       call arg.IX_IY\r
-       jr c,l17b3h\r
-       call arg.ww\r
-       jr c,l17bfh\r
-       call arg.r_HL_A\r
-       jr c,l17cch\r
-       call arg.IDX_displcmnt\r
-       jr nc,error8\r
-       ld a,b\r
-       add a,030h\r
-       jp l1400h\r
-l17b3h:\r
-       ld a,b\r
-       ld b,023h\r
-       cp 004h\r
-       jr z,l17bch\r
-       ld b,02bh\r
-l17bch:\r
-       jp l14b4h\r
-l17bfh:\r
-       push af\r
-       ld a,b\r
-       ld b,003h\r
-       cp 004h\r
-       jr z,l17c9h\r
-       ld b,00bh\r
-l17c9h:\r
-       pop af\r
-       jr l17cfh\r
-l17cch:\r
-       rlca\r
-       rlca\r
-       rlca\r
-l17cfh:\r
-       add a,b\r
-       jp l13ech\r
-\r
-arg.bit:\r
-       call arg.imm_8bit\r
-       ld a,l\r
-       cp 008h\r
-       jr nc,error8\r
-       ret\r
-\r
-arg.j_displ:\r
-       call test_expr\r
-       push bc\r
-       push iy\r
-       pop bc\r
-       and a\r
-       sbc hl,bc\r
-       dec hl\r
-       dec hl\r
-       pop bc\r
-       call sub_1802h\r
-       ld a,h\r
-       xor l\r
-       bit 7,a\r
-       jr nz,error8\r
-       ret\r
-\r
-arg.addr_8bit:\r
-       call get_char_upper\r
-       cp '('\r
-       jr nz,arg.imm_8bit\r
-       inc de\r
-       call arg.imm_8bit\r
-       jp test_paren_close\r
-\r
-arg.imm_8bit:\r
-       call test_expr\r
-sub_1802h:\r
-       ld a,h\r
-       and a\r
-       ret z\r
-       inc a\r
-       ret z\r
-       jr error8\r
-\r
-test_expr:\r
-       push bc\r
-       call expr\r
-       pop bc\r
-       ret nc\r
-error8:\r
-       jp ERROR\r
-\r
-arg.zz:\r
-       push hl\r
-       ld hl,t_BC.DE.HL.AF\r
-       jr l181fh\r
-\r
-arg.reg_16bit:\r
-       push hl\r
-       jr l181fh\r
-\r
-arg.ww:\r
-       push hl\r
-       ld hl,t_BC.DE.HL.SP\r
-l181fh:\r
-       push bc\r
-       call sub_030ah\r
-       jr nc,l182bh\r
-       ld a,b\r
-       rlca\r
-       rlca\r
-       rlca\r
-       rlca\r
-       scf\r
-l182bh:\r
-       pop bc\r
-       pop hl\r
-       ret\r
-\r
-arg.r_HL_A:\r
-       call skipbl\r
-       push bc\r
-       push hl\r
-       ld hl,t_BCDEHL_HL_A\r
-       call sub_030ah\r
-       ld a,b\r
-       pop hl\r
-       pop bc\r
-       ret\r
-\r
-arg.IX_IY:\r
-       push hl\r
-       push bc\r
-       ld hl,t_IX.IY\r
-       call sub_030ah\r
-       jr nc,l1852h\r
-       ld a,0ddh\r
-       dec b\r
-       jr nz,l184eh\r
-       ld a,0fdh\r
-l184eh:\r
-       ld (prefix_ixiy),a\r
-       scf\r
-l1852h:\r
-       pop bc\r
-       pop hl\r
-       ret\r
-\r
-arg.IDX_displcmnt:\r
-       push hl\r
-       push bc\r
-       call get_char_upper\r
-       cp '('\r
-       jr nz,l18a1h\r
-       push de\r
-       inc de\r
-       ld hl,t_IX.IY\r
-       call sub_030ah\r
-       jr nc,l18a0h\r
-       pop af\r
-       ld a,0ddh\r
-       dec b\r
-       jr nz,l186eh\r
-       ld a,0fdh\r
-l186eh:\r
-       ld (prefix_ixiy),a\r
-       call get_char_upper\r
-       cp '+'\r
-       jr z,l1882h\r
-       cp ')'\r
-       ld hl,0\r
-       jr z,l189ah\r
-       cp '-'\r
-       jr nz,error9\r
-l1882h:\r
-       push af\r
-       inc de\r
-       call arg.imm_8bit\r
-       pop af\r
-       cp '+'\r
-       jr z,l1894h\r
-       ld b,h\r
-       ld c,l\r
-       ld hl,0\r
-       and a\r
-       sbc hl,bc\r
-l1894h:\r
-       call get_char_upper\r
-       cp ')'\r
-       jr nz,error9\r
-l189ah:\r
-       inc de\r
-       pop bc\r
-       ld c,l\r
-       pop hl\r
-       scf\r
-       ret\r
-l18a0h:\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
+       ld (high_load),hl\r
+l1157h:\r
+       ld de,(max_load)\r
+       call cp_hl_de\r
+       jr c,l1163h\r
+       ld (max_load),hl\r
+l1163h:\r
        pop de\r
-l18a1h:\r
-       pop bc\r
-       pop hl\r
-       and a\r
+       pop af\r
+       ld (hl),a               ;store byte\r
        ret\r
 \r
-arg.cc_ZCPS:\r
-       ld hl,t_tstfl_ZCPS\r
-       ld c,007h\r
-       jr l18b1h\r
+;-------------------------------------------------------------------------------\r
 \r
-arg.cc_ZC:\r
-       ld hl,t_tstfl_ZC\r
-       ld c,003h\r
-l18b1h:\r
-       push bc\r
-       call sub_030ah\r
-       ld a,b\r
-       pop bc\r
-       ret nc\r
-       and c\r
-       rlca\r
-       rlca\r
-       rlca\r
-       scf\r
-       ret\r
+p_max_high0:\r
+       call assert_eol\r
+p_max_high:\r
+       call pstr_inl\r
+       DC      'High = '\r
+       ld hl,(high_load)\r
+       call out_hl\r
+       call pstr_inl\r
+       DC      '  Max = '\r
+       ld hl,(max_load)\r
+       call out_hl\r
+       call pstr_inl\r
+       DC      '  Top = '\r
+       ld hl,ddtz_base-1\r
+       call out_hl\r
+       jp crlf\r
 \r
-assert_comma:\r
-       call next_arg\r
-       ret z\r
-error9:\r
-       jp ERROR\r
+;-------------------------------------------------------------------------------\r
+; > Wstartaddr endaddr\r
+;      Write a file to disk\r
 \r
-test_paren_close:\r
-       call get_char_upper\r
-       cp ')'\r
-       jr nz,error9\r
-       inc de\r
-       ret\r
+;cmd_W:\r
+\r
+;-------------------------------------------------------------------------------\r
+; > A [startaddr]\r
+;      Assemble Zilog Z180 mnemonics\r
+\r
+;cmd_A:\r
 \r
 ;-------------------------------------------------------------------------------\r
 ; >>L [startaddr] [endaddr]\r
 ;      List disassembled code\r
 \r
 cmd_L:\r
-       ld hl,cmd_L\r
        ld (cmd_rpt),hl\r
        call expr\r
        jr nc,l18dbh\r
@@ -4660,7 +2770,13 @@ l190fh:
 \r
 cmdl_p_line:\r
        push    hl\r
-       call    p_disas_line\r
+       call out_hl\r
+       call outbl2\r
+       sub a\r
+       ld (con_col),a\r
+       push    hl\r
+       pop     iy\r
+       call p_disas_instr\r
        call    crlf\r
        pop     hl\r
        ld      c,b\r
@@ -4669,59 +2785,19 @@ cmdl_p_line:
        ld      (last_L),hl\r
        ret\r
 \r
-p_disas_line:\r
-       call p_label\r
-       call outbl2\r
-       call out.hl.@\r
-       call z,outbl\r
-       call outbl\r
-       sub a\r
-       ld (con_col),a\r
-       push    hl\r
-       pop     iy\r
-       call p_disas_instr\r
-       ret z\r
-\r
-       ld      c,15\r
-       call    p_goto_col\r
-       call    p_offset\r
-       call    outbl\r
-       jp      p_symbol\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-p_offset:\r
-       ld de,(var.@)\r
-       ld a,d\r
-       or e\r
-       ret z\r
-       call    pstr_inl\r
-       dc      '(@'\r
-       and a\r
-       sbc hl,de\r
-       call out_hl\r
-       add     hl,de\r
-       jp out_rparen\r
-\r
 ;-------------------------------------------------------------------------------\r
 \r
 p_disas_instr:\r
-       sub a\r
-       ld (disas_argtype),a\r
        call disas_get_instrlen\r
        jr nc,l197fh\r
        push    bc\r
        ld      a,(con_col)\r
        add     a,5\r
        ld      c,a\r
-       call    pstr\r
+       call    pstr                                    ;print mnemonic\r
        call    p_goto_col\r
-       ex de,hl\r
-       call call_hl\r
+       call    pr_instr_args                           ;print arguments\r
        pop bc\r
-       ld a,(disas_argtype)\r
-       ld hl,(disas_arg_16)\r
-       or a\r
        scf\r
        ret\r
 \r
@@ -4737,7 +2813,7 @@ disas_get_instrlen:
        ld (isprefix_ixiy),a\r
        ld a,(iy+000h)\r
        cp 0edh\r
-       jp z,disas_pfx.ED\r
+       jr z,disas_pfx.ED\r
        cp 0ddh\r
        jr z,l19abh\r
        cp 0fdh\r
@@ -4745,8 +2821,8 @@ disas_get_instrlen:
 sub_19a0h:\r
        ld a,(iy+000h)\r
        cp 0cbh\r
-       jp z,disas_pfx.CB\r
-       jp disas_nopfx\r
+       jr z,disas_pfx.CB\r
+       jr disas_nopfx\r
 l19abh:\r
        ld a,1\r
        jr l19b1h\r
@@ -4766,6 +2842,81 @@ l19b1h:
 \r
 ;-------------------------------------------------------------------------------\r
 \r
+disas_nopfx:\r
+       ld hl,b_1b54_start              ;2 byte opcodes\r
+       call lookup_op_arg\r
+       ld b,2\r
+       ret c\r
+       ld hl,b_1ab6_start              ;1 byte opcodes (no parameters)\r
+       call lookup_op\r
+       ld b,1\r
+       ret c\r
+       ld hl,b_1ad1_start              ;1 byte opcodes\r
+       call lookup_op_arg\r
+       ld b,1\r
+       ret c\r
+       ld hl,b_1b9b_start              ;3 byte opcodes\r
+       call lookup_op_arg\r
+       ld b,3\r
+       ret\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
+disas_pfx.ED:\r
+       inc iy\r
+       ld hl,l228bh\r
+       call lookup_op_arg\r
+       ld b,3\r
+       ret c\r
+       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
+\r
+disas_pfx.CB:\r
+       push iy\r
+       inc iy\r
+       ld a,(isprefix_ixiy)\r
+       and a\r
+       jr z,l1a42h\r
+       inc iy\r
+l1a42h:\r
+       ld hl,b_1c55_start\r
+       call lookup_op_arg\r
+       pop iy\r
+       ld b,2\r
+       ret\r
+\r
+;-------------------------------------------------------------------------------\r
+\r
 disas_pfx.DDFD:\r
        inc iy\r
        ld hl,b_19ef_start\r
@@ -4842,117 +2993,74 @@ l1a0ah:
 \r
 ;-------------------------------------------------------------------------------\r
 \r
-disas_pfx.ED:\r
-       inc iy\r
-       ld hl,b_1bc9_start\r
-       call sub_1a72h\r
-       ld b,2\r
-       ret c\r
-       ld hl,b_1bf4_start\r
-       call lookup_opc\r
-       ld b,2\r
-       ret c\r
-\r
-       ld hl,l228bh\r
-       call lookup_opc\r
-       ld b,3\r
-       ret c\r
-       ld hl,b_1c40_start\r
-       call lookup_opc\r
-       ld b,4\r
-       ret\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-disas_pfx.CB:\r
-       push iy\r
-       inc iy\r
-       ld a,(isprefix_ixiy)\r
+test_DDFD:\r
+       ld a,(hl)\r
        and a\r
-       jr z,l1a42h\r
-       inc iy\r
-l1a42h:\r
-       ld hl,b_1c55_start\r
-       call lookup_opc\r
-       pop iy\r
-       ld b,2\r
-       ret\r
-\r
-;-------------------------------------------------------------------------------\r
-\r
-disas_nopfx:\r
-       ld hl,b_1b54_start\r
-       call lookup_opc\r
-       ld b,2\r
-       ret c\r
-       ld hl,b_1ab6_start\r
-       call sub_1a72h\r
-       ld b,1\r
-       ret c\r
-       ld hl,b_1ad1_start\r
-       call lookup_opc\r
-       ld b,1\r
-       ret c\r
-       ld hl,b_1b9b_start\r
-       call lookup_opc\r
-       ret nc\r
-       ld b,3\r
+       ret z\r
+       inc hl\r
+       cp (iy+000h)\r
+       jr nz,test_DDFD\r
+       scf\r
        ret\r
 \r
-;-------------------------------------------------------------------------------\r
-\r
-sub_1a72h:\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 sub_1a72h\r
+       jr lookup_op\r
 l1a7fh:\r
-       ld de,l1c97h\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_opc:\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
+       jr z,l1aa8_br\r
        inc hl\r
        inc hl\r
-       inc hl\r
-       ld a,(hl)\r
-       and a\r
-       jr nz,lookup_opc\r
-       ret\r
+       jr lookup_branch_op\r
 \r
-l1aa8h:\r
-       inc hl\r
-       ld c,(hl)\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
@@ -4960,343 +3068,446 @@ get_mnemonic:
 ; 1 byte opcodes (no parameters)\r
 ; Format: db opcode, t_MNEMONICS-index\r
 b_1ab6_start:\r
-       db 076h,039h            ;halt\r
-       db 0d9h,036h            ;exx\r
-       db 0f3h,02ch            ;di\r
-       db 0fbh,032h            ;ei\r
-       db 000h,069h            ;nop\r
-       db 007h,09eh            ;rlca\r
-       db 00fh,0adh            ;rrca\r
-       db 017h,098h            ;rla\r
-       db 01fh,0a7h            ;rra\r
-       db 027h,026h            ;daa\r
-       db 02fh,023h            ;cpl\r
-       db 037h,0bah            ;scf\r
-       db 03fh,010h            ;ccf\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
 ; 1 byte opcodes\r
 ; Format: db mask, match, t_MNEMONICS-index\r
-;        dw argument formating fuction\r
+;        dw argument formating function\r
 b_1ad1_start:\r
-       db 0c0h,040h,056h       ;ld r,r\r
-       dw p_arg_r_r\r
-       db 0f8h,080h,003h       ;add a,r\r
-       dw p_arg_a_r\r
-       db 0f8h,088h,000h       ;adc a,r\r
-       dw p_arg_a_r\r
-       db 0f8h,090h,0c9h       ;sub r\r
-       dw p_arg_rs\r
-       db 0f8h,098h,0b7h       ;sbc a,r\r
-       dw p_arg_a_r\r
-       db 0f8h,0a0h,006h       ;and r\r
-       dw p_arg_rs\r
-       db 0f8h,0a8h,0cch       ;xor r\r
-       dw p_arg_rs\r
-       db 0f8h,0b0h,06ch       ;or r\r
-       dw p_arg_rs\r
-       db 0f8h,0b8h,013h       ;cp r\r
-       dw p_arg_rs\r
-       db 0c7h,0c0h,08bh       ;ret cc\r
-       dw p_arg_cc\r
-       db 0c7h,0c7h,0b4h       ;rst\r
-       dw l1c98h\r
-       db 0ffh,0c9h,08bh       ;ret\r
-       dw l1c97h\r
-       db 0cfh,0c1h,081h       ;pop rr\r
-       dw p_arg_zz\r
-       db 0cfh,0c5h,084h       ;push rr\r
-       dw p_arg_zz\r
-       db 0ffh,0e3h,034h       ;ex (sp),hl\r
-       dw l1ca0h\r
-       db 0ffh,0e9h,052h       ;jp (hl)\r
-       dw l1caeh\r
-       db 0ffh,0ebh,034h       ;ex de,hl\r
-       dw p_arg_ex_dehl\r
-       db 0ffh,0f9h,056h       ;ld sp,hl\r
-       dw l1cc1h\r
-       db 0cfh,003h,041h       ;inc rr\r
-       dw p_arg_ww\r
-       db 0cfh,00bh,029h       ;dec rr\r
-       dw p_arg_ww\r
-       db 0c7h,004h,041h       ;inc r\r
-       dw p_arg_r\r
-       db 0c7h,005h,029h       ;dec r\r
-       dw p_arg_r\r
-       db 0ffh,008h,034h       ;ex af,af'\r
-       dw p_arg_ex_afaf\r
-       db 0cfh,009h,003h       ;add hl,rr\r
-       dw l1cd3h\r
-       db 0efh,002h,056h       ;ld (rr),a ;rr=bc,de\r
-       dw l1cdch\r
-       db 0efh,00ah,056h       ;ld a,(rr) ;rr=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,056h       ;ld r,nn\r
-       dw l1cfah\r
-       db 0ffh,0c6h,003h       ;add a,nn\r
-       dw l1cf5h\r
-       db 0ffh,0ceh,000h       ;adc a,nn\r
-       dw l1cf5h\r
-       db 0ffh,0d6h,0c9h       ;sub a,nn\r
-       dw l1d09h\r
-       db 0ffh,0deh,0b7h       ;sbc a,nn\r
-       dw l1cf5h\r
-       db 0ffh,0e6h,006h       ;and a,nn\r
-       dw l1d09h\r
-       db 0ffh,0eeh,0cch       ;xor nn\r
-       dw l1d09h\r
-       db 0ffh,0f6h,06ch       ;or nn\r
-       dw l1d09h\r
-       db 0ffh,0feh,013h       ;cp a,nn\r
-       dw l1d09h\r
-       db 0ffh,010h,02eh       ;djnz\r
-       dw p_arg_jrel\r
-       db 0ffh,018h,054h       ;jr\r
-       dw p_arg_jrel\r
-       db 0e7h,020h,054h       ;jr cc,\r
-       dw p_arg_cc_jrel\r
-       db 0ffh,0d3h,076h       ;out (nn),a\r
-       dw l1d37h\r
-       db 0ffh,0dbh,03fh       ;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,052h       ;jp cc,mn\r
-       dw p_arg_cc_mn\r
-       db 0c7h,0c4h,00ch       ;call cc,mn\r
-       dw p_arg_cc_mn\r
-       db 0cfh,001h,056h       ;ld ww,mn\r
-       dw p_arg_ww_mn\r
-       db 0ffh,0c3h,052h       ;jp mn\r
-       dw p_arg_mn\r
-       db 0ffh,0cdh,00ch       ;call mn\r
-       dw p_arg_mn\r
-       db 0ffh,022h,056h       ;ld (mn),hl\r
-       dw p_arg_addr_hl\r
-       db 0ffh,02ah,056h       ;ld hl,(mn)\r
-       dw p_arg_hl_addr\r
-       db 0ffh,032h,056h       ;ld (mn),a\r
-       dw p_arg_addr_a\r
-       db 0ffh,03ah,056h       ;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,066h            ;neg\r
-       db 045h,092h            ;retn\r
-       db 04dh,08eh            ;reti\r
-       db 067h,0b1h            ;rrd\r
-       db 06fh,0a2h            ;rld\r
-       db 0a0h,05fh            ;ldi\r
-       db 0a1h,01ch            ;cpi\r
-       db 0a2h,04bh            ;ini\r
-       db 0a3h,07dh            ;outi\r
-       db 0a8h,058h            ;ldd\r
-       db 0a9h,015h            ;cpd\r
-       db 0aah,044h            ;ind\r
-       db 0abh,079h            ;outd\r
-       db 0b0h,062h            ;ldir\r
-       db 0b1h,01fh            ;cpir\r
-       db 0b2h,04eh            ;inir\r
-       db 0b3h,072h            ;otir\r
-       db 0b8h,05bh            ;lddr\r
-       db 0b9h,018h            ;cpdr\r
-       db 0bah,047h            ;indr\r
-       db 0bbh,06eh            ;otdr\r
-       db 08bh,0d5h            ;otdm\r
-       db 09bh,0d9h            ;otdmr\r
-       db 083h,0deh            ;otim\r
-       db 093h,0e2h            ;otimr\r
-       db 076h,0ebh            ;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 0e7h,040h,03fh       ;in r,(c) ;r=b,c,d,e\r
-       dw p_arg_in_c           ;\r
-       db 0f7h,060h,03fh       ;in r,(c) ;r=h,l\r
-       dw p_arg_in_c           ;\r
-       db 0ffh,078h,03fh       ;in r,(c) ;r=a\r
-       dw p_arg_in_c           ;\r
-       db 0e7h,041h,076h       ;out (c),r ;r=b,c,d,e\r
-       dw p_arg_out_c          ;\r
-       db 0f7h,061h,076h       ;out (c),r ;r=h,l\r
-       dw p_arg_out_c          ;\r
-       db 0ffh,079h,076h       ;out (c),r ;r=a\r
-       dw p_arg_out_c          ;\r
-       db 0cfh,042h,0b7h       ;sbc hl,rr\r
-       dw l1dcah               ;\r
-       db 0cfh,04ah,000h       ;adc hl,rr\r
-       dw l1dcah               ;\r
-       db 0ffh,046h,03dh       ;im 0\r
-       dw l1d85h               ;\r
-       db 0ffh,056h,03dh       ;im 1\r
-       dw l1d89h               ;\r
-       db 0ffh,05eh,03dh       ;im 2\r
-       dw l1d8dh               ;\r
-       db 0ffh,047h,056h       ;ld i,a\r
-       dw l1d92h               ;\r
-       db 0ffh,057h,056h       ;ld a,i\r
-       dw l1d97h               ;\r
-       db 0ffh,04fh,056h       ;ld r,a\r
-       dw l1d9ch               ;\r
-       db 0ffh,05fh,056h       ;ld a,r\r
-       dw l1da1h\r
-       db 0cfh,04ch,0d2h       ;mlt rr\r
-       dw p_arg_ww\r
-       db 0c7h,004h,0eeh       ;tst r\r
-       dw p_arg_r\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
+       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 0e7h,000h,0cfh       ;in0 r,(m) ;r=b,c,d,e\r
-       dw p_arg_r_m\r
-       db 0f7h,020h,0cfh       ;in0 r,(m) ;r=h,l\r
-       dw p_arg_r_m\r
-       db 0ffh,038h,0cfh       ;in0 a,(m)\r
-       dw p_arg_r_m\r
-       db 0e7h,001h,0e7h       ;out0 (m),r ;r=b,c,d,e\r
-       dw p_arg_m_r\r
-       db 0f7h,021h,0e7h       ;out0 (m),r ;r=h,l\r
-       dw p_arg_m_r\r
-       db 0ffh,039h,0e7h       ;out0 (m),a\r
-       dw p_arg_m_r\r
-       db 0ffh,064h,0eeh       ;tst m\r
-       dw l1d09h\r
-       db 0ffh,074h,0f1h       ;tstio m\r
-       dw l1d09h\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
+       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 0efh,043h,056h       ;ld (mn),ww     ;ww=bc,de\r
-       dw p_arg_addr_ww\r
-       db 0ffh,073h,056h       ;ld (mn),sp\r
-       dw p_arg_addr_ww\r
-       db 0efh,04bh,056h       ;ld ww,(mn)     ;ww=bc,de\r
-       dw p_arg_ww_addr\r
-       db 0ffh,07bh,056h       ;ld sp,(mn)\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,09bh       ;rlc g\r
-       dw l1e03h\r
-       db 0f8h,008h,0aah       ;rrc g\r
-       dw l1e03h\r
-       db 0f8h,010h,096h       ;rl g\r
-       dw l1e03h\r
-       db 0f8h,018h,0a5h       ;rr g\r
-       dw l1e03h\r
-       db 0f8h,020h,0c0h       ;sla g\r
-       dw l1e03h\r
-       db 0f8h,028h,0c3h       ;sra g\r
-       dw l1e03h\r
-       db 0f8h,038h,0c6h       ;srl g\r
-       dw l1e03h\r
-       db 0c0h,040h,009h       ;bit b,g\r
-       dw p_arg_bitop\r
-       db 0c0h,080h,088h       ;res b,g\r
-       dw p_arg_bitop\r
-       db 0c0h,0c0h,0bdh       ;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_r_r:\r
-       call p_arg_r\r
-       call p_char_comma\r
-       jp p_arg_rs\r
-p_arg_a_r:\r
-       call p_A_comma\r
-       jp p_arg_rs\r
-l1c97h:\r
-       ret\r
 \r
-p_arg_r_m:\r
-       call p_arg_r\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
+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
+;\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
-p_arg_m_r:\r
-       call sub_1d2ch\r
-       call p_char_comma\r
-       jp p_arg_r\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
+;  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
+;  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
+;  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
+;  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
-l1c98h:\r
-       ld a,(iy+000h)\r
-       and 038h\r
-       jp out_hex\r
 \r
-l1ca0h:\r
-       call pstr_inl\r
-       DC      '(SP),'\r
-       jp p_arg_hlixiy\r
+;-------------------------------------------------------------------------------\r
 \r
-l1caeh:\r
-       call p_char_lparen\r
-       call p_arg_hlixiy\r
-       jr out_rparen\r
+argpf_index    defl    0\r
 \r
-p_arg_ex_dehl:\r
-       ld hl,l1773h\r
-       jp pstr\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
-l1cc1h:\r
-       call pstr_inl\r
-       DC      'SP,'\r
-       jp p_arg_hlixiy\r
-\r
-p_arg_ex_afaf:\r
-       ld hl,b_176d_start\r
-       jp pstr\r
-\r
-l1cd3h:\r
-       call p_arg_hlixiy\r
-       call p_char_comma\r
-       jp p_arg_ww\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_arg_ww\r
-       jr out_rparen\r
-\r
-l1cf5h:\r
-       call p_A_comma\r
-       jr l1d09h\r
-l1cfah:\r
-       call p_arg_r\r
-       call p_char_comma\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
@@ -5307,193 +3518,59 @@ 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
+       jr out_hl_0\r
 \r
-l1d37h:\r
-       call sub_1d2ch\r
-       jr p_char_comma_A\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
-       ld a,002h\r
-sub_1d50h:\r
-       ld (disas_argtype),a\r
-       ld (disas_arg_16),hl\r
+out_hl_0:\r
        jp out_hl\r
 \r
-p_arg_ww_mn:\r
-       call p_arg_ww\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
-l1d92h:\r
-       ld hl,b_1da7_start\r
-       jr l1da4h\r
-l1d97h:\r
-       ld hl,l1daah\r
-       jr l1da4h\r
-l1d9ch:\r
-       ld hl,l1dadh\r
-       jr l1da4h\r
-l1da1h:\r
-       ld hl,l1db0h\r
-l1da4h:\r
-       jp pstr\r
-\r
-b_1da7_start:\r
-       DC      'I,A'\r
-l1daah:\r
-       DC      'A,I'\r
-l1dadh:\r
-       DC      'R,A'\r
-l1db0h:\r
-       DC      'A,R'\r
-\r
-p_arg_in_c:\r
-       call p_arg_r\r
-       call p_char_comma\r
-       ld hl,t__C_\r
-       jp pstr\r
+p_ir:\r
+       rra\r
+       rra\r
+       rra\r
+       and 03\r
+       ld hl,t_arg_IR\r
+       jr p_arg\r
 \r
-p_arg_out_c:\r
-       ld hl,t__C_\r
-       call pstr\r
-       call p_char_comma\r
-       jr p_arg_r\r
-\r
-l1dcah:\r
-       call p_arg_hlixiy\r
-       call p_char_comma\r
-       jp p_arg_ww\r
-\r
-p_arg_addr_ww:\r
-       call p_arg_addr\r
-       call p_char_comma\r
-       jp p_arg_ww\r
-\r
-p_arg_ww_addr:\r
-       call p_arg_ww\r
-       call p_char_comma\r
-\r
-p_arg_a_addr:\r
-       call p_A_comma\r
-p_arg_addr:\r
-       call p_char_lparen\r
-       ld l,(iy+001h)\r
-       ld h,(iy+002h)\r
-       ld a,001h\r
-       call sub_1d50h\r
-       jr p_char_rparen\r
 \r
-p_arg_bitop:\r
+get_cb_opc:\r
        ld a,(isprefix_ixiy)\r
        and a\r
-       jr nz,l1defh\r
        ld a,(iy+001h)\r
-       jr l1df2h\r
-l1defh:\r
+       ret z\r
        ld a,(iy+002h)\r
-l1df2h:\r
-       push af\r
+       ret\r
+\r
+p_y:\r
+       call get_cb_opc\r
        rra\r
        rra\r
        rra\r
        and 007h\r
-       add a,'0'\r
-       call outchar\r
-       call p_char_comma\r
-       pop af\r
-       jr p_arg_r0\r
+       jp out_dgt\r
 \r
-l1e03h:\r
-       ld a,(isprefix_ixiy)\r
-       and a\r
-       jr nz,l1e0eh\r
-       ld a,(iy+001h)\r
-       jr l1e11h\r
-l1e0eh:\r
-       ld a,(iy+002h)\r
-l1e11h:\r
-       jr p_arg_r0\r
+p_rz_cb:\r
+       call get_cb_opc\r
+       jr p_rz\r
 \r
-p_arg_r:\r
-       ld a,(iy+000h)\r
+p_ry:\r
        rra\r
        rra\r
        rra\r
-       jr p_arg_r0\r
-p_arg_rs:\r
-       ld a,(iy+000h)\r
-p_arg_r0:\r
+p_rz:\r
        and 007h\r
        cp 006h\r
-       jr nz,p_arg_r1\r
+       ld b,a\r
+       ld hl,t_arg_r\r
+       jr nz,p_arg0\r
        ld a,(isprefix_ixiy)\r
        and a\r
-       ld a,006h\r
-       jr z,p_arg_r1\r
-       ld hl,b_1e78_start\r
-       ld a,(isprefix_ixiy)\r
+       jr z,p_arg0\r
+       ld hl,t_lp_IXIY\r
        dec a\r
-       jr z,l1e4dh\r
-       ld hl,l1e7bh\r
-l1e4dh:\r
-       call pstr\r
+       call p_arg\r
        ld a,(iy+001h)\r
        push af\r
        rlca\r
@@ -5506,133 +3583,165 @@ l1e4dh:
 l1e61h:\r
        call outchar\r
        pop af\r
-       jp p_arg_nn_rp\r
-\r
-p_arg_r1:\r
-       ld hl,t_BCDEHL_HL_A\r
-       jr p_arg\r
-\r
-b_1e78_start:\r
-       DC      '(IX'\r
-l1e7bh:\r
-       DC      '(IY'\r
+       call out_hex\r
+       ld a,')'\r
+       jp outchar\r
 \r
-p_arg_hlixiy:\r
-       ld a,(isprefix_ixiy)\r
-       ld hl,t_HL.IX.IY\r
-       jr p_arg\r
-p_arg_zz:\r
-       ld hl,t_BC.DE.HL.AF\r
-       jr l1e8eh\r
-p_arg_ww:\r
-       ld hl,t_BC.DE.HL.SP\r
-l1e8eh:\r
-       ld a,(iy+000h)\r
+p_rp2:\r
+       ld hl,t_arg_rp2\r
+       db 0ddh                 ;swallow t_arg_rp in ix\r
+p_rp:\r
+       ld hl,t_arg_rp\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_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
        and 007h\r
-       ld hl,t_tstfl_ZCPS\r
+       ld hl,t_arg_cc\r
 p_arg:\r
        ld b,a\r
-       call sel_dc_string\r
-       jp pstr\r
+p_arg0:\r
+       ;fall thru\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
+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
+       dc      '&x'\r
+opc_index      defl    opc_index+1\r
+       endm\r
+\r
 t_MNEMONICS:\r
-       DC      'ADC'\r
-       DC      'ADD'\r
-       DC      'AND'\r
-       DC      'BIT'\r
-       DC      'CALL'\r
-       DC      'CCF'\r
-       DC      'CP'\r
-       DC      'CPD'\r
-       DC      'CPDR'\r
-       DC      'CPI'\r
-       DC      'CPIR'\r
-       DC      'CPL'\r
-       DC      'DAA'\r
-       DC      'DEC'\r
-       DC      'DI'\r
-       DC      'DJNZ'\r
-       DC      'EI'\r
-       DC      'EX'\r
-       DC      'EXX'\r
-       DC      'HALT'\r
-       DC      'IM'\r
-       DC      'IN'\r
-       DC      'INC'\r
-       DC      'IND'\r
-       DC      'INDR'\r
-       DC      'INI'\r
-       DC      'INIR'\r
-       DC      'JP'\r
-       DC      'JR'\r
-       DC      'LD'\r
-       DC      'LDD'\r
-       DC      'LDDR'\r
-       DC      'LDI'\r
-       DC      'LDIR'\r
-       DC      'NEG'\r
-       DC      'NOP'\r
-       DC      'OR'\r
-       DC      'OTDR'\r
-       DC      'OTIR'\r
-       DC      'OUT'\r
-       DC      'OUTD'\r
-       DC      'OUTI'\r
-       DC      'POP'\r
-       DC      'PUSH'\r
-       DC      'RES'\r
-       DC      'RET'\r
-       DC      'RETI'\r
-       DC      'RETN'\r
-       DC      'RL'\r
-       DC      'RLA'\r
-       DC      'RLC'\r
-       DC      'RLCA'\r
-       DC      'RLD'\r
-       DC      'RR'\r
-       DC      'RRA'\r
-       DC      'RRC'\r
-       DC      'RRCA'\r
-       DC      'RRD'\r
-       DC      'RST'\r
-       DC      'SBC'\r
-       DC      'SCF'\r
-       DC      'SET'\r
-       DC      'SLA'\r
-       DC      'SRA'\r
-       DC      'SRL'\r
-       DC      'SUB'\r
-       DC      'XOR'\r
-       DC      'IN0'\r
-       DC      'MLT'\r
-       DC      'OTDM'\r
-       DC      'OTDMR'\r
-       DC      'OTIM'\r
-       DC      'OTIMR'\r
-       DC      'OUT0'\r
-       DC      'SLP'\r
-       DC      'TST'\r
-       DC      'TSTIO'\r
+;opc_tabstart  defl    $\r
+opc_index      defl    0\r
+; 1-byte other\r
+       opc NOP\r
+       opc LD\r
+       opc INC\r
+       opc DEC\r
+       opc DJNZ\r
+       opc JR\r
+       opc HALT\r
+\r
+       opc RLCA\r
+       opc RRCA\r
+       opc RLA\r
+       opc RRA\r
+       opc DAA\r
+       opc CPL\r
+       opc SCF\r
+       opc CCF\r
+\r
+; 1-byte "alu"\r
+       opc ADD\r
+       opc ADC\r
+       opc SUB\r
+       opc SBC\r
+       opc AND\r
+       opc XOR\r
+       opc OR\r
+       opc CP\r
+\r
+       opc RET\r
+       opc POP\r
+       opc JP\r
+       opc CALL\r
+       opc PUSH\r
+       opc RST\r
+       opc OUT\r
+       opc EXX\r
+       opc IN\r
+       opc EX\r
+       opc DI\r
+       opc EI\r
+; CB\r
+       opc RLC\r
+       opc RRC\r
+       opc RL\r
+       opc RR\r
+       opc SLA\r
+       opc SRA\r
+       opc SLL\r
+       opc SRL\r
+       opc BIT\r
+       opc RES\r
+       opc SET\r
+\r
+; ED\r
+       opc NEG\r
+       opc RETN\r
+       opc RETI\r
+       opc IM\r
+       opc RRD\r
+       opc RLD\r
+\r
+; Block instructions\r
+       opc LDI\r
+       opc CPI\r
+       opc INI\r
+       opc OUTI\r
+       opc LDD\r
+       opc CPD\r
+       opc IND\r
+       opc OUTD\r
+       opc LDIR\r
+       opc CPIR\r
+       opc INIR\r
+       opc OTIR\r
+       opc LDDR\r
+       opc CPDR\r
+       opc INDR\r
+       opc OTDR\r
+\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 OTDM\r
+       opc OTIMR\r
+       opc OTDMR\r
+\r
        DB      0\r
 \r
-t_BCDEHL_HL_A:\r
+t_arg_r:\r
        DC      'B'\r
        DC      'C'\r
        DC      'D'\r
@@ -5642,48 +3751,24 @@ t_BCDEHL_HL_A:
        DC      '(HL)'\r
        DC      'A'\r
        DB      0\r
-t_BC.DE.HL.SP:\r
+t_arg_rp:\r
        DC      'BC'\r
        DC      'DE'\r
        DC      'HL'\r
        DC      'SP'\r
        DB      0\r
-t_BC.DE.HL.AF:\r
+t_arg_rp2:\r
        DC      'BC'\r
        DC      'DE'\r
-t_HL.AF:\r
        DC      'HL'\r
        DC      'AF'\r
        DB      0\r
-t_BC.DE.IY.SP:\r
-       DC      'BC'\r
-       DC      'DE'\r
-       DC      'IY'\r
-       DC      'SP'\r
-       DB      0\r
-t_BC.DE.IX.SP:\r
-       DC      'BC'\r
-       DC      'DE'\r
-       DC      'IX'\r
-       DC      'SP'\r
-       DB      0\r
 t_HL.IX.IY:\r
        DC      'HL'\r
-t_IX.IY:\r
        DC      'IX'\r
        DC      'IY'\r
        DB      0\r
-t_tstfl_ZC:\r
-       DC      'NZ'\r
-       DC      'Z'\r
-       DC      'NC'\r
-       DC      'C'\r
-       DC      'NE'\r
-       DC      'EQ'\r
-       DC      'GE'\r
-       DC      'LT'\r
-       DB      0\r
-t_tstfl_ZCPS:\r
+t_arg_cc:\r
        DC      'NZ'\r
        DC      'Z'\r
        DC      'NC'\r
@@ -5692,20 +3777,23 @@ t_tstfl_ZCPS:
        DC      'PE'\r
        DC      'P'\r
        DC      'M'\r
-       DC      'NE'\r
-       DC      'EQ'\r
-       DC      'GE'\r
-       DC      'LT'\r
-       DC      'NV'\r
-       DC      'V'\r
-       DB      0\r
-t__C_:\r
-       DC      '(C)'\r
        DB      0\r
 \r
+t_lp_IXIY:\r
+       DC      '(IX'\r
+       DC      '(IY'\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
+\r
 ;-------------------------------------------------------------------------------\r
 \r
-sub_1ffeh:\r
+tc_set_bp:\r
        ld hl,(reg.pc)\r
        ld a,h\r
        or l\r
@@ -5713,7 +3801,7 @@ sub_1ffeh:
        ld de,BDOS\r
        and a\r
        sbc hl,de\r
-       ld hl,l20edh\r
+       ld hl,l20edh            ;set break after BDOS call\r
        jr z,l2031h\r
        ld iy,(reg.pc)\r
        call disas_get_instrlen\r
@@ -5722,69 +3810,65 @@ sub_1ffeh:
        ld b,0\r
        ld hl,(reg.pc)\r
        add hl,bc\r
-       call sub_09cah\r
+       call bp_trace_enter\r
        ld iy,(reg.pc)\r
-       ld hl,b_2039_start\r
-       call lookup_opc\r
+       ld hl,t_op_branch\r
+       call lookup_branch_op\r
        ccf\r
        ret c\r
        ex de,hl\r
 l2031h:\r
        call CALL_HL\r
-       call c,sub_09cah\r
+       call c,bp_trace_enter\r
 l2037h:\r
        scf\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
 \r
-b_2039_start:\r
-       db 0ffh,0ddh,000h       ;Prefix DD\r
+t_op_branch:\r
+       db 0ffh,0ddh            ;Prefix DD\r
        dw l20a7h\r
-       db 0ffh,0fdh,000h       ;Prefix FD\r
+       db 0ffh,0fdh            ;Prefix FD\r
        dw l20ach\r
-       db 0ffh,0edh,000h       ;Prefix ED\r
+       db 0ffh,0edh            ;Prefix ED\r
        dw l20b8h\r
 \r
-b_2048_start:\r
-       db 0ffh,0cdh,000h       ;call mn\r
+       db 0ffh,0cdh            ;call mn\r
        dw l2080h\r
-       db 0ffh,0c3h,000h       ;jp mn\r
+       db 0ffh,0c3h            ;jp mn\r
        dw l208bh\r
-       db 0ffh,0e9h,000h       ;jp ()\r
+       db 0ffh,0e9h            ;jp ()\r
        dw l20a2h\r
-       db 0ffh,0c9h,000h       ;ret\r
+       db 0ffh,0c9h            ;ret\r
        dw l20dch\r
-       db 0ffh,0cfh,000h       ;rst 8\r
+       db 0ffh,0cfh            ;rst 8\r
        dw l2115h\r
-       db 0c7h,0c7h,000h       ;\r
+       db 0c7h,0c7h            ;rst n\r
        dw l20f9h\r
-       db 0c7h,0c4h,000h       ;\r
+       db 0c7h,0c4h            ;call cc,mn\r
        dw l2080h\r
-       db 0f7h,010h,000h       ;\r
+       db 0f7h,010h            ;djnz d; jr d\r
        dw l2093h\r
-       db 0e7h,020h,000h       ;\r
+       db 0e7h,020h            ;jr cc,d\r
        dw l2093h\r
-       db 0c7h,0c2h,000h       ;\r
+       db 0c7h,0c2h            ;jp cc,mn\r
        dw l208bh\r
-       db 0c7h,0c0h,000h       ;\r
+       db 0c7h,0c0h            ;ret cc\r
        dw l20c5h\r
        db 0\r
 \r
 ;-------------------------------------------------------------------------------\r
-\r
+; call mn      call cc,mn\r
 l2080h:\r
-       ld a,(b_21e2_start)\r
-       and a\r
-       jr nz,l208bh\r
-       ld a,(trace_call_flag)\r
-       and a\r
-       ret nz\r
+\r
+; jp mn                jp cc,mn\r
 l208bh:\r
        ld l,(iy+001h)\r
        ld h,(iy+002h)\r
        scf\r
        ret\r
+\r
 l2093h:\r
        ld c,(iy+001h)\r
        ld a,c\r
@@ -5797,27 +3881,34 @@ l2093h:
        inc hl\r
        scf\r
        ret\r
+\r
+; jp (hl)\r
 l20a2h:\r
        ld hl,(reg.l)\r
        scf\r
        ret\r
+\r
+; Prefix DD\r
 l20a7h:\r
        ld hl,(reg.ix)\r
        jr l20afh\r
+; Prefix FD\r
 l20ach:\r
        ld hl,(reg.iy)\r
 l20afh:\r
        ld a,(iy+001h)\r
-       cp 0e9h\r
+       cp 0e9h                 ; jp (ix); jp (iy)\r
        scf\r
        ret z\r
        and a\r
        ret\r
+\r
+; Prefix ED\r
 l20b8h:\r
        ld a,(iy+001h)\r
-       cp 04dh\r
+       cp 04dh                 ; reti\r
        jr z,l20dch\r
-       cp 045h\r
+       cp 045h                 ; retn\r
        jr z,l20dch\r
        and a\r
        ret\r
@@ -5839,22 +3930,14 @@ l20d7h:
        jp (hl)\r
 \r
 l20dch:\r
-       ld a,(b_21e2_start)\r
-       and a\r
-       jr nz,l20edh\r
-       ld a,(trace_call_flag)\r
-       and a\r
-       jr z,l20edh\r
-       call l20edh\r
-       pop hl\r
-       ret\r
 l20edh:\r
-       ld hl,(reg_sp)\r
+       ld hl,(reg_sp)          ;break on return address\r
        ld e,(hl)\r
        inc hl\r
        ld d,(hl)\r
        ex de,hl\r
-       call sub_09cah\r
+       call bp_trace_enter\r
+l2115h:\r
        and a\r
        ret\r
 \r
@@ -5868,16 +3951,9 @@ l20f9h:
        ld h,000h\r
        ld a,(b_21e2_start)\r
        and a\r
-       jr nz,l2113h\r
-       ld a,(trace_call_flag)\r
-       and a\r
-       ret nz\r
-l2113h:\r
+       ret z\r
        scf\r
        ret\r
-l2115h:\r
-       and a\r
-       ret\r
 \r
 ;-------------------------------------------------------------------------------\r
 ; >>C[N][J] [steps]\r
@@ -5885,10 +3961,6 @@ l2115h:
 ; >>C[N][J] U expression\r
 ;     trace over Calls [No list] [Jumps only] /.While./.Until.\r
 \r
-cmd_C:\r
-       ld hl,cmd_C\r
-       ld a,1\r
-       jr l2122h\r
 \r
 ;-------------------------------------------------------------------------------\r
 ; >>T[N][J] [steps]\r
@@ -5897,139 +3969,44 @@ cmd_C:
 ;      Trace [no List] [Jumps only] / .While. / .Until.\r
 \r
 cmd_T:\r
-       xor a\r
-       ld hl,cmd_T\r
-l2122h:\r
        ld (cmd_rpt),hl\r
-       ld (trace_call_flag),a\r
-       call get_char_upper\r
-       sub 'N'\r
-       jr nz,l212eh\r
-       inc de\r
-l212eh:\r
-       ld (trace_N_flag),a\r
-       call get_char_upper\r
-       sub 'J'\r
-       jr nz,l2137h\r
-       inc de\r
-l2137h:\r
-       ld (trace_J_flag),a\r
-       call sub_21a6h\r
-       jr z,l2145h\r
-       ld hl,1\r
+       ld hl,1                         ;default: 1 step\r
        call get_lastarg_def\r
-l2145h:\r
-       ld (trace_count),hl\r
+       ld (trace_cnt_or_ptr),hl\r
        sub a\r
-       ld (l0941h),a\r
-l214ch:\r
-       call sub_1ffeh\r
-       jr l21a3h\r
+       ld (bp_p_cpu_flag),a\r
+       call tc_set_bp\r
+       jr user_go1\r
 \r
 l2151h:\r
        call bp_clr_temporary\r
-       ld a,(trace_J_flag)\r
-       and a\r
-       jr nz,l216bh\r
-       ld iy,(reg.pc)\r
-       call sub_21c8h\r
-       jr z,l216bh\r
-       ld hl,b_2048_start\r
-       call lookup_opc\r
-       jr nc,l214ch\r
-l216bh:\r
-       ld a,(trace_UW_flag)\r
-       and a\r
-       jr z,l2188h\r
-       ld de,(trace_count)\r
-       call expr\r
-       ld a,h\r
-       or l\r
-       add a,0ffh\r
-       sbc a,a\r
-       ld hl,trace_UW_flag\r
-       xor (hl)\r
-       bit 1,a\r
-       jr z,l2193h\r
-l2185h:\r
-       jp l0902h\r
-l2188h:\r
-       ld hl,(trace_count)\r
+       ld hl,(trace_cnt_or_ptr)\r
        dec hl\r
-       ld (trace_count),hl\r
+       ld (trace_cnt_or_ptr),hl\r
        ld a,h\r
        or l\r
-       jr z,l2185h\r
-l2193h:\r
-       call sub_1ffeh\r
-       jr nc,l2185h\r
-       ld a,(trace_N_flag)\r
-       ld b,a\r
-       ld a,(l0941h)\r
-       or b\r
-       ld (l0941h),a\r
-l21a3h:\r
-       jp user_go\r
-\r
-sub_21a6h:\r
-       call skipbl\r
-       xor a\r
-       ld (trace_UW_flag),a\r
-       call get_char_upper\r
-       cp 'U'\r
-       jr z,l21b5h\r
-       cp 'W'\r
-       ret nz\r
-l21b5h:\r
-       inc de\r
-       push af\r
-       push de\r
-       call expr\r
-       jp c,ERROR\r
-       call assert_eol\r
-       pop hl\r
-       pop af\r
-       ld (trace_UW_flag),a\r
-       sub a\r
-       ret\r
+       jp z,do_break\r
 \r
-sub_21c8h:\r
-       ld a,(iy+000h)\r
-       cp 0edh\r
-       jr z,l21dah\r
-       and 0dfh\r
-       cp 0ddh\r
-       ret nz\r
-       ld a,(iy+001h)\r
-       cp 0e9h\r
-       ret\r
-l21dah:\r
-       ld a,(iy+001h)\r
-       and 0f7h\r
-       cp 045h\r
-       ret\r
+       call tc_set_bp\r
+       jp nc,do_break\r
+       sbc a,a\r
+       ld (bp_p_cpu_flag),a\r
+user_go1:\r
+       jp user_go\r
 \r
 ;-------------------------------------------------------------------------------\r
 \r
-b_21e2_start:\r
+con_col:\r
        db      0\r
-trace_call_flag:\r
-       db      0               ;1=call, 0=trace\r
-trace_UW_flag:\r
-       db      0               ;0 or 'U' or 'W'\r
-trace_count:\r
-       dw      0\r
-trace_N_flag:\r
-       db      0               ;0 if 'N'\r
-trace_J_flag:\r
-       db      0               ;0 if 'J'\r
 \r
 ;-------------------------------------------------------------------------------\r
 \r
-con_col:\r
+b_21e2_start:\r
        db      0\r
+trace_cnt_or_ptr:\r
+       dw      0\r
 \r
-l0941h:\r
+bp_p_cpu_flag:\r
        db      0\r
 \r
 bp_tab:\r
@@ -6039,105 +4016,8 @@ bp_tab:
         endm\r
        endm\r
 \r
-expr_p1:\r
-       dw      expr_buf\r
-expr_p2:\r
-       dw      expr_buf\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
-msg_Y:\r
-       dc      'Yn'\r
-reg_Y:\r
-       rept    YREG_CNT\r
-        dw     0\r
-       endm\r
-\r
 last_S:\r
        dw      TPA\r
 \r
@@ -6149,50 +4029,68 @@ last_O_addr:
 last_O_val:\r
        db      0\r
 \r
-cmd_Q_jopt:\r
-       db      -1\r
-\r
 last_D:\r
        dw      TPA\r
 \r
-cmdR_rindex:\r
-       db      0\r
-\r
 high_load:\r
        dw      TPA\r
 max_load:\r
        dw      TPA\r
 \r
-l1262h:\r
-       dw      0\r
-last_A:\r
-       dw      TPA\r
-cmd_A_prev:\r
-       dw      TPA\r
-\r
-prefix_ixiy:\r
-       db      0\r
-\r
 isprefix_ixiy:\r
        db      0\r
 last_L:\r
        dw      TPA\r
-disas_arg_16:\r
-       dw      0\r
-disas_argtype:\r
-       db      0\r
 \r
 pbl_loop_adr:\r
-       dw      0\r
+       dw      0addeh\r
 \r
-symlen_cur:            ;max length of symbols read so far\r
-       db      0\r
-cur_fcb:\r
+bitmap_end:\r
        dw      0\r
-fcbsym:\r
-       ds      33\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