Fixed problem with empty for() condition and non-empty increment. Closes #488

src/main/fragment/cache/fragment-cache-mos6502.asm

@@ -1,4 +1,4 @@
-//KICKC FRAGMENT CACHE 160b015f22
+//KICKC FRAGMENT CACHE 160b017651
 //FRAGMENT vbuz1=vbuc1
 lda #{c1}
 sta {z1}

src/main/fragment/cache/fragment-cache-mos6502x.asm

@@ -1,4 +1,6 @@
-//KICKC FRAGMENT CACHE 160b015f22
+//KICKC FRAGMENT CACHE 160b017651
+//FRAGMENT _deref_pbuc1=_inc__deref_pbuc1
+inc {c1}
 //FRAGMENT vbuz1=vbuc1
 lda #{c1}
 sta {z1}
@@ -1611,8 +1613,6 @@ lda #<{c2}
 sta {c1}
 lda #>{c2}
 sta {c1}+1
-//FRAGMENT _deref_pbuc1=_inc__deref_pbuc1
-inc {c1}
 //FRAGMENT _deref_pbuc1_lt_vbuc2_then_la1
 lda {c1}
 cmp #{c2}

src/main/java/dk/camelot64/kickc/parser/KickCLexer.java

@@ -1,4 +1,4 @@
-// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickCLexer.g4 by ANTLR 4.8
+// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickCLexer.g4 by ANTLR 4.7.2
 package dk.camelot64.kickc.parser;
 
 
@@ -13,7 +13,7 @@ import org.antlr.v4.runtime.misc.*;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class KickCLexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.8", RuntimeMetaData.VERSION); }
+	static { RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION); }
 
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =

src/main/java/dk/camelot64/kickc/parser/KickCParser.g4

@@ -202,7 +202,7 @@ switchCase:
     ;
 
 forLoop
-    : forClassicInit ';' commaExpr? ';' commaExpr? #forClassic
+    : forClassicInit ';' forClassicCondition? ';' commaExpr? #forClassic
     | (declType declPointer*)? NAME COLON expr RANGE expr  #forRange
     ;
 
@@ -211,6 +211,10 @@ forClassicInit
     | commaExpr      #forClassicInitExpr
     ;
 
+forClassicCondition
+    : commaExpr
+    ;
+
 commaExpr
     : expr #commaNone
     | commaExpr COMMA expr #commaSimple

src/main/java/dk/camelot64/kickc/parser/KickCParserBaseListener.java

@@ -1,4 +1,4 @@
-// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickCParser.g4 by ANTLR 4.8
+// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickCParser.g4 by ANTLR 4.7.2
 package dk.camelot64.kickc.parser;
 
 
