From 63e7c2e4a8fe7bb94f063dd93ee7509ce9385b71 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Thu, 9 Oct 2008 10:35:37 +0000
Subject: [PATCH] cleanup

---
 defines_cbm.s |  5 ++++
 defines_kbd.s |  1 +
 defines_kim.s |  1 +
 defines_osi.s |  1 +
 msbasic.s     | 69 ++++++++-------------------------------------------
 5 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/defines_cbm.s b/defines_cbm.s
index 29a5f55..ab18960 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -190,6 +190,11 @@ BYTES_PER_ELEMENT := 5
 BYTES_PER_VARIABLE := 7
 BYTES_FP		:= 5
 MANTISSA_BYTES	:= BYTES_FP-1
+.ifdef CBM1
+MAX_EXPON = 12
+.else
+MAX_EXPON = 10
+.endif
 
 RAMSTART2		:= $0400
 RAMSTART3		:= $0400
diff --git a/defines_kbd.s b/defines_kbd.s
index d72df8b..1e18db4 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -109,6 +109,7 @@ BYTES_PER_ELEMENT := 4
 BYTES_PER_VARIABLE := 6
 BYTES_FP		:= 4
 MANTISSA_BYTES	:= BYTES_FP-1
+MAX_EXPON = 10
 
 RAMSTART3		:= $0300
 CONST_MEMSIZ	:= $3FFF
diff --git a/defines_kim.s b/defines_kim.s
index 7201033..704e1e8 100644
--- a/defines_kim.s
+++ b/defines_kim.s
@@ -100,6 +100,7 @@ BYTES_PER_ELEMENT := 5
 BYTES_PER_VARIABLE := 7
 BYTES_FP		:= 5
 MANTISSA_BYTES	:= BYTES_FP-1
+MAX_EXPON = 10
 
 TOKEN_GOTO		:= $88
 TOKEN_GOSUB		:= $8C
diff --git a/defines_osi.s b/defines_osi.s
index 0616fee..1bc0ed4 100644
--- a/defines_osi.s
+++ b/defines_osi.s
@@ -106,6 +106,7 @@ 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 5312660..0cf81fe 100644
--- a/msbasic.s
+++ b/msbasic.s
@@ -1436,11 +1436,7 @@ LC721:
 .endif
         bne     SYNERR1
         jsr     CHRGET
-.ifdef KBD
-        lda     #$9E
-.else
-        lda     #$A4
-.endif
+        lda     #TOKEN_TO
         jsr     SYNCHR
         jmp     GOTO
 .endif
@@ -5455,15 +5451,7 @@ STORE_FAC_IN_TEMP2_ROUNDED:
         ldx     #TEMP2
         .byte   $2C
 STORE_FAC_IN_TEMP1_ROUNDED:
-.ifdef CBM_KBD
-.ifdef KBD
-        ldx     #$54
-.else
-        ldx     #TEMP1
-.endif
-.else
-        ldx     #$A4; XXX
-.endif
+        ldx     #TEMP1+(5-BYTES_FP)
         ldy     #$00
         beq     STORE_FAC_AT_YX_ROUNDED
 SETFOR:
@@ -5778,18 +5766,13 @@ ADDACC:
         jmp     FADDT
 GETEXP:
         lda     EXPON
-.ifdef CBM
-.ifdef CBM2_KBD
-        cmp     #$0A
-.else
-        cmp     #$0C
-.endif
+        cmp     #MAX_EXPON
         bcc     L3C2C
-.ifdef CBM2_KBD
+.ifndef CBM1
         lda     #$64
 .endif
         bit     EXPSGN
-.ifdef CBM2_KBD
+.ifndef CBM1
         bmi     L3C3A
 .else
         bmi     LDC70
@@ -5799,14 +5782,6 @@ LDC70:
 .ifdef CBM1
         lda     #$0B
 .endif
-.else
-        cmp     #$0A
-        bcc     L3C2C
-        lda     #$64
-        bit     EXPSGN
-        bmi     L3C3A
-        jmp     OVERFLOW
-.endif
 L3C2C:
         asl     a
         asl     a
@@ -5888,7 +5863,7 @@ L3C8C:
         ldy     #>CON_BILLION
         jsr     FMULT
 .ifdef OSI_KBD
-        lda     #-6
+        lda     #-6 ; exponent adjustment
 .else
         lda     #-9
 .endif
@@ -6088,6 +6063,7 @@ DECTBL:
         .byte   $FF,$FF,$FF,$9C,$00,$00,$00,$0A
         .byte   $FF,$FF,$FF,$FF
 DECTBL_END:
+.endif
 .ifdef CBM
 		.byte	$FF,$DF,$0A,$80 ; TI$
 		.byte	$00,$03,$4B,$C0
@@ -6096,7 +6072,6 @@ DECTBL_END:
 		.byte	$FF,$FF,$FD,$A8
 		.byte	$00,$00,$00,$3C
 .endif
-.endif
 .ifdef CBM2_KBD
 C_ZERO = CON_HALF + 2
 .endif
@@ -6218,26 +6193,10 @@ POLYNOMIAL_ODD:
         sta     STRNG2
         sty     STRNG2+1
         jsr     STORE_FAC_IN_TEMP1_ROUNDED
-.ifdef CBM_KBD
-.ifdef KBD
-        lda     #$54
-.else
-        lda     #TEMP1
-.endif
-.else
-        lda     #$A4
-.endif
+        lda     #TEMP1+(5-BYTES_FP)
         jsr     FMULT
         jsr     SERMAIN
-.ifdef CBM_KBD
-.ifdef KBD
-        lda     #$54
-.else
-        lda     #TEMP1
-.endif
-.else
-        lda     #$A4
-.endif
+        lda     #TEMP1+(5-BYTES_FP)
         ldy     #$00
         jmp     FMULT
 POLYNOMIAL:
@@ -6428,15 +6387,7 @@ TAN:
         ldx     #TEMP3
         ldy     #$00
         jsr     GOMOVMF
-.ifndef OSI
-.ifdef KBD
-        lda     #$54
-.else
-        lda     #TEMP1
-.endif
-.else
-        lda     #$A4
-.endif
+        lda     #TEMP1+(5-BYTES_FP)
         ldy     #$00
         jsr     LOAD_FAC_FROM_YA
         lda     #$00