Cleanup BASIC sources

rom/string.s

@@ -86,13 +86,8 @@ L32AA:
 L32B6:
         stx     STRNG2+1
         lda     STRNG1+1
-.ifdef CONFIG_NO_INPUTBUFFER_ZP
         beq     LD399
         cmp     #>INPUTBUFFER
-.elseif .def(AIM65)
-        beq     LD399
-        cmp     #$01
-.endif
         bne     PUTNEW
 LD399:
         tya
@@ -124,9 +119,7 @@ PUTEMP:
         ldy     #$00
         stx     FAC_LAST-1
         sty     FAC_LAST
-.ifdef CONFIG_2
         sty     FACEXTENSION
-.endif
         dey
         sty     VALTYP
         stx     LASTPT
@@ -183,22 +176,14 @@ L3311:
 ; BELOW STRING AREA DOWN TO STREND.
 ; ----------------------------------------------------------------------------
 GARBAG:
-
-.ifdef CONST_MEMSIZ
-        ldx     #<CONST_MEMSIZ
-        lda     #>CONST_MEMSIZ
-.else
         ldx     MEMSIZ
         lda     MEMSIZ+1
-.endif
 FINDHIGHESTSTRING:
         stx     FRETOP
         sta     FRETOP+1
         ldy     #$00
         sty     FNCNAM+1
-.ifdef CONFIG_2
         sty     FNCNAM	; GC bugfix!
-.endif
         lda     STREND
         ldx     STREND+1
         sta     LOWTR
@@ -244,14 +229,10 @@ L336B:
 L3376:
         sta     INDEX
         stx     INDEX+1
-.ifdef CONFIG_SMALL
-        ldy     #$01
-.else
         ldy     #$00
         lda     (INDEX),y
         tax
         iny
-.endif
         lda     (INDEX),y
         php
         iny
@@ -264,21 +245,13 @@ L3376:
         sta     HIGHDS+1
         plp
         bpl     L3367
-.ifndef CONFIG_SMALL
         txa
         bmi     L3367
-.endif
         iny
         lda     (INDEX),y
-.ifdef CONFIG_CBM1_PATCHES
-        jsr     LE7F3 ; XXX patch, call into screen editor
-.else
-  .ifdef CONFIG_11
         ldy     #$00	; GC bugfix
-  .endif
         asl     a
         adc     #$05
-.endif
         adc     INDEX
         sta     INDEX
         bcc     L33A7
@@ -298,10 +271,8 @@ L33B1:
 ; PROCESS A SIMPLE VARIABLE
 ; ----------------------------------------------------------------------------
 CHECK_SIMPLE_VARIABLE:
-.ifndef CONFIG_SMALL
         lda     (INDEX),y
         bmi     CHECK_BUMP
-.endif
         iny
         lda     (INDEX),y
         bpl     CHECK_BUMP
@@ -360,19 +331,11 @@ L33FA:
 ; TO TOP AND GO BACK FOR ANOTHER
 ; ----------------------------------------------------------------------------
 MOVE_HIGHEST_STRING_TO_TOP:
-.ifdef CONFIG_2
         lda     FNCNAM+1	; GC bugfix
         ora     FNCNAM
-.else
-        ldx     FNCNAM+1
-.endif
         beq     L33FA
         lda     Z52
-.ifndef CONFIG_10A
-        sbc     #$03
-.else
         and     #$04
-.endif
         lsr     a
         tay
         sta     Z52
@@ -531,11 +494,7 @@ L34CD:
 ; RELEASE TEMPORARY DESCRIPTOR IF Y,A = LASTPT
 ; ----------------------------------------------------------------------------
 FRETMS:
-.ifdef KBD
-        cpy     #$00
-.else
         cpy     LASTPT+1
-.endif
         bne     L34E2
         cmp     LASTPT
         bne     L34E2
@@ -620,9 +579,7 @@ MIDSTR:
         jsr     GETBYT
 L353F:
         jsr     SUBSTRING_SETUP
-.ifdef CONFIG_2
         beq     GOIQ
-.endif
         dex
         txa
         pha
@@ -644,15 +601,9 @@ L353F:
 SUBSTRING_SETUP:
         jsr     CHKCLS
         pla
-.ifndef CONFIG_11
-        sta     JMPADRS+1
-        pla
-        sta     JMPADRS+2
-.else
         tay
         pla
         sta     Z52
-.endif
         pla
         pla
         pla
@@ -661,23 +612,13 @@ SUBSTRING_SETUP:
         sta     DSCPTR
         pla
         sta     DSCPTR+1
-.ifdef CONFIG_11
         lda     Z52
         pha
         tya
         pha
-.endif
         ldy     #$00
         txa
-.ifndef CONFIG_2
-        beq     GOIQ
-.endif
-.ifndef CONFIG_11
-        inc     JMPADRS+1
-        jmp     (JMPADRS+1)
-.else
         rts
-.endif
 
 ; ----------------------------------------------------------------------------
 ; "LEN" FUNCTION
@@ -707,11 +648,7 @@ ASC:
         ldy     #$00
         lda     (INDEX),y
         tay
-.ifndef CONFIG_11A
-        jmp     SNGFLT1
-.else
         jmp     SNGFLT
-.endif
 ; ----------------------------------------------------------------------------
 GOIQ:
         jmp     IQERR