cleanup

TODO.txt

@@ -12,3 +12,4 @@
 * reconstruct pre-CBM1, i.e. CBM1 without the patches
 * add some comments to every file
 * clean up all CONFIG_*, maybe some should go away
+* look for all || and && and convert them into CONFIG_*

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

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

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

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:

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
@@ -379,7 +379,7 @@ QT_WRITTEN_BY:
 		.byte	$0D,$00
     .else
         .byte   $0D,$0A,$0C
-.ifdef CONFIG_SMALL
+      .ifndef CONFIG_11
         .byte   "WRITTEN BY RICHARD W. WEILAND."
       .else
         .byte   "WRITTEN BY WEILAND & GATES"