cleanup

defines_apple.s

@@ -25,6 +25,10 @@ USR				:= $000A
 ;LINNUM          := $0053
 
 TXPSV           := $0053
+
+CONFIG_NO_INPUTBUFFER_ZP := 1
+CONFIG_INPUTBUFFER_0200 := 1
+
 INPUTBUFFER     := $0200
 INPUTBUFFERX    := $0200
 

defines_cbm.s

@@ -76,6 +76,9 @@ POSX			:= $00C6
 
 TXPSV = LASTOP
 
+CONFIG_NO_INPUTBUFFER_ZP := 1
+CONFIG_INPUTBUFFER_0200 := 1
+
 INPUTBUFFER     := $0200
 INPUTBUFFERX    := $0200
 .endif

defines_kbd.s

@@ -30,6 +30,9 @@ Z18             := $06FD
 
 
 TXPSV           := $0049
+
+CONFIG_NO_INPUTBUFFER_ZP := 1
+
 INPUTBUFFER     := $0700
 INPUTBUFFERX    := $0700
 

flow.s

@@ -82,7 +82,7 @@ NEWSTT:
         jsr     ISCNTC
         lda     TXTPTR
         ldy     TXTPTR+1
-.if (INPUTBUFFER >=$0100) && .def(CONFIG_2)
+.if .def(CONFIG_NO_INPUTBUFFER_ZP) && .def(CONFIG_2)
         cpy     #>INPUTBUFFER
   .ifdef CBM2
         nop
@@ -274,7 +274,7 @@ END2:
         bne     RET1
         lda     TXTPTR
         ldy     TXTPTR+1
-.if (INPUTBUFFER >=$0100) && .def(CONFIG_2)
+.if .def(CONFIG_NO_INPUTBUFFER_ZP) && .def(CONFIG_2)
 ; BUG on AppleSoft I
 ; fix exists on AppleSoft II
 ; TXTPTR+1 will always be > 0

init.s

@@ -30,7 +30,7 @@ COLD_START2:
         ldx     #$FF
         stx     CURLIN+1
   .endif
-  .if INPUTBUFFER >= $0100
+  .ifdef CONFIG_NO_INPUTBUFFER_ZP
         ldx     #$FB
   .endif
         txs

input.s

@@ -66,7 +66,7 @@ LCAB6:
 .endif
         ldx     #<(INPUTBUFFER+1)
         ldy     #>(INPUTBUFFER+1)
-.if INPUTBUFFER >= $0100
+.ifdef CONFIG_NO_INPUTBUFFER_ZP
         lda     #$00
         sta     INPUTBUFFER+1
 .else

program.s

@@ -232,7 +232,7 @@ PUT_NEW_LINE:
 L23D6:
         sty     HIGHDS+1
         jsr     BLTU
-.if INPUTBUFFER = $0200
+.ifdef CONFIG_INPUTBUFFER_0200
         lda     LINNUM
         ldy     LINNUM+1
         sta     INPUTBUFFER-2
@@ -590,7 +590,7 @@ L24DB:
 ; ---END OF LINE------------------
 L24EA:
         sta     INPUTBUFFER-3,y
-.if INPUTBUFFER >= $0100
+.ifdef CONFIG_NO_INPUTBUFFER_ZP
         dec     TXTPTR+1
 .endif
         lda     #<INPUTBUFFER-1

string.s

@@ -82,7 +82,7 @@ L32AA:
 L32B6:
         stx     STRNG2+1
         lda     STRNG1+1
-.if INPUTBUFFER >= $0100
+.ifdef CONFIG_NO_INPUTBUFFER_ZP
         beq     LD399
         cmp     #>INPUTBUFFER
 .endif