Reorganize I/O tokens for shorter code.

Author: dmsc

Makefile

@@ -114,7 +114,6 @@ COMMON_AS_SRC=\
     src/interp/bitexor.asm\
     src/interp/bitor.asm\
     src/interp/cdata.asm\
-    src/interp/close.asm\
     src/interp/chr.asm\
     src/interp/cmpstr.asm\
     src/interp/comp0.asm\
@@ -125,7 +124,6 @@ COMMON_AS_SRC=\
     src/interp/div.asm\
     src/interp/dpeek.asm\
     src/interp/dpoke.asm\
-    src/interp/drawto.asm\
     src/interp/for.asm\
     src/interp/for_exit.asm\
     src/interp/free.asm\
@@ -134,7 +132,6 @@ COMMON_AS_SRC=\
     src/interp/inc.asm\
     src/interp/input.asm\
     src/interp/iochn.asm\
-    src/interp/ioget.asm\
     src/interp/jump.asm\
     src/interp/land.asm\
     src/interp/lnot.asm\

src/interp/bgetput.asm

@@ -27,7 +27,7 @@
 ; Block-GET and Block-PUT
 ; -----------------------
 
-        .import         CIOV_CMD_POP2, stack_l, stack_h
+        .import         CIOV_CMD_POP2, stack_l, stack_h, IOCHN_16
 
         .include "atari.inc"
 
@@ -40,33 +40,26 @@
 .proc   EXE_BGET
         sec
 
-        php
-
-        pha
+        pha                     ; Length
         txa
         pha
 
-        lda     stack_l+1,y
-        asl
-        asl
-        asl
-        asl
-        tax
+        lda     stack_h, y      ; Address H
+        pha
 
-        pla
-        sta     ICBLH, x
-        pla
-        sta     ICBLL, x        ; Length
+        lda     stack_l, y      ; Address L
+        pha
 
-        lda     stack_l, y
-        sta     ICBAL, x        ; Address
-        lda     stack_h, y
+        lda     stack_l+1,y     ; I/O channel
 
-        plp
-        ldy     #GETCHR
+        ldy     #GETCHR         ; Command
         bcs     bget
         ldy     #PUTCHR
 bget:
+
+        jsr     IOCHN_16
+
+        pla
         jmp     CIOV_CMD_POP2   ; Note: A is never 0
 .endproc
 

src/interp/close.asm

@@ -24,32 +24,78 @@
 ; linked into a combine executable.)
 
 
-; Graphics command
-; ----------------
+; Graphics commands and I/O:
+; GRAPHICS; DRAWTO (and FILLTO), GET and CLOSE
+; --------------------------------------------
 
-        .import CIOV_CMD_AH
+        .export         CIOV_CMD_A, CIOV_CMD, CIOV_IOERR
+        .import         IOCHN_16
+        .importzp       COLOR, IOCHN, IOERROR, next_instruction
 
         .include "atari.inc"
 
         .segment        "RUNTIME"
 
-.proc   EXE_GRAPHICS  ; OPEN #6,12,0,
+.proc   EXE_GRAPHICS    ; OPEN #6,12,MODE,"S:"
         ldx     #$60
-        tay
+        sta     ICAX2, x; Store BASIC mode into AUX2
         and     #$F0
-        eor     #$1C    ; Get AUX1 from BASIC mode
+        eor     #$1C    ; and flags into AUX1
         sta     ICAX1, x
-        tya             ; And AUX2
-        sta     ICAX2, x
-        lda     #<device_s
-        sta     ICBAL, x
+        pha
+        pha
         lda     #>device_s
+        pha
+        lda     #<device_s
         ldy     #OPEN
-        jmp     CIOV_CMD_AH
+.endproc
+
+CIOV_CMD_A:
+        sta     ICBAL, x        ; Address
+        pla
+        sta     ICBAH, x
+        pla                     ; Length
+CIOV_CMD_L:
+        sta     ICBLH, x
+        pla
+        sta     ICBLL, x
+        tya                     ; Command
+        ; Calls CIO with given command, stores I/O error and pops stack
+CIOV_CMD:
+        sta     ICCOM, x
+        ; Calls CIOV, stores I/O error and pops stack
+        jsr     CIOV
+        ldx     #0      ; Needed for TOK_GET
+CIOV_IOERR:
+        sty     IOERROR
+        jmp     next_instruction
+
 device_s: .byte "S:", $9B
+
+EXE_CLOSE:
+        jsr     IOCHN_16
+        lda     #CLOSE
+        bne     CIOV_CMD
+
+.proc   EXE_DRAWTO      ; CIO COMMAND in A
+        ldx     COLOR
+        stx     ATACHR
+        ldx     #$60    ; IOCB #6
+        bne     CIOV_CMD
+.endproc
+
+.proc   EXE_GET
+        ldx     IOCHN
+        lda     #0      ; Length = 0
+        pha
+        ldy     #GETCHR
+        bne     CIOV_CMD_L
 .endproc
 
         .include "../deftok.inc"
+        deftoken "CLOSE"
+        deftoken "DRAWTO"
+        deftoken "GET"
         deftoken "GRAPHICS"
 
 ; vi:syntax=asm_ca65

src/interp/drawto.asm

@@ -27,17 +27,24 @@
 ; Set I/O channel to A
 ; --------------------
 
+        .export         IOCHN_16
         .importzp       IOCHN, next_instruction
 
         .segment        "RUNTIME"
 
 .proc   EXE_IOCHN
+        jsr     IOCHN_16
+        stx     IOCHN
+        jmp     next_instruction
+.endproc
+
+.proc   IOCHN_16
         asl
         asl
         asl
         asl
-        sta     IOCHN
-        jmp     next_instruction
+        tax
+        rts
 .endproc
 
         .include "../deftok.inc"