cleanup

defines_apple.s

@@ -10,6 +10,9 @@ CONFIG_PRINT_CR := 1 ; print CR when line end reached
 CONFIG_IO_MSB := 1 ; IO is 7 bit, MSB may be randomly set
 ; INPUTBUFFER > $0100
 
+CRLF_1 := $0D
+CRLF_2 := $80
+
 ZP_START = $55
 
 JMPADRS = DSCLEN + 1

defines_cbm.s

@@ -25,6 +25,9 @@ CONFIG_DATAFLAG := 1
 CONFIG_FILE := 1; support PRINT#, INPUT#, GET#, CMD
 CONFIG_NO_CR := 1; terminal doesn't need explicit CRs on line ends
 
+CRLF_1 := $0D
+CRLF_2 := $0A
+
 .ifdef CBM1
 ZP_START = $65
 

defines_kbd.s

@@ -7,6 +7,9 @@ CONFIG_11_NOAPPLE := 1
 CONFIG_SAFE_NAMENOTFOUND := 1
 ; INPUTBUFFER > $0100
 
+CRLF_1 := $0A
+CRLF_2 := $0D
+
 ZP_START = $15
 
 Z00             := $0700

defines_kim.s

@@ -7,6 +7,9 @@ KIM_APPLE := 1
 CONFIG_NULL := 1
 CONFIG_PRINT_CR := 1 ; print CR when line end reached
 
+CRLF_1 := $0D
+CRLF_2 := $0A
+
 ZP_START = $63
 
 JMPADRS = DSCLEN + 1

defines_osi.s

@@ -6,6 +6,9 @@ CONFIG_DATAFLAG := 1
 ; minor: just code order
 CONFIG_SCRTCH_ORDER := 1
 
+CRLF_1 := $0D
+CRLF_2 := $0A
+
 ZP_START = $65
 
 JMPADRS = DSCLEN + 1

print.s

@@ -50,7 +50,12 @@ L29B1:
         jsr     STRPRT
 .ifdef KBD
         jmp     L297E
+.else
+        jsr     OUTSP
+        bne     L297E ; branch always
+.endif
 
+.ifdef KBD
 ; PATCHES
 LE86C:
         pla
@@ -63,20 +68,12 @@ LE874:
         bpl     LE8F2
 LE878:
         jmp     IQERR
-CRDO:
+; PATCHES
-        lda     #$0A
+.endif
-        sta     $10
+
-        jsr     OUTDO
+
-LE882:
+
-        lda     #$0D
+.ifndef KBD
-        jsr     OUTDO
-PRINTNULLS:
-        lda     #$00
-        sta     $10
-        eor     #$FF
-.else
-        jsr     OUTSP
-        bne     L297E
 L29B9:
   .ifdef CBM2
         lda     #$00
@@ -90,32 +87,35 @@ L29B9:
         ldx     #LINNUM+1
     .endif
   .endif
-  .ifdef CONFIG_CBM_ALL
+  .ifdef CONFIG_FILE
         lda     Z03
         bne     L29DD
-LC9D2:
   .endif
+.endif
+
+
 CRDO:
-  .ifdef CBM1
+.if .def(CONFIG_PRINTNULLS) && .def(CONFIG_FILE)
         lda     Z03
         bne     LC9D8
         sta     $05
 LC9D8:
-  .endif
-        lda     #$0D
-  .ifndef CONFIG_CBM_ALL
-        sta     Z16
-  .endif
-        jsr     OUTDO
-  .ifdef APPLE
-        lda     #$80
-  .else
-        lda     #$0A
-  .endif
-        jsr     OUTDO
 .endif
-.ifndef KBD
+        lda     #CRLF_1
+.ifndef CONFIG_CBM_ALL
+        sta     Z16
+.endif
+        jsr     OUTDO
+LE882:
+        lda     #CRLF_2
+        jsr     OUTDO
+
 PRINTNULLS:
+.ifdef KBD
+        lda     #$00
+        sta     $10
+        eor     #$FF
+.else
   .if .def(CONFIG_NULL) || .def(CONFIG_PRINTNULLS)
     .ifdef CONFIG_FILE
     ; Although there is no statement for it,