@@ -1081,6 +1081,18 @@ public class KickCParserBaseListener implements KickCParserListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitForClassicInitExpr(KickCParser.ForClassicInitExprContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterForClassicCondition(KickCParser.ForClassicConditionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitForClassicCondition(KickCParser.ForClassicConditionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/dk/camelot64/kickc/parser/KickCParserBaseVisitor.java

@@ -1,4 +1,4 @@
-// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickCParser.g4 by ANTLR 4.8
+// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickCParser.g4 by ANTLR 4.7.2
 package dk.camelot64.kickc.parser;
 
 
@@ -636,6 +636,13 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitForClassicInitExpr(KickCParser.ForClassicInitExprContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitForClassicCondition(KickCParser.ForClassicConditionContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/dk/camelot64/kickc/parser/KickCParserListener.java

@@ -1,4 +1,4 @@
-// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickCParser.g4 by ANTLR 4.8
+// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickCParser.g4 by ANTLR 4.7.2
 package dk.camelot64.kickc.parser;
 
 
@@ -1029,6 +1029,16 @@ public interface KickCParserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitForClassicInitExpr(KickCParser.ForClassicInitExprContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link KickCParser#forClassicCondition}.
+	 * @param ctx the parse tree
+	 */
+	void enterForClassicCondition(KickCParser.ForClassicConditionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link KickCParser#forClassicCondition}.
+	 * @param ctx the parse tree
+	 */
+	void exitForClassicCondition(KickCParser.ForClassicConditionContext ctx);
 	/**
 	 * Enter a parse tree produced by the {@code commaNone}
 	 * labeled alternative in {@link KickCParser#commaExpr}.

src/main/java/dk/camelot64/kickc/parser/KickCParserVisitor.java

@@ -1,4 +1,4 @@
-// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickCParser.g4 by ANTLR 4.8
+// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickCParser.g4 by ANTLR 4.7.2
 package dk.camelot64.kickc.parser;
 
 
@@ -611,6 +611,12 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitForClassicInitExpr(KickCParser.ForClassicInitExprContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link KickCParser#forClassicCondition}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitForClassicCondition(KickCParser.ForClassicConditionContext ctx);
 	/**
 	 * Visit a parse tree produced by the {@code commaNone}
 	 * labeled alternative in {@link KickCParser#commaExpr}.

src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java

@@ -1521,10 +1521,10 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       StatementLabel repeatTarget = new StatementLabel(beginJumpLabel.getRef(), StatementSource.forClassic(ctx), comments);
       addStatement(repeatTarget);
       // Add condition
-      final KickCParser.CommaExprContext conditionCtx = ctx.commaExpr(0);
+      KickCParser.ForClassicConditionContext conditionCtx = ctx.forClassicCondition();
       RValue conditionRvalue = null;
       if(conditionCtx!=null) {
-         conditionRvalue = addCondition(conditionCtx, StatementSource.forClassic(ctx));
+         conditionRvalue = addCondition(conditionCtx.commaExpr(), StatementSource.forClassic(ctx));
       }
       // Add jump if condition was met
       Statement doJmpStmt;
@@ -1544,7 +1544,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       addLoopBody(stmtForCtx.stmt());
       // Add increment
       addLoopContinueLabel(loopStack.peek(), ctx);
-      KickCParser.CommaExprContext incrementCtx = ctx.commaExpr(1);
+      KickCParser.CommaExprContext incrementCtx = ctx.commaExpr();
       if(incrementCtx != null) {
          PrePostModifierHandler.addPreModifiers(this, incrementCtx, StatementSource.forClassic(ctx));
          this.visit(incrementCtx);

src/test/java/dk/camelot64/kickc/test/TestPrograms.java

@@ -44,7 +44,7 @@ public class TestPrograms {
 
    @Test
    public void testForEver2() throws IOException, URISyntaxException {
-      compileAndCompare("for-ever-2.c", log());
+      compileAndCompare("for-ever-2.c");
    }
 
    @Test

src/test/ref/for-ever-2.asm

@@ -0,0 +1,14 @@
+// Test a for() loop that runs forever
+.pc = $801 "Basic"
+:BasicUpstart(main)
+.pc = $80d "Program"
+  .label SCREEN = $400
+main: {
+    ldx #0
+  __b1:
+    // SCREEN[i]++;
+    inc SCREEN,x
+    // for (char i=0;;i++)
+    inx
+    jmp __b1
+}

src/test/ref/for-ever-2.cfg

@@ -0,0 +1,10 @@
+
+(void()) main()
+main: scope:[main]  from
+  [0] phi()
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
+  [1] (byte) main::i#2 ← phi( main/(byte) 0 main::@1/(byte) main::i#1 )
+  [2] *((const nomodify byte*) SCREEN + (byte) main::i#2) ← ++ *((const nomodify byte*) SCREEN + (byte) main::i#2)
+  [3] (byte) main::i#1 ← ++ (byte) main::i#2
+  to:main::@1

src/test/ref/for-ever-2.log

@@ -0,0 +1,206 @@
+
+CONTROL FLOW GRAPH SSA
+
+(void()) main()
+main: scope:[main]  from __start
+  (byte) main::i#0 ← (byte) 0
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
+  (byte) main::i#2 ← phi( main/(byte) main::i#0 main::@1/(byte) main::i#1 )
+  *((const nomodify byte*) SCREEN + (byte) main::i#2) ← ++ *((const nomodify byte*) SCREEN + (byte) main::i#2)
+  (byte) main::i#1 ← ++ (byte) main::i#2
+  to:main::@1
+main::@return: scope:[main]  from
+  return 
+  to:@return
+
+(void()) __start()
+__start: scope:[__start]  from
+  call main 
+  to:__start::@1
+__start::@1: scope:[__start]  from __start
+  to:__start::@return
+__start::@return: scope:[__start]  from __start::@1
+  return 
+  to:@return
+
+SYMBOL TABLE SSA
+(const nomodify byte*) SCREEN = (byte*)(number) $400
+(void()) __start()
+(label) __start::@1
+(label) __start::@return
+(void()) main()
+(label) main::@1
+(label) main::@return
+(byte) main::i
+(byte) main::i#0
+(byte) main::i#1
+(byte) main::i#2
+
+Simplifying constant pointer cast (byte*) 1024
+Successful SSA optimization PassNCastSimplification
+Constant (const byte) main::i#0 = 0
+Successful SSA optimization Pass2ConstantIdentification
+Removing unused block main::@return
+Successful SSA optimization Pass2EliminateUnusedBlocks
+Removing unused procedure __start
+Removing unused procedure block __start
+Removing unused procedure block __start::@1
+Removing unused procedure block __start::@return
+Successful SSA optimization PassNEliminateEmptyStart
+Inlining constant with var siblings (const byte) main::i#0
+Constant inlined main::i#0 = (byte) 0
+Successful SSA optimization Pass2ConstantInlining
+Adding NOP phi() at start of main
+CALL GRAPH
+
+Created 1 initial phi equivalence classes
+Coalesced [4] main::i#3 ← main::i#1
+Coalesced down to 1 phi equivalence classes
+Adding NOP phi() at start of main
+
+FINAL CONTROL FLOW GRAPH
+
+(void()) main()
+main: scope:[main]  from
+  [0] phi()
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
+  [1] (byte) main::i#2 ← phi( main/(byte) 0 main::@1/(byte) main::i#1 )
+  [2] *((const nomodify byte*) SCREEN + (byte) main::i#2) ← ++ *((const nomodify byte*) SCREEN + (byte) main::i#2)
+  [3] (byte) main::i#1 ← ++ (byte) main::i#2
+  to:main::@1
+
+
+VARIABLE REGISTER WEIGHTS
+(void()) main()
+(byte) main::i
+(byte) main::i#1 22.0
+(byte) main::i#2 22.0
+
+Initial phi equivalence classes
+[ main::i#2 main::i#1 ]
+Complete equivalence classes
+[ main::i#2 main::i#1 ]
+Allocated zp[1]:2 [ main::i#2 main::i#1 ]
+
+INITIAL ASM
+Target platform is c64basic / MOS6502X
+  // File Comments
+// Test a for() loop that runs forever
+  // Upstart
+.pc = $801 "Basic"
+:BasicUpstart(main)
+.pc = $80d "Program"
+  // Global Constants & labels
+  .label SCREEN = $400
+  // main
+main: {
+    .label i = 2
+    // [1] phi from main to main::@1 [phi:main->main::@1]
+  __b1_from_main:
+    // [1] phi (byte) main::i#2 = (byte) 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 
+    lda #0
+    sta.z i
+    jmp __b1
+    // main::@1
+  __b1:
+    // [2] *((const nomodify byte*) SCREEN + (byte) main::i#2) ← ++ *((const nomodify byte*) SCREEN + (byte) main::i#2) -- pbuc1_derefidx_vbuz1=_inc_pbuc1_derefidx_vbuz1 
+    ldx.z i
+    inc SCREEN,x
+    // [3] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
+    inc.z i
+    // [1] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  __b1_from___b1:
+    // [1] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@1->main::@1#0] -- register_copy 
+    jmp __b1
+}
+  // File Data
+
+REGISTER UPLIFT POTENTIAL REGISTERS
+Potential registers zp[1]:2 [ main::i#2 main::i#1 ] : zp[1]:2 , reg byte a , reg byte x , reg byte y , 
+
+REGISTER UPLIFT SCOPES
+Uplift Scope [main] 44: zp[1]:2 [ main::i#2 main::i#1 ] 
+Uplift Scope [] 
+
+Uplifting [main] best 170 combination reg byte x [ main::i#2 main::i#1 ] 
+Uplifting [] best 170 combination 
+
+ASSEMBLER BEFORE OPTIMIZATION
+  // File Comments
+// Test a for() loop that runs forever
+  // Upstart
+.pc = $801 "Basic"
+:BasicUpstart(main)
+.pc = $80d "Program"
+  // Global Constants & labels
+  .label SCREEN = $400
+  // main
+main: {
+    // [1] phi from main to main::@1 [phi:main->main::@1]
+  __b1_from_main:
+    // [1] phi (byte) main::i#2 = (byte) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
+    ldx #0
+    jmp __b1
+    // main::@1
+  __b1:
+    // [2] *((const nomodify byte*) SCREEN + (byte) main::i#2) ← ++ *((const nomodify byte*) SCREEN + (byte) main::i#2) -- pbuc1_derefidx_vbuxx=_inc_pbuc1_derefidx_vbuxx 
+    inc SCREEN,x
+    // [3] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
+    inx
+    // [1] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  __b1_from___b1:
+    // [1] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@1->main::@1#0] -- register_copy 
+    jmp __b1
+}
+  // File Data
+
+ASSEMBLER OPTIMIZATIONS
+Removing instruction jmp __b1
+Succesful ASM optimization Pass5NextJumpElimination
+Removing instruction __b1_from_main:
+Removing instruction __b1_from___b1:
+Succesful ASM optimization Pass5UnusedLabelElimination
+
+FINAL SYMBOL TABLE
+(const nomodify byte*) SCREEN = (byte*) 1024
+(void()) main()
+(label) main::@1
+(byte) main::i
+(byte) main::i#1 reg byte x 22.0
+(byte) main::i#2 reg byte x 22.0
+
+reg byte x [ main::i#2 main::i#1 ]
+
+
+FINAL ASSEMBLER
+Score: 140
+
+  // File Comments
+// Test a for() loop that runs forever
+  // Upstart
+.pc = $801 "Basic"
+:BasicUpstart(main)
+.pc = $80d "Program"
+  // Global Constants & labels
+  .label SCREEN = $400
+  // main
+main: {
+    // [1] phi from main to main::@1 [phi:main->main::@1]
+    // [1] phi (byte) main::i#2 = (byte) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
+    ldx #0
+    // main::@1
+  __b1:
+    // SCREEN[i]++;
+    // [2] *((const nomodify byte*) SCREEN + (byte) main::i#2) ← ++ *((const nomodify byte*) SCREEN + (byte) main::i#2) -- pbuc1_derefidx_vbuxx=_inc_pbuc1_derefidx_vbuxx 
+    inc SCREEN,x
+    // for (char i=0;;i++)
+    // [3] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
+    inx
+    // [1] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+    // [1] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@1->main::@1#0] -- register_copy 
+    jmp __b1
+}
+  // File Data
+

src/test/ref/for-ever-2.sym

@@ -0,0 +1,8 @@
+(const nomodify byte*) SCREEN = (byte*) 1024
+(void()) main()
+(label) main::@1
+(byte) main::i
+(byte) main::i#1 reg byte x 22.0
+(byte) main::i#2 reg byte x 22.0
+
+reg byte x [ main::i#2 main::i#1 ]