From 309b714632cdf9185ee00e13a0eb35abdc9274ce Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sun, 12 Oct 2008 19:54:16 +0000
Subject: [PATCH] cleanup

---
 defines_apple.s |  4 ----
 defines_cbm.s   |  4 ----
 defines_kbd.s   |  4 ----
 defines_kim.s   |  4 ----
 defines_osi.s   |  4 ----
 msbasic.s       | 18 ++++++++++++++++++
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/defines_apple.s b/defines_apple.s
index 4ffd83d..eea3d0b 100644
--- a/defines_apple.s
+++ b/defines_apple.s
@@ -48,10 +48,6 @@ MONCOUT         := $FDED
 STACK_TOP		:= $F8
 SPACE_FOR_GOSUB := $36
 NUM_TOKENS		:= $1C
-BYTES_PER_ELEMENT := 6 ; ??? should be 5 on Apple
-BYTES_PER_VARIABLE := 7
-BYTES_FP		:= 5
-MANTISSA_BYTES	:= BYTES_FP-1
 MAX_EXPON = 10
 
 RAMSTART3	:= $2A00
diff --git a/defines_cbm.s b/defines_cbm.s
index 24a1d52..ffc185d 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -96,10 +96,6 @@ STACK_TOP		:= $FA
 .endif
 NUM_TOKENS		:= $23
 NULL_MAX		:= $0A
-BYTES_PER_ELEMENT := 5
-BYTES_PER_VARIABLE := 7
-BYTES_FP		:= 5
-MANTISSA_BYTES	:= BYTES_FP-1
 .ifdef CBM1
 MAX_EXPON = 12
 .else
diff --git a/defines_kbd.s b/defines_kbd.s
index 906a10f..ae75272 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -54,10 +54,6 @@ STACK_TOP		:= $FE
 SPACE_FOR_GOSUB := $49
 NUM_TOKENS		:= $1D
 NULL_MAX		:= $0A
-BYTES_PER_ELEMENT := 4
-BYTES_PER_VARIABLE := 6
-BYTES_FP		:= 4
-MANTISSA_BYTES	:= BYTES_FP-1
 MAX_EXPON = 10
 
 RAMSTART3		:= $0300
diff --git a/defines_kim.s b/defines_kim.s
index 0045f19..484c0b6 100644
--- a/defines_kim.s
+++ b/defines_kim.s
@@ -47,9 +47,5 @@ STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $36
 NUM_TOKENS		:= $1D
 NULL_MAX		:= $F2 ; probably different in original version; the image I have seems to be modified; see PDF
-BYTES_PER_ELEMENT := 5
-BYTES_PER_VARIABLE := 7
-BYTES_FP		:= 5
-MANTISSA_BYTES	:= BYTES_FP-1
 MAX_EXPON = 10
 
diff --git a/defines_osi.s b/defines_osi.s
index d6d1ca2..2e6bf4c 100644
--- a/defines_osi.s
+++ b/defines_osi.s
@@ -51,10 +51,6 @@ STACK_TOP		:= $FC
 SPACE_FOR_GOSUB := $33
 NUM_TOKENS		:= $1C
 NULL_MAX		:= $0A
-BYTES_PER_ELEMENT := 4
-BYTES_PER_VARIABLE := 6
-BYTES_FP		:= 4
-MANTISSA_BYTES	:= BYTES_FP-1
 MAX_EXPON = 10
 
 RAMSTART3		:= $0300
diff --git a/msbasic.s b/msbasic.s
index 9f35a11..674c6d6 100644
--- a/msbasic.s
+++ b/msbasic.s
@@ -22,6 +22,24 @@ KBD := 1
 .include "defines_kbd.s" ; 10
 .endif
 
+.ifdef CONFIG_SMALL
+BYTES_FP		:= 4
+BYTES_PER_ELEMENT := 4
+BYTES_PER_VARIABLE := 6
+.else
+BYTES_FP		:= 5
+.ifdef APPLE
+BYTES_PER_ELEMENT := 6 ; ??? should be 5 on Apple
+.else
+BYTES_PER_ELEMENT := 5
+.endif
+BYTES_PER_VARIABLE := 7
+
+
+.endif
+
+MANTISSA_BYTES	:= BYTES_FP-1
+
 BYTES_PER_FRAME := 2*BYTES_FP+8
 FOR_STACK1		:= 2*BYTES_FP+5
 FOR_STACK2		:= BYTES_FP+4