cleanup

defines_cbm.s

@@ -24,6 +24,7 @@ Z18             := $0007
 LINNUM          := $0008
 TXPSV			:= $0008
 INPUTBUFFER     := $000A
+INPUTBUFFERX    := $0000
 TEMPPT          := $0065
 LASTPT          := $0066
 TEMPST			:= $0068
@@ -98,6 +99,7 @@ LINNUM          := $0011;0008
 TXPSV			:= $0048
 GOGIVEAYF       := $0008
 INPUTBUFFER     := $0200;00A
+INPUTBUFFERX    := $0200
 Z03				:= $000E;3 ; same
 CHARAC          := $005A-82-5
 ENDCHR          := $005B-82-5

defines_kbd.s

@@ -13,6 +13,7 @@ Z18             := $06FD;$0010
 LINNUM          := $0013;11
 TXPSV           := $0049
 INPUTBUFFER     := $0700
+INPUTBUFFERX    := $0700
 CHARAC          := $0006;5B
 ENDCHR          := $0007;5C
 EOLPNTR         := $0008;5D

defines_kim.s

@@ -22,6 +22,7 @@ Z18             := $0018
 LINNUM          := $0019
 TXPSV           := $0019
 INPUTBUFFER     := $001B
+INPUTBUFFERX    := $0000
 TEMPPT          := $0063
 LASTPT          := $0064
 INDEX           := $006F

defines_osi.s

@@ -13,6 +13,7 @@ Z18             := $0010
 LINNUM          := $0011
 TXPSV           := $0011
 INPUTBUFFER     := $0013
+INPUTBUFFERX    := $0000
 CHARAC          := $005B
 ENDCHR          := $005C
 EOLPNTR         := $005D

msbasic.s

@@ -809,10 +809,11 @@ LE39A:
 RET3:
         rts
 .else
-RET3:
 .ifdef CBM2
+RET3:
 		rts
 .else
+L2420:
 .ifdef OSI
         jsr     OUTDO
 .endif
@@ -842,7 +843,7 @@ INLIN2:
         cmp     #$40
         beq     L2423
         cmp     #$5F
-        beq     RET3
+        beq     L2420
 L2443:
         cpx     #$47
         bcs     L244C
@@ -903,9 +904,9 @@ PARSE_INPUT_LINE:
         sty     DATAFLG
 L246C:
 .ifdef CBM2
-        lda     $0200,x
+        lda     INPUTBUFFERX,x
 .else
-        lda     Z00,x
+        lda     INPUTBUFFERX,x
 .endif
 .ifdef CBM
         bpl     LC49E