From 2972292110f729a48cc95f5f1e945b635410c3e0 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Thu, 16 Oct 2008 08:21:21 +0000
Subject: [PATCH] cleanup

---
 NOTES.txt          |  2 +-
 defines_kim.s      |  3 ++-
 defines_microtan.s |  3 ++-
 float.s            | 14 +++++++-------
 flow.s             |  1 +
 print.s            |  4 ++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/NOTES.txt b/NOTES.txt
index 331e61a..3979b45 100644
--- a/NOTES.txt
+++ b/NOTES.txt
@@ -6,4 +6,4 @@ KIM BASIC             1977     1.1            N      Y          -        CONFIG_
 Commodore BASIC 2     1979                    Y      Y         CBM       CONFIG_2
 AppleSoft II          1978                    Y      Y        Apple
 KBD BASIC             1980                    Y      N         KBD
-MicroTAN              1980                    Y      Y          -
+MicroTAN              1979                    Y      Y          -
diff --git a/defines_kim.s b/defines_kim.s
index 87359e4..bc0914b 100644
--- a/defines_kim.s
+++ b/defines_kim.s
@@ -6,7 +6,8 @@ CBM2_KIM_APPLE := 1 ; OUTDO difference
 KIM_APPLE := 1
 CONFIG_NULL := 1
 CONFIG_PRINT_CR := 1 ; print CR when line end reached
-KIM_MICROTAN := 1
+CONFIG_ROR_WORKAROUND := 1
+CONFIG_MONCOUT_DESTROYS_Y := 1
 .define CONFIG_SCRTCH_ORDER 2
 
 CRLF_1 := $0D
diff --git a/defines_microtan.s b/defines_microtan.s
index 5ca279e..82323c5 100644
--- a/defines_microtan.s
+++ b/defines_microtan.s
@@ -6,7 +6,8 @@ CBM2_KIM_APPLE := 1 ; OUTDO difference
 KIM_APPLE := 1
 CBM2_MICROTAN := 1
 KBD_MICROTAN := 1
-KIM_MICROTAN := 1
+CONFIG_ROR_WORKAROUND := 1
+CONFIG_MONCOUT_DESTROYS_Y := 1
 APPLE_MICROTAN := 1
 
 CONFIG_2 := 1
diff --git a/float.s b/float.s
index b9c033c..83cf39d 100644
--- a/float.s
+++ b/float.s
@@ -236,13 +236,13 @@ NORMALIZE_FAC5:
 NORMALIZE_FAC6:
         inc     FAC
         beq     OVERFLOW
-.ifndef KIM_MICROTAN
+.ifndef CONFIG_ROR_WORKAROUND
         ror     FAC+1
         ror     FAC+2
         ror     FAC+3
-.ifndef CONFIG_SMALL
+  .ifndef CONFIG_SMALL
         ror     FAC+4
-.endif
+  .endif
         ror     FACEXTENSION
 .else
         lda     #$00
@@ -373,7 +373,7 @@ SHIFT_RIGHT:
         tay
         lda     FACEXTENSION
         bcs     SHIFT_RIGHT5
-.ifndef KIM_MICROTAN
+.ifndef CONFIG_ROR_WORKAROUND
 LB588:
         asl     1,x
         bcc     LB58E
@@ -578,7 +578,7 @@ L38A7:
         adc     ARG+1
         sta     RESULT
 L38C3:
-.ifndef KIM_MICROTAN
+.ifndef CONFIG_ROR_WORKAROUND
         ror     RESULT
         ror     RESULT+1
 .ifdef APPLE
@@ -1225,7 +1225,7 @@ FIN3:
         beq     FIN4
         bne     FIN6
 L3BA6:
-.ifndef KIM_MICROTAN
+.ifndef CONFIG_ROR_WORKAROUND
         ror     EXPSGN
 .else
         lda     #$00
@@ -1252,7 +1252,7 @@ FIN6:
 ; FOUND A DECIMAL POINT
 ; ----------------------------------------------------------------------------
 FIN10:
-.ifndef KIM_MICROTAN
+.ifndef CONFIG_ROR_WORKAROUND
         ror     LOWTR
 .else
         lda     #$00
diff --git a/flow.s b/flow.s
index 6cd0419..af84815 100644
--- a/flow.s
+++ b/flow.s
@@ -329,6 +329,7 @@ RET1:
 PRT:
         jsr     GETBYT
         txa
+; not ROR bug safe
         ror     a
         ror     a
         ror     a
diff --git a/print.s b/print.s
index 9f79105..a403ed5 100644
--- a/print.s
+++ b/print.s
@@ -341,7 +341,7 @@ L2A4E:
 .ifndef CBM2_KBD
         pla
 .endif
-.ifdef KIM_MICROTAN
+.ifdef CONFIG_MONCOUT_DESTROYS_Y
         sty     DIMFLG
 .endif
 .ifdef CONFIG_IO_MSB
@@ -351,7 +351,7 @@ L2A4E:
 .ifdef CONFIG_IO_MSB
         and     #$7F
 .endif
-.ifdef KIM_MICROTAN
+.ifdef CONFIG_MONCOUT_DESTROYS_Y
         ldy     DIMFLG
 .endif
 .ifdef OSI