From 3c4bdcfda86e53a467018f5b99cd93f376a29e29 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Fri, 17 Oct 2008 06:53:38 +0000
Subject: [PATCH] cleanup

---
 apple_extra.s   |  4 ++--
 defines_apple.s | 10 ++--------
 defines_cbm.s   | 34 ++++++++++------------------------
 init.s          |  5 +----
 string.s        |  7 ++-----
 5 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/apple_extra.s b/apple_extra.s
index 7e41650..98172b1 100644
--- a/apple_extra.s
+++ b/apple_extra.s
@@ -115,7 +115,7 @@ L29F9:
 		.byte   $02,$FA,$00 
         lda     $12
         beq     L2A0E
-        jmp     (L0008)
+        jmp     (GOGIVEAYF)
 L2A0E:
         jsr     LF689
         .byte   $15,$BC,$08,$10,$52,$45,$75,$10
@@ -123,6 +123,6 @@ L2A0E:
         .byte   $45,$75,$10,$D4,$00,$55,$15,$0E
         .byte   $08,$10,$89,$10,$75,$15,$1C,$08
         .byte   $10,$1F,$10,$75,$00 
-        jmp     (L0008)
+        jmp     (GOGIVEAYF)
 ; ----------------------------------------------------------------------------
         .byte   0,0,0,0,0,0
diff --git a/defines_apple.s b/defines_apple.s
index 7a674de..ea17b17 100644
--- a/defines_apple.s
+++ b/defines_apple.s
@@ -1,10 +1,10 @@
 ; http://apple2.org.za/gswv/a2zine/GS.WorldView/Resources/GS.TECH.INFO/AppleSoft/
 
 CONFIG_11 := 1
+CONFIG_IO_MSB := 1 ; all I/O has bit #7 set
+CONFIG_PRINT_CR := 1 ; print CR when line end reached
 CONFIG_SAFE_NAMENOTFOUND := 1
 CONFIG_SCRTCH_ORDER := 3
-CONFIG_PRINT_CR := 1 ; print CR when line end reached
-CONFIG_IO_MSB := 1 ; all I/O has bit #7 set
 ; INPUTBUFFER > $0100
 
 CRLF_1 := CR
@@ -16,7 +16,6 @@ JMPADRS = DSCLEN + 1
 LOWTRX = LOWTR
 
 GORESTART       := $0000
-L0001           := $000B
 GOSTROUT        := $0003
 GOAYINT         := $0006
 GOGIVEAYF       := $0008
@@ -32,7 +31,6 @@ SUBFLG          := $0014
 INPUTFLG        := $0015
 CPRMASK         := $0016
 Z14             := $0017                        ; Ctrl+O flag
-Z15             := $0018
 POSX            := $0050
 Z17             := $0051
 Z18             := $0052
@@ -61,7 +59,3 @@ LFD6A := $FD6A
 LFECD	:= $FECD
 LFEFD	:= $FEFD
 
-L0008 := $08
-L0006 := $06
-L000A := $0A
-L00A4 := $A4
diff --git a/defines_cbm.s b/defines_cbm.s
index 8d388a0..8c46e61 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -1,27 +1,26 @@
 .ifdef CBM1
-CONFIG_CBM_ALL := 1
+
+CONFIG_BUG_GET_ERROR := 1; treat GET error like READ error
 CONFIG_CBM1_PATCHES := 1 ; ** don't turn off! **
 CONFIG_DATAFLAG := 1
-CONFIG_BUG_GET_ERROR := 1; treat GET error like READ error
+CONFIG_INPUTBUFFER_ORDER := 1 ; ldx/ldy or ldy/ldx
 CONFIG_PRINTNULLS := 1; whether PRINTNULLS does anything
 CONFIG_SPC_IS_CRSR_RIGHT := 1; always print CRSR RIGHT for SPC() (otherwise only for screen output)
-; minor: just code order
-CONFIG_INPUTBUFFER_ORDER := 1 ; ldx/ldy or ldy/ldx
 .else
