From 2485bf1e28b687ff5b93fdcb1624295554e17c20 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sat, 18 Oct 2008 21:39:50 +0000
Subject: [PATCH] cleanup

---
 TODO.txt        |  3 ++-
 defines_apple.s |  1 +
 defines_cbm1.s  |  2 +-
 float.s         |  3 ++-
 flow1.s         |  2 +-
 init.s          | 66 ++++++++++++++++++++++++-------------------------
 6 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index aad9ece..d49a61f 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -11,4 +11,5 @@
 * there must be no platform ifdefs in generic files
 * reconstruct pre-CBM1, i.e. CBM1 without the patches
 * add some comments to every file
-* clean up all CONFIG_*, maybe some should go away
\ No newline at end of file
+* clean up all CONFIG_*, maybe some should go away
+* look for all || and && and convert them into CONFIG_*
\ No newline at end of file
diff --git a/defines_apple.s b/defines_apple.s
index 9fdced2..856a67c 100644
--- a/defines_apple.s
+++ b/defines_apple.s
@@ -3,6 +3,7 @@
 ; configuration
 CONFIG_11 := 1
 
+APPLE_BAD_BYTE := 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
diff --git a/defines_cbm1.s b/defines_cbm1.s
index f8e65eb..083a881 100644
--- a/defines_cbm1.s
+++ b/defines_cbm1.s
@@ -15,7 +15,7 @@
 ;CONFIG_PRINTNULLS := 1; whether PRINTNULLS does anything
 ;CONFIG_PRINT_CR := 1 ; print CR when line end reached
 ;CONFIG_RAM := 1
-;CONFIG_ROR_WORKAROUND := 1
+;CONFIG_ROR_WORKAROUND := 1; doesn't work with CONFIG_SMALL!
 ;CONFIG_SAFE_NAMENOTFOUND := 1
 ;CONFIG_SCRTCH_ORDER := 1
 ;CONFIG_SCRTCH_ORDER := 2
diff --git a/float.s b/float.s
index 7caaf68..2856335 100644
--- a/float.s
+++ b/float.s
@@ -582,7 +582,8 @@ L38C3:
 .ifndef CONFIG_ROR_WORKAROUND
         ror     RESULT
         ror     RESULT+1
-.ifdef APPLE
+.ifdef APPLE_BAD_BYTE
+; this seems to be a bad byte in the dump
 		.byte	RESULT+2,RESULT+2 ; XXX BUG!
 .else
         ror     RESULT+2
diff --git a/flow1.s b/flow1.s
index 302b573..aff85cc 100644
--- a/flow1.s
+++ b/flow1.s
@@ -296,7 +296,7 @@ LE68E:
         rts
 .endif
 
-.if .def(CONFIG_NULL) || .def(CBM1)
+.if .def(CONFIG_NULL) || .def(CONFIG_PRINTNULLS)
 ; CBM1 has the keyword removed,
 ; but the code is still here
 NULL:
diff --git a/init.s b/init.s
index 40425b9..adca21f 100644
--- a/init.s
+++ b/init.s
@@ -212,7 +212,7 @@ L40DD:
 .ifdef CONFIG_CBM_ALL
         beq     L40D7
 .else
-  .ifdef CONFIG_SMALL
+  .ifndef CONFIG_11
         beq     L40D7
         bne     L40FA
   .else
@@ -365,76 +365,76 @@ L4192:
         jmp     (GORESTART+1)
 .endif
 
-.if .def(CONFIG_RAM) || .def(OSI)
+  .if .def(CONFIG_RAM) || .def(OSI)
 ; OSI is compiled for ROM, but but includes
 ; this unused string
 QT_WANT:
         .byte   "WANT SIN-COS-TAN-ATN"
         .byte   $00
-.endif
+  .endif
 QT_WRITTEN_BY:
-.ifndef CONFIG_CBM_ALL
-.ifdef APPLE
+  .ifndef CONFIG_CBM_ALL
+    .ifdef APPLE
 		asc80 "COPYRIGHT 1977 BY MICROSOFT CO"
 		.byte	$0D,$00
-.else
+    .else
         .byte   $0D,$0A,$0C
-.ifdef CONFIG_SMALL
+      .ifndef CONFIG_11
         .byte   "WRITTEN BY RICHARD W. WEILAND."
-.else
+      .else
         .byte   "WRITTEN BY WEILAND & GATES"
-.endif
+      .endif
         .byte   $0D,$0A,$00
-.endif
+    .endif
 QT_MEMORY_SIZE:
         .byte   "MEMORY SIZE"
         .byte   $00
 QT_TERMINAL_WIDTH:
         .byte   "TERMINAL WIDTH"
         .byte   $00
-.endif
+  .endif
 QT_BYTES_FREE:
         .byte   " BYTES FREE"
-.ifdef CBM1
-.elseif .def(CBM2)
+  .ifdef CBM1
+  .elseif .def(CBM2)
         .byte   $0D,$00
-.elseif .def(APPLE)
+  .elseif .def(APPLE)
         .byte   $00
-.else
+  .else
         .byte   $0D,$0A,$0D,$0A
-.endif
+  .endif
 QT_BASIC:
-.ifdef OSI
+  .ifdef OSI
         .byte   "OSI 6502 BASIC VERSION 1.0 REV 3.2"
-.endif
-.ifdef KIM
+  .endif
+  .ifdef KIM
         .byte   "MOS TECH 6502 BASIC V1.1"
-.endif
-.ifdef MICROTAN
+  .endif
+  .ifdef MICROTAN
         .byte   "MICROTAN BASIC"
-.endif
-.ifdef CBM1
+  .endif
+  .ifdef CBM1
         .byte   $13
         .byte   "*** COMMODORE BASIC ***"
         .byte   $11,$11,$11,$00
-.endif
-.ifdef CBM2
+  .endif
+  .ifdef CBM2
         .byte   "### COMMODORE BASIC ###"
         .byte   $0D,$0D,$00
-.endif
-.ifdef APPLE
+  .endif
+  .ifdef APPLE
         .byte   $0A,$0D,$0A
 		.byte	"APPLE BASIC V1.1"
-.endif
-.ifndef CONFIG_CBM_ALL
+  .endif
+  .ifndef CONFIG_CBM_ALL
         .byte   $0D,$0A
-.ifdef MICROTAN
+    .ifdef MICROTAN
         .byte   "(C) 1980 MICROSOFT"            ; E1F2 28 43 29 20 31 39 38 30  (C) 1980
-.else
+    .else
         .byte   "COPYRIGHT 1977 BY MICROSOFT CO."
-.endif
+    .endif
         .byte   $0D,$0A,$00
-.endif
+  .endif
 .endif /* KBD */
 
 .segment "EXTRA"