cleanup

TODO.txt

@@ -2,7 +2,6 @@
 * use linker magic to compile files separately
 * convert messy init code into completely different
   files without ifdefs (not much in common!)
-* generate keyword and pointer list together
 * generalize CHRGOT definition
 * rename all labels that point to RTS to RTSn
 * add AppleSoft comments

defines_apple.s

@@ -46,7 +46,6 @@ MONCOUT         := $FDED
 STACK_TOP		:= $F8
 SPACE_FOR_GOSUB := $36
 
-RAMSTART3	:= $2A00
 RAMSTART2	:= $2A00
 
 LF689 := $F689

defines_cbm.s

@@ -97,7 +97,6 @@ STACK_TOP		:= $FA
 NULL_MAX		:= $0A
 
 RAMSTART2		:= $0400
-RAMSTART3		:= $0400
 
 
 OPEN	:= $FFC0

defines_kbd.s

@@ -53,7 +53,6 @@ SAVE            := $FFF7
 STACK_TOP		:= $FE
 SPACE_FOR_GOSUB := $49
 
-RAMSTART3		:= $0300
 CONST_MEMSIZ	:= $3FFF
 
 RAMSTART2		:= $0300

defines_osi.s

@@ -50,5 +50,4 @@ STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $33
 NULL_MAX		:= $0A
 
-RAMSTART3		:= $0300
 RAMSTART2		:= $0300

msbasic.s

@@ -24,10 +24,8 @@ KBD := 1
 
 .ifdef CONFIG_SMALL
 BYTES_FP		:= 4
-BYTES_PER_VARIABLE := 6
 .else
 BYTES_FP		:= 5
-BYTES_PER_VARIABLE := 7
 .endif
 
 .ifdef APPLE
@@ -35,9 +33,8 @@ BYTES_PER_ELEMENT := 6 ; ???
 .else
 BYTES_PER_ELEMENT := BYTES_FP
 .endif
-
+BYTES_PER_VARIABLE := BYTES_FP+2
 MANTISSA_BYTES	:= BYTES_FP-1
-
 BYTES_PER_FRAME := 2*BYTES_FP+8
 FOR_STACK1		:= 2*BYTES_FP+5
 FOR_STACK2		:= BYTES_FP+4
@@ -6598,9 +6595,10 @@ POLY_ATN:
 RAMSTART1:
 GENERIC_CHRGET:
         inc     TXTPTR
-        bne     L4047
+        bne     GENERIC_CHRGOT
         inc     TXTPTR+1
-L4047:
+GENERIC_CHRGOT:
+GENERIC_TXTPTR = GENERIC_CHRGOT + 1
         lda     $EA60
 .ifdef KBD
         jsr     LF430
@@ -6900,8 +6898,8 @@ L4129:
 L4136:
 .endif
 .ifndef KIM
-        ldx     #<RAMSTART3
-        ldy     #>RAMSTART3
+        ldx     #<RAMSTART2
+        ldy     #>RAMSTART2
 .else
         lda     #<QT_WANT
         ldy     #>QT_WANT

zeropage.s

@@ -110,11 +110,10 @@ FACEXTENSION:
 STRNG2:
 	.res 2
 CHRGET:
+	.res 7
 	.res 6
-CHRGOT:
-	.res 1
-TXTPTR:
-	.res 6
+CHRGOT = GENERIC_CHRGOT-GENERIC_CHRGET + CHRGET
+TXTPTR = <(GENERIC_TXTPTR-GENERIC_CHRGET + CHRGET)
 .ifndef CONFIG_SMALL
 L00CF:
 	.res 11