From 01672d36d8feea92c83e32905eeab4d2f657a1b9 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sun, 19 Oct 2008 23:49:16 +0000
Subject: [PATCH] cleanup

---
 float.s |  4 +---
 flow1.s | 13 ++++++++-----
 flow2.s |  4 ++--
 init.s  | 12 +++++++-----
 print.s |  4 +---
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/float.s b/float.s
index f070bff..220e1fd 100644
--- a/float.s
+++ b/float.s
@@ -525,9 +525,7 @@ FMULTT:
 .ifndef CONFIG_11
         beq     L3903
 .else
-        bne     L3876
-        jmp     L3903
-L3876:
+        jeq     L3903
 .endif
         jsr     ADD_EXPONENTS
         lda     #$00
diff --git a/flow1.s b/flow1.s
index aff85cc..593e814 100644
--- a/flow1.s
+++ b/flow1.s
@@ -100,14 +100,14 @@ LC6D4:
 L2683:
         lda     (TXTPTR),y
 .ifndef CONFIG_11
-        beq     LA5DC
+        beq     LA5DC	; old: 1 cycle more on generic case
         cmp     #$3A
         beq     NEWSTT2
 SYNERR1:
         jmp     SYNERR
 LA5DC:
 .else
-        bne     COLON
+        bne     COLON; new: 1 cycle more on ":" case
 .endif
         ldy     #$02
         lda     (TXTPTR),y
@@ -151,9 +151,9 @@ EXECUTE_STATEMENT:
 EXECUTE_STATEMENT1:
         sbc     #$80
 .ifndef CONFIG_11
-        jcc     LET
+        jcc     LET	; old: 1 cycle more on instr.
 .else
-        bcc     LET1
+        bcc     LET1; new: 1 cycle more on assignment
 .endif
         cmp     #NUM_TOKENS
 .ifdef CONFIG_2
@@ -168,16 +168,19 @@ EXECUTE_STATEMENT1:
         lda     TOKEN_ADDRESS_TABLE,y
         pha
         jmp     CHRGET
+
 .ifdef CONFIG_11
 LET1:
         jmp     LET
+
 COLON:
         cmp     #$3A
         beq     NEWSTT2
 SYNERR1:
         jmp     SYNERR
 .endif
-.ifdef CONFIG_2
+
+.ifdef CONFIG_2; GO TO
 LC721:
         cmp     #TOKEN_GO-$80
         bne     SYNERR1
diff --git a/flow2.s b/flow2.s
index 2e15be3..5ba8bea 100644
--- a/flow2.s
+++ b/flow2.s
@@ -152,10 +152,10 @@ L2866:
         iny
         cmp     #$22
 .ifndef CONFIG_11
-        beq     L285E
+        beq     L285E; old: swap & cont is faster
         bne     L2866
 .else
-        bne     L2866
+        bne     L2866; new: cont is faster
         beq     L285E
 .endif
 
diff --git a/init.s b/init.s
index 0acc37a..3dbc919 100644
--- a/init.s
+++ b/init.s
@@ -111,7 +111,7 @@ COLD_START:
 .endif
 L4098:
         lda     GENERIC_CHRGET-1,x
-        sta     STRNG2+1,x
+        sta     CHRGET-1,x
         dex
         bne     L4098
 .ifdef CONFIG_2
@@ -193,18 +193,20 @@ L40D7:
         bne     L40DD
         inc     LINNUM+1
 .ifdef CBM1
+; CBM: hard RAM top limit is $8000
         lda     LINNUM+1
         cmp     #$80
         beq     L40FA
 .endif
 .ifdef CBM2
+; optimized version of the CBM1 code
         bmi     L40FA
 .endif
 L40DD:
 .ifdef CONFIG_2
-        lda     #$55
+        lda     #$55 ; 01010101 / 10101010
 .else
-        lda     #$92
+        lda     #$92 ; 10010010 / 00100100
 .endif
         sta     (LINNUM),y
         cmp     (LINNUM),y
@@ -216,10 +218,10 @@ L40DD:
         beq     L40D7
 .else
   .ifndef CONFIG_11
-        beq     L40D7
+        beq     L40D7; old: faster
         bne     L40FA
   .else
-        bne     L40FA
+        bne     L40FA; new: slower
         beq     L40D7
   .endif
 L40EE:
diff --git a/print.s b/print.s
index f25e50f..7da6eeb 100644
--- a/print.s
+++ b/print.s
@@ -197,9 +197,7 @@ L29F5:
         bcc     L2A09
 .else
   .ifdef CONFIG_11
-        beq     L1185
-        jmp     SYNERR
-L1185:
+        jne     SYNERR
   .else
         bne     SYNERR4
   .endif