-CONFIG_CBM_ALL := 1
 CONFIG_11 := 1
 CONFIG_11A := 1
 CONFIG_2 := 1
 CONFIG_2A := 1
-CONFIG_NO_READ_Y_IS_ZERO_HACK := 1
-CONFIG_PEEK_SAVE_LINNUM := 1
 CONFIG_DATAFLAG := 1
 CONFIG_EASTER_EGG := 1
-; CONFIG_SMALL := 1 ; test :-) 
+CONFIG_NO_READ_Y_IS_ZERO_HACK := 1
+CONFIG_PEEK_SAVE_LINNUM := 1
 ; INPUTBUFFER > $0100
 .endif
 
 ; common:
+CONFIG_CBM_ALL := 1
+
 CONFIG_FILE := 1; support PRINT#, INPUT#, GET#, CMD
 CONFIG_NO_CR := 1; terminal doesn't need explicit CRs on line ends
 CONFIG_NO_LINE_EDITING := 1; support for "@", "_", BEL etc.
@@ -39,17 +38,10 @@ LOWTRX = LOWTR
 USR				:= $0000
 GORESTART       := $0000
 INPUTBUFFERX    := $0000
-L0001           := $0001
-L0002           := $0002
-GOSTROUT        := $0003
 Z03				:= $0003 ; same
-GOAYINT         := $0006
-GOGIVEAYF       := $0008
 
 Z15             := $0004
 POSX            := $0005
-Z17             := $0006
-Z18             := $0007
 LINNUM          := $0008
 TXPSV			:= $0008
 INPUTBUFFER     := $000A
@@ -65,6 +57,8 @@ INPUTFLG        := $0062
 CPRMASK         := $0063
 Z14             := $0064                        ; Ctrl+O flag
 Z96				:= $020C
+
+NULL_MAX		:= $0A
 .else
 
 ZP_START = $13
@@ -74,10 +68,6 @@ LOWTRX = LOWTR
 
 USR				:= $0000
 GORESTART       := $0000
-L0001           := $0001
-L0002           := $0002
-GOSTROUT        := $0003
-Z15             := $0004
 CHARAC          := $005A-82-5
 ENDCHR          := $005B-82-5
 EOLPNTR         := $005C-82-5
@@ -89,10 +79,6 @@ INPUTFLG        := $0062-82-5
 CPRMASK         := $0063-82-5
 Z14             := $0064-82-5                        ; Ctrl+O flag
 
-Z17             := $0006
-GOAYINT         := $0006
-Z18             := $0007
-GOGIVEAYF       := $0008
 Z03				:= $000E;3 ; same
 LINNUM          := $0011;0008
 
@@ -111,7 +97,6 @@ STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $3E
 STACK_TOP		:= $FA
 .endif
-NULL_MAX		:= $0A
 
 RAMSTART2		:= $0400
 
@@ -131,6 +116,7 @@ ISCNTC	:= $FFE1
 GETIN	:= $FFE4
 CLALL	:= $FFE7
 
+; for CBM1
 LE7F3	:= $E7F3
 
 MONCOUT	:= CHROUT
diff --git a/init.s b/init.s
index d1dd7b0..a20f8e1 100644
--- a/init.s
+++ b/init.s
@@ -59,10 +59,7 @@ COLD_START2:
         sta     GOSTROUT
         sta     JMPADRS
   .endif
-  .ifdef APPLE
-        sta     L000A
-  .endif
-  .if .def(CONFIG_SMALL) || .def(MICROTAN)
+  .if .def(CONFIG_SMALL) || .def(MICROTAN) || .def(APPLE)
         sta     USR
   .endif
 
diff --git a/string.s b/string.s
index ed7f185..9e2a45f 100644
--- a/string.s
+++ b/string.s
@@ -263,15 +263,12 @@ L3376:
 .endif
         iny
         lda     (INDEX),y
-.ifdef KBD
-        ldy     #$00
-.endif
 .ifdef CBM1
         jsr     LE7F3
 .else
-.ifndef CONFIG_SMALL
+  .ifndef OSI
         ldy     #$00
-.endif
+  .endif
         asl     a
         adc     #$05
 .endif