Improved ASM readability

src/main/java/dk/camelot64/kickc/TODO.txt

@@ -23,7 +23,9 @@ Features
 + Add ++/-- incrementing/decrementing operators.
 
 Assembler Improvements
-- Make generated ASM human readable. Use hex-numbers, add labels for constants and zp-variables.
+- Make generated ASM human readable.
+  + Use hex-numbers
+  - add labels for constants and zp-variables.
 - Eliminate unnecessary labels in ASM
 - Eliminate CPX from DEX, CPX #0, BNE la1
 - Eliminate LDA from DEC $2, LDA $2, BNE la1

src/main/java/dk/camelot64/kickc/asm/AsmFragment.java

@@ -137,7 +137,7 @@ public class AsmFragment {
       ControlFlowBlock destinationBlock = graph.getBlock(destination);
       String destinationLabel;
       if (destinationBlock.hasPhiBlock()) {
-         destinationLabel = (destinationBlock.getLabel().getLocalName() + "_from_" + block.getLabel().getLocalName()).replace('@', 'B').replace(':', '_');
+         destinationLabel = (destinationBlock.getLabel().getLocalName() + "_from_" + block.getLabel().getLocalName()).replace('@', 'b').replace(':', '_');
       } else {
          destinationLabel = destination.getLocalName();
       }
@@ -332,7 +332,7 @@ public class AsmFragment {
             bound = String.format("$%x", boundInt.getNumber());
          }
       } else if (boundValue instanceof Label) {
-         bound = ((Label) boundValue).getFullName().replace('@', 'B').replace(':', '_');
+         bound = ((Label) boundValue).getLocalName().replace('@', 'b').replace(':', '_');
       } else {
          throw new RuntimeException("Bound Value Type not implemented " + boundValue);
       }

src/main/java/dk/camelot64/kickc/asm/AsmProcBegin.java

@@ -0,0 +1,48 @@
+package dk.camelot64.kickc.asm;
+
+/** A procedure - representing a label and a scope beginning*/
+public class AsmProcBegin implements AsmLine {
+
+   private String label;
+
+   private int index;
+
+   public AsmProcBegin(String label) {
+      this.label = label;
+   }
+
+   public String getLabel() {
+      return label;
+   }
+
+   @Override
+   public int getLineBytes() {
+      return 0;
+   }
+
+   @Override
+   public double getLineCycles() {
+      return 0;
+   }
+
+   @Override
+   public String getAsm() {
+      return label+":"+" {";
+   }
+
+   @Override
+   public int getIndex() {
+      return index;
+   }
+
+   @Override
+   public void setIndex(int index) {
+      this.index = index;
+   }
+
+   @Override
+   public String toString() {
+      return getAsm();
+   }
+
+}

src/main/java/dk/camelot64/kickc/asm/AsmProcEnd.java

@@ -0,0 +1,41 @@
+package dk.camelot64.kickc.asm;
+
+/** The end of a procedure (scope)  */
+public class AsmProcEnd implements AsmLine {
+
+   private int index;
+
+   public AsmProcEnd() {
+   }
+
+   @Override
+   public int getLineBytes() {
+      return 0;
+   }
+
+   @Override
+   public double getLineCycles() {
+      return 0;
+   }
+
+   @Override
+   public String getAsm() {
+      return "}";
+   }
+
+   @Override
+   public int getIndex() {
+      return index;
+   }
+
+   @Override
+   public void setIndex(int index) {
+      this.index = index;
+   }
+
+   @Override
+   public String toString() {
+      return getAsm();
+   }
+
+}

src/main/java/dk/camelot64/kickc/asm/AsmProgram.java

@@ -59,6 +59,14 @@ public class AsmProgram {
       addLine(new AsmLabel(label));
    }
 
+   public void addProcBegin(String label) {
+      addLine(new AsmProcBegin(label));
+   }
+
+   public void addProcEnd() {
+      addLine(new AsmProcEnd());
+   }
+
    public void addInstruction(String mnemonic, AsmAddressingMode addressingMode, String parameter) {
       AsmInstructionType instructionType = AsmInstructionSet.getInstructionType(mnemonic, addressingMode, parameter);
       addLine(new AsmInstruction(instructionType, parameter));
@@ -108,13 +116,45 @@ public class AsmProgram {
    }
 
    public String toString(boolean comments) {
+      return toString(new AsmPrintState(comments));
+   }
+
+   public String toString(AsmPrintState printState) {
       StringBuilder out = new StringBuilder();
       for (AsmSegment segment : segments) {
-         out.append(segment.toString(comments));
+         out.append(segment.toString(printState));
       }
       return out.toString();
    }
 
+   static class AsmPrintState {
+      boolean comments;
+      String indent;
+
+      public AsmPrintState(boolean comments) {
+         this.comments = comments;
+         this.indent = "";
+      }
+
+      public boolean isComments() {
+         return comments;
+      }
+
+      public void incIndent() {
+         this.indent = this.indent + "  ";
+      }
+
+      public void decIndent() {
+         this.indent = this.indent.substring(0, this.indent.length()-2);
+      }
+
+      public String getIndent() {
+         return indent;
+      }
+
+   }
+
+
    @Override
    public String toString() {
       return toString(true);
@@ -135,4 +175,5 @@ public class AsmProgram {
       }
       return statementSegments;
    }
+
 }

src/main/java/dk/camelot64/kickc/asm/AsmProgramStaticRegisterValues.java

@@ -38,6 +38,10 @@ public class AsmProgramStaticRegisterValues {
    private AsmRegisterValues updateStaticRegisterValues(AsmRegisterValues current, AsmLine line) {
       if (line instanceof AsmLabel) {
          current = new AsmRegisterValues();
+      } else if (line instanceof AsmProcBegin) {
+         current = new AsmRegisterValues();
+      } else if (line instanceof AsmProcEnd) {
+         current = new AsmRegisterValues();
       } else if (line instanceof AsmInstruction) {
          AsmInstruction instruction = (AsmInstruction) line;
          values.put(instruction, current);

src/main/java/dk/camelot64/kickc/asm/AsmSegment.java

@@ -115,10 +115,10 @@ public class AsmSegment {
       return clobber;
    }
 
-   public String toString(boolean comments) {
+   public String toString(AsmProgram.AsmPrintState printState) {
       StringBuffer out = new StringBuffer();
-      if (comments) {
-         out.append("//SEG").append(getIndex());
+      if (printState.isComments()) {
+         out.append(printState.getIndent()).append("//SEG").append(getIndex());
          if (source != null) {
             out.append(" ").append(source);
          }
@@ -129,22 +129,30 @@ public class AsmSegment {
          out.append("\n");
       }
       for (AsmLine line : lines) {
-         if (line instanceof AsmComment && !comments) {
+         if (line instanceof AsmComment && !printState.isComments()) {
             if (!((AsmComment) line).getComment().contains("Fragment")) {
                continue;
             }
          }
-         if (line instanceof AsmComment || line instanceof AsmInstruction) {
+         if(line instanceof AsmProcEnd) {
+            printState.decIndent();
+         }
+         out.append(printState.getIndent());
+         if (line instanceof AsmComment || line instanceof AsmInstruction ) {
             out.append("  ");
          }
          out.append(line.getAsm() + "\n");
+         if(line instanceof AsmProcBegin) {
+            printState.incIndent();
+         }
+
       }
       return out.toString();
    }
 
    @Override
    public String toString() {
-      return toString(true);
+      return toString(new AsmProgram.AsmPrintState(true));
    }
 
 }

src/main/java/dk/camelot64/kickc/icl/ControlFlowBlock.java

@@ -53,7 +53,7 @@ public class ControlFlowBlock {
    }
 
    public void addStatementBeforeLast(Statement statement) {
-      this.statements.add(statements.size()-1, statement);
+      this.statements.add(statements.size() - 1, statement);
    }
 
    public void setDefaultSuccessor(LabelRef defaultSuccessor) {
@@ -84,14 +84,34 @@ public class ControlFlowBlock {
       return statements;
    }
 
+
+   /**
+    * Is the block the entry of a procedure, ie. the first block of the code of the procedure.
+    * @return true if this is the entry of a procedure
+    */
+   public boolean isProcedureEntry(Program program) {
+      Symbol symbol = program.getScope().getSymbol(getLabel());
+      return (symbol instanceof Procedure);
+   }
+
+   /**
+    *  Is the block the exit of a procedure, ie. the last block of code of the the procedure
+    * @param program
+    * @return true if this is the exit of a procedure
+    */
+   public boolean isProcedureExit(Program program) {
+      return getLabel().isProcExit();
+   }
+
+
    public String toString(Program program) {
       ControlFlowGraph graph = program.getGraph();
       StringBuffer out = new StringBuffer();
-      out.append(label.getFullName() + ":" );
+      out.append(label.getFullName() + ":");
       out.append(" from");
-      if(graph!=null) {
+      if (graph != null) {
          List<ControlFlowBlock> predecessors = graph.getPredecessors(this);
-         if(predecessors.size()>0) {
+         if (predecessors.size() > 0) {
             for (ControlFlowBlock predecessor : predecessors) {
                out.append(" " + predecessor.getLabel().getFullName());
             }
@@ -101,9 +121,9 @@ public class ControlFlowBlock {
       }
       out.append("\n");
       for (Statement statement : statements) {
-         out.append("  "+statement.toString(program)+"\n");
+         out.append("  " + statement.toString(program) + "\n");
       }
-      if(defaultSuccessor!=null) {
+      if (defaultSuccessor != null) {
          out.append("  to:");
          out.append(defaultSuccessor.getFullName());
          out.append("\n");
@@ -144,10 +164,10 @@ public class ControlFlowBlock {
    @JsonIgnore
    public StatementPhiBlock getPhiBlock() {
       StatementPhiBlock phiBlock = null;
-      if(statements.size()>0 && statements.get(0) instanceof StatementPhiBlock) {
+      if (statements.size() > 0 && statements.get(0) instanceof StatementPhiBlock) {
          phiBlock = (StatementPhiBlock) statements.get(0);
       }
-      if(phiBlock==null) {
+      if (phiBlock == null) {
          phiBlock = new StatementPhiBlock();
          statements.add(0, phiBlock);
       }
@@ -155,8 +175,8 @@ public class ControlFlowBlock {
    }
 
    public boolean hasPhiBlock() {
-      if(statements.size()>0) {
-         if(statements.get(0) instanceof StatementPhiBlock) {
+      if (statements.size() > 0) {
+         if (statements.get(0) instanceof StatementPhiBlock) {
             return true;
          }
       }
@@ -171,13 +191,13 @@ public class ControlFlowBlock {
    @JsonIgnore
    public Collection<LabelRef> getSuccessors() {
       List<LabelRef> successors = new ArrayList<>();
-      if(defaultSuccessor!=null) {
+      if (defaultSuccessor != null) {
          successors.add(defaultSuccessor);
       }
-      if(conditionalSuccessor!=null) {
+      if (conditionalSuccessor != null) {
          successors.add(conditionalSuccessor);
       }
-      if(callSuccessor!=null) {
+      if (callSuccessor != null) {
          successors.add(callSuccessor);
       }
       return successors;

src/main/java/dk/camelot64/kickc/icl/SymbolRef.java

@@ -1,6 +1,7 @@
 package dk.camelot64.kickc.icl;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import dk.camelot64.kickc.passes.Pass1GenerateControlFlowGraph;
 
 /** A reference to a symbol (variable, procedure or label) */
 public class SymbolRef implements Value {
@@ -65,10 +66,17 @@ public class SymbolRef implements Value {
 
    @JsonIgnore
    public boolean isIntermediate() {
-      if(fullName.contains("@BEGIN") || fullName.contains("@END") ) return false;
+      if(
+            fullName.contains(Pass1GenerateControlFlowGraph.BEGIN_BLOCK_NAME) ||
+                  fullName.contains(Pass1GenerateControlFlowGraph.END_BLOCK_NAME) ) return false;
       return fullName.contains("$") || fullName.contains("@");
    }
 
+   @JsonIgnore
+   public boolean isProcExit() {
+      return fullName.endsWith("@return");
+   }
+
    @JsonIgnore
    public String getLocalName() {
       int lastScopeIdx = fullName.lastIndexOf("::");
@@ -102,4 +110,5 @@ public class SymbolRef implements Value {
       }
 
    }
+
 }

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

@@ -24,7 +24,7 @@ public class Pass1EliminateEmptyBlocks {
       Collection<ControlFlowBlock> blocks = graph.getAllBlocks();
       List<LabelRef> removeList = new ArrayList<>();
       for (ControlFlowBlock block : blocks) {
-         if(block.getLabel().getFullName().equals("@END")) {
+         if(block.getLabel().getFullName().equals(Pass1GenerateControlFlowGraph.END_BLOCK_NAME)) {
             continue;
          }
          if (block.getStatements().isEmpty()) {

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

@@ -9,8 +9,8 @@ import java.util.Stack;
 /** Pass that generates a control flow graph for the program */
 public class Pass1GenerateControlFlowGraph {
 
-   public static final String BEGIN_BLOCK_NAME = "@BEGIN";
-   public static final String END_BLOCK_NAME = "@END";
+   public static final String BEGIN_BLOCK_NAME = "@begin";
+   public static final String END_BLOCK_NAME = "@end";
    private Scope scope;
    private Map<LabelRef, ControlFlowBlock> blocks;
    private ControlFlowBlock firstBlock;
@@ -66,7 +66,7 @@ public class Pass1GenerateControlFlowGraph {
             blockStack.push(procBlock);
          }  else if(statement instanceof StatementProcedureEnd) {
             // Procedure strategy implemented is currently variable-based transfer of parameters/return values
-            currentBlock.setDefaultSuccessor(new Label("@RETURN", scope, false).getRef());
+            currentBlock.setDefaultSuccessor(new Label("@return", scope, false).getRef());
             ControlFlowBlock nextBlock = getOrCreateBlock(scope.addLabelIntermediate().getRef());
             blockStack.pop();
             ControlFlowBlock prevBlock = blockStack.pop();

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

@@ -45,7 +45,7 @@ public class Pass2AssertBlocks extends Pass2SsaAssertion {
          if (blockLabel == null) {
             return;
          }
-         if (blockLabel.getFullName().equals("@RETURN")) {
+         if (blockLabel.getFullName().equals("@return")) {
             return;
          }
          seenBlocks.add(blockLabel);

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

@@ -18,7 +18,7 @@ public class Pass2AssertSymbols extends Pass2SsaAssertion {
       HashSet<Symbol> codeSymbols = symbolFinder.getSymbols();
       // Check that all symbols found in the code is also oin the symbol tabel
       for (Symbol codeSymbol : codeSymbols) {
-         if(codeSymbol.getFullName().equals("@RETURN")) continue;
+         if(codeSymbol.getFullName().equals("@return")) continue;
          Symbol tableSymbol = getSymbols().getSymbol(codeSymbol.getFullName());
          if(tableSymbol==null) {
             throw new AssertionFailed("Compile process error. Symbol found in code, but not in symbol table. "+codeSymbol.getFullName());

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

@@ -32,7 +32,11 @@ public class Pass3CodeGeneration {
          genBlockEntryPoints(asm, block);
          // Generate label
          asm.startSegment(null, block.getLabel().getFullName());
-         asm.addLabel(block.getLabel().getFullName().replace('@', 'B').replace(':', '_'));
+         if(block.isProcedureEntry(program)) {
+            asm.addProcBegin(block.getLabel().getFullName().replace('@', 'b').replace(':', '_'));
+         }else {
+            asm.addLabel(block.getLabel().getLocalName().replace('@', 'b').replace(':', '_'));
+         }
          // Generate statements
          genStatements(asm, block);
          // Generate exit
@@ -41,7 +45,10 @@ public class Pass3CodeGeneration {
             if (defaultSuccessor.hasPhiBlock()) {
                genBlockPhiTransition(asm, block, defaultSuccessor);
             }
-            asm.addInstruction("JMP", AsmAddressingMode.ABS, defaultSuccessor.getLabel().getFullName().replace('@', 'B').replace(':', '_'));
+            asm.addInstruction("JMP", AsmAddressingMode.ABS, defaultSuccessor.getLabel().getLocalName().replace('@', 'b').replace(':', '_'));
+         }
+         if(block.isProcedureExit(program)) {
+            asm.addProcEnd();
          }
       }
       program.setAsm(asm);
@@ -168,7 +175,7 @@ public class Pass3CodeGeneration {
          for (ControlFlowBlock predecessor : predecessors) {
             if (block.getLabel().equals(predecessor.getConditionalSuccessor())) {
                genBlockPhiTransition(asm, predecessor, block);
-               asm.addInstruction("JMP", AsmAddressingMode.ABS, block.getLabel().getFullName().replace('@', 'B').replace(':', '_'));
+               asm.addInstruction("JMP", AsmAddressingMode.ABS, block.getLabel().getLocalName().replace('@', 'b').replace(':', '_'));
             }
          }
       }
@@ -177,7 +184,7 @@ public class Pass3CodeGeneration {
    private void genBlockPhiTransition(AsmProgram asm, ControlFlowBlock fromBlock, ControlFlowBlock toBlock) {
       Statement toFirstStatement = toBlock.getStatements().get(0);
       asm.startSegment(toFirstStatement.getIndex(), "["+toFirstStatement.getIndex()+"]"+" phi from " + fromBlock.getLabel().getFullName()+" to "+toBlock.getLabel().getFullName());
-      asm.addLabel((toBlock.getLabel().getFullName() + "_from_" + fromBlock.getLabel().getLocalName()).replace('@', 'B').replace(':', '_'));
+      asm.addLabel((toBlock.getLabel().getLocalName() + "_from_" + fromBlock.getLabel().getLocalName()).replace('@', 'b').replace(':', '_'));
       if (toBlock.hasPhiBlock()) {
          StatementPhiBlock phiBlock = toBlock.getPhiBlock();
          List<StatementPhiBlock.PhiVariable> phiVariables = new ArrayList<>(phiBlock.getPhiVariables());

src/main/java/dk/camelot64/kickc/test/ref/bresenham.asm

@@ -1,5 +1,5 @@
-BBEGIN:
-B1_from_BBEGIN:
+bbegin:
+b1_from_bbegin:
   lda #$0
   sta $5
   ldx #$c
@@ -9,8 +9,8 @@ B1_from_BBEGIN:
   sta $2
   lda #>$400
   sta $2+$1
-B1_from_B3:
-B1:
+b1_from_b3:
+b1:
   ldy #$0
   lda #$51
   sta ($2),y
@@ -24,14 +24,14 @@ B1:
   adc #$18
   tax
   cpx #$27
-  bcs B2
-B3_from_B1:
-B3:
+  bcs b2
+b3_from_b1:
+b3:
   lda $4
   cmp #$28
-  bcc B1_from_B3
-BEND:
-B2:
+  bcc b1_from_b3
+bend:
+b2:
   inc $5
   lda $2
   clc
@@ -44,5 +44,5 @@ B2:
   sec
   sbc #$27
   tax
-B3_from_B2:
-  jmp B3
+b3_from_b2:
+  jmp b3

src/main/java/dk/camelot64/kickc/test/ref/bresenham.cfg

@@ -1,10 +1,10 @@
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  [0] (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) 12 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(word) 1024 ) [ cursor#3 x#2 e#3 y#2 ]
+@1: from @3 @begin
+  [0] (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) 12 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(word) 1024 ) [ cursor#3 x#2 e#3 y#2 ]
   [1] *((byte*) cursor#3) ← (byte) 81 [ cursor#3 x#2 e#3 y#2 ]
   [2] (byte) x#1 ← (byte) x#2 + (byte) 1 [ x#1 cursor#3 e#3 y#2 ]
   [3] (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1 [ x#1 e#3 cursor#1 y#2 ]
@@ -16,8 +16,8 @@
   [6] (byte) e#5 ← phi( @1/(byte) e#1 @2/(byte) e#2 ) [ cursor#5 x#1 e#5 y#4 ]
   [6] (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 ) [ cursor#5 x#1 e#5 y#4 ]
   [7] if((byte) x#1<(byte) 40) goto @1 [ cursor#5 x#1 e#5 y#4 ]
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 @2: from @1
   [8] (byte) y#1 ← (byte) y#2 + (byte) 1 [ x#1 e#1 cursor#1 y#1 ]
   [9] (byte*) cursor#2 ← (byte*) cursor#1 + (byte) 40 [ x#1 e#1 cursor#2 y#1 ]

src/main/java/dk/camelot64/kickc/test/ref/bresenham.log

@@ -97,7 +97,7 @@ SYMBOLS
 (byte) yd
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) STAR ← (byte) 81
   (byte[1000]) SCREEN ← (word) 1024
   (byte) x0 ← (byte) 0
@@ -117,7 +117,7 @@ INITIAL CONTROL FLOW GRAPH
   (byte*~) $5 ← (byte*~) $4 + (byte) x
   (byte*) cursor ← (byte*~) $5
   to:@1
-@1: from @3 @BEGIN
+@1: from @3 @begin
   *((byte*) cursor) ← (byte) STAR
   (byte~) $6 ← (byte) x + (byte) 1
   (byte) x ← (byte~) $6
@@ -146,14 +146,14 @@ INITIAL CONTROL FLOW GRAPH
 @5: from
   to:@2
 @6: from @3
-  to:@END
-@END: from @6
+  to:@end
+@end: from @6
 
 Removing empty block @4
 Removing empty block @5
 Removing empty block @6
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) STAR ← (byte) 81
   (byte[1000]) SCREEN ← (word) 1024
   (byte) x0 ← (byte) 0
@@ -173,7 +173,7 @@ CONTROL FLOW GRAPH
   (byte*~) $5 ← (byte*~) $4 + (byte) x
   (byte*) cursor ← (byte*~) $5
   to:@1
-@1: from @3 @BEGIN
+@1: from @3 @begin
   *((byte*) cursor) ← (byte) STAR
   (byte~) $6 ← (byte) x + (byte) 1
   (byte) x ← (byte~) $6
@@ -196,13 +196,13 @@ CONTROL FLOW GRAPH
   (byte~) $13 ← (byte) x1 + (byte) 1
   (boolean~) $14 ← (byte) x < (byte~) $13
   if((boolean~) $14) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   (byte) STAR ← (byte) 81
   (byte[1000]) SCREEN ← (word) 1024
   (byte) x0 ← (byte) 0
@@ -222,7 +222,7 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
   (byte*~) $5 ← (byte*~) $4 + (byte) x
   (byte*) cursor ← (byte*~) $5
   to:@1
-@1: from @3 @BEGIN
+@1: from @3 @begin
   *((byte*) cursor) ← (byte) STAR
   (byte~) $6 ← (byte) x + (byte) 1
   (byte) x ← (byte~) $6
@@ -245,14 +245,14 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
   (byte~) $13 ← (byte) x1 + (byte) 1
   (boolean~) $14 ← (byte) x < (byte~) $13
   if((boolean~) $14) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Completing Phi functions...
 Completing Phi functions...
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   (byte) STAR#0 ← (byte) 81
   (byte[1000]) SCREEN#0 ← (word) 1024
   (byte) x0#0 ← (byte) 0
@@ -272,15 +272,15 @@ CONTROL FLOW GRAPH SSA
   (byte*~) $5 ← (byte*~) $4 + (byte) x#0
   (byte*) cursor#0 ← (byte*~) $5
   to:@1
-@1: from @3 @BEGIN
-  (byte) x1#2 ← phi( @3/(byte) x1#1 @BEGIN/(byte) x1#0 )
-  (byte) y#3 ← phi( @3/(byte) y#4 @BEGIN/(byte) y#0 )
-  (byte) xd#1 ← phi( @3/(byte) xd#3 @BEGIN/(byte) xd#0 )
-  (byte) yd#1 ← phi( @3/(byte) yd#2 @BEGIN/(byte) yd#0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#3 @BEGIN/(byte) x#0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
-  (byte) STAR#1 ← phi( @3/(byte) STAR#2 @BEGIN/(byte) STAR#0 )
+@1: from @3 @begin
+  (byte) x1#2 ← phi( @3/(byte) x1#1 @begin/(byte) x1#0 )
+  (byte) y#3 ← phi( @3/(byte) y#4 @begin/(byte) y#0 )
+  (byte) xd#1 ← phi( @3/(byte) xd#3 @begin/(byte) xd#0 )
+  (byte) yd#1 ← phi( @3/(byte) yd#2 @begin/(byte) yd#0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#3 @begin/(byte) x#0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
+  (byte) STAR#1 ← phi( @3/(byte) STAR#2 @begin/(byte) STAR#0 )
   *((byte*) cursor#3) ← (byte) STAR#1
   (byte~) $6 ← (byte) x#2 + (byte) 1
   (byte) x#1 ← (byte~) $6
@@ -319,11 +319,11 @@ CONTROL FLOW GRAPH SSA
   (byte~) $13 ← (byte) x1#1 + (byte) 1
   (boolean~) $14 ← (byte) x#3 < (byte~) $13
   if((boolean~) $14) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   (byte) STAR#0 ← (byte) 81
   (byte[1000]) SCREEN#0 ← (word) 1024
   (byte) x0#0 ← (byte) 0
@@ -343,15 +343,15 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
   (byte*~) $5 ← (byte*~) $4 + (byte) x#0
   (byte*) cursor#0 ← (byte*~) $5
   to:@1
-@1: from @3 @BEGIN
-  (byte) x1#2 ← phi( @3/(byte) x1#1 @BEGIN/(byte) x1#0 )
-  (byte) y#3 ← phi( @3/(byte) y#4 @BEGIN/(byte) y#0 )
-  (byte) xd#1 ← phi( @3/(byte) xd#3 @BEGIN/(byte) xd#0 )
-  (byte) yd#1 ← phi( @3/(byte) yd#2 @BEGIN/(byte) yd#0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#3 @BEGIN/(byte) x#0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
-  (byte) STAR#1 ← phi( @3/(byte) STAR#2 @BEGIN/(byte) STAR#0 )
+@1: from @3 @begin
+  (byte) x1#2 ← phi( @3/(byte) x1#1 @begin/(byte) x1#0 )
+  (byte) y#3 ← phi( @3/(byte) y#4 @begin/(byte) y#0 )
+  (byte) xd#1 ← phi( @3/(byte) xd#3 @begin/(byte) xd#0 )
+  (byte) yd#1 ← phi( @3/(byte) yd#2 @begin/(byte) yd#0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#3 @begin/(byte) x#0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
+  (byte) STAR#1 ← phi( @3/(byte) STAR#2 @begin/(byte) STAR#0 )
   *((byte*) cursor#3) ← (byte) STAR#1
   (byte~) $6 ← (byte) x#2 + (byte) 1
   (byte) x#1 ← (byte~) $6
@@ -390,8 +390,8 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
   (byte~) $13 ← (byte) x1#1 + (byte) 1
   (boolean~) $14 ← (byte) x#3 < (byte~) $13
   if((boolean~) $14) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Constant (byte) STAR#0 (byte) 81
 Constant (byte[1000]) SCREEN#0 (word) 1024
@@ -401,7 +401,7 @@ Constant (byte) x1#0 (byte) 39
 Constant (byte) y1#0 (byte) 24
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte~) $0 ← (byte) 39 - (byte) 0
   (byte) xd#0 ← (byte~) $0
   (byte~) $1 ← (byte) 24 - (byte) 0
@@ -415,15 +415,15 @@ CONTROL FLOW GRAPH
   (byte*~) $5 ← (byte*~) $4 + (byte) x#0
   (byte*) cursor#0 ← (byte*~) $5
   to:@1
-@1: from @3 @BEGIN
-  (byte) x1#2 ← phi( @3/(byte) x1#1 @BEGIN/(byte) 39 )
-  (byte) y#3 ← phi( @3/(byte) y#4 @BEGIN/(byte) y#0 )
-  (byte) xd#1 ← phi( @3/(byte) xd#3 @BEGIN/(byte) xd#0 )
-  (byte) yd#1 ← phi( @3/(byte) yd#2 @BEGIN/(byte) yd#0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#3 @BEGIN/(byte) x#0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
-  (byte) STAR#1 ← phi( @3/(byte) STAR#2 @BEGIN/(byte) 81 )
+@1: from @3 @begin
+  (byte) x1#2 ← phi( @3/(byte) x1#1 @begin/(byte) 39 )
+  (byte) y#3 ← phi( @3/(byte) y#4 @begin/(byte) y#0 )
+  (byte) xd#1 ← phi( @3/(byte) xd#3 @begin/(byte) xd#0 )
+  (byte) yd#1 ← phi( @3/(byte) yd#2 @begin/(byte) yd#0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#3 @begin/(byte) x#0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
+  (byte) STAR#1 ← phi( @3/(byte) STAR#2 @begin/(byte) 81 )
   *((byte*) cursor#3) ← (byte) STAR#1
   (byte~) $6 ← (byte) x#2 + (byte) 1
   (byte) x#1 ← (byte~) $6
@@ -462,8 +462,8 @@ CONTROL FLOW GRAPH
   (byte~) $13 ← (byte) x1#1 + (byte) 1
   (boolean~) $14 ← (byte) x#3 < (byte~) $13
   if((boolean~) $14) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Multiple usages for variable. Not optimizing sub-constant (byte) x1#1
 Alias (byte) xd#0 = (byte~) $0 
@@ -483,7 +483,7 @@ Alias (byte*) cursor#2 = (byte*~) $11
 Alias (byte) e#2 = (byte~) $12 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) xd#0 ← (byte) 39 - (byte) 0
   (byte) yd#0 ← (byte) 24 - (byte) 0
   (byte) x#0 ← (byte) 0
@@ -493,15 +493,15 @@ CONTROL FLOW GRAPH
   (byte*~) $4 ← (word) 1024 + (byte~) $3
   (byte*) cursor#0 ← (byte*~) $4 + (byte) x#0
   to:@1
-@1: from @3 @BEGIN
-  (byte) x1#2 ← phi( @3/(byte) x1#1 @BEGIN/(byte) 39 )
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) y#0 )
-  (byte) xd#1 ← phi( @3/(byte) xd#3 @BEGIN/(byte) xd#0 )
-  (byte) yd#1 ← phi( @3/(byte) yd#2 @BEGIN/(byte) yd#0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#3 @BEGIN/(byte) x#0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
-  (byte) STAR#1 ← phi( @3/(byte) STAR#2 @BEGIN/(byte) 81 )
+@1: from @3 @begin
+  (byte) x1#2 ← phi( @3/(byte) x1#1 @begin/(byte) 39 )
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) y#0 )
+  (byte) xd#1 ← phi( @3/(byte) xd#3 @begin/(byte) xd#0 )
+  (byte) yd#1 ← phi( @3/(byte) yd#2 @begin/(byte) yd#0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#3 @begin/(byte) x#0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
+  (byte) STAR#1 ← phi( @3/(byte) STAR#2 @begin/(byte) 81 )
   *((byte*) cursor#3) ← (byte) STAR#1
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -526,8 +526,8 @@ CONTROL FLOW GRAPH
   (byte~) $13 ← (byte) x1#1 + (byte) 1
   (boolean~) $14 ← (byte) x#3 < (byte~) $13
   if((boolean~) $14) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Redundant Phi (byte) x1#1 (byte) x1#2
 Redundant Phi (byte) x#3 (byte) x#1
@@ -536,7 +536,7 @@ Redundant Phi (byte) yd#2 (byte) yd#1
 Redundant Phi (byte) xd#3 (byte) xd#1
 Succesful SSA optimization Pass2RedundantPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) xd#0 ← (byte) 39 - (byte) 0
   (byte) yd#0 ← (byte) 24 - (byte) 0
   (byte) x#0 ← (byte) 0
@@ -546,15 +546,15 @@ CONTROL FLOW GRAPH
   (byte*~) $4 ← (word) 1024 + (byte~) $3
   (byte*) cursor#0 ← (byte*~) $4 + (byte) x#0
   to:@1
-@1: from @3 @BEGIN
-  (byte) x1#2 ← phi( @3/(byte) x1#2 @BEGIN/(byte) 39 )
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) y#0 )
-  (byte) xd#1 ← phi( @3/(byte) xd#1 @BEGIN/(byte) xd#0 )
-  (byte) yd#1 ← phi( @3/(byte) yd#1 @BEGIN/(byte) yd#0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) x#0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
-  (byte) STAR#1 ← phi( @3/(byte) STAR#1 @BEGIN/(byte) 81 )
+@1: from @3 @begin
+  (byte) x1#2 ← phi( @3/(byte) x1#2 @begin/(byte) 39 )
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) y#0 )
+  (byte) xd#1 ← phi( @3/(byte) xd#1 @begin/(byte) xd#0 )
+  (byte) yd#1 ← phi( @3/(byte) yd#1 @begin/(byte) yd#0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) x#0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
+  (byte) STAR#1 ← phi( @3/(byte) STAR#1 @begin/(byte) 81 )
   *((byte*) cursor#3) ← (byte) STAR#1
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -574,8 +574,8 @@ CONTROL FLOW GRAPH
   (byte~) $13 ← (byte) x1#2 + (byte) 1
   (boolean~) $14 ← (byte) x#1 < (byte~) $13
   if((boolean~) $14) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Self Phi Eliminated (byte) STAR#1
 Self Phi Eliminated (byte) yd#1
@@ -583,7 +583,7 @@ Self Phi Eliminated (byte) xd#1
 Self Phi Eliminated (byte) x1#2
 Succesful SSA optimization Pass2SelfPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) xd#0 ← (byte) 39 - (byte) 0
   (byte) yd#0 ← (byte) 24 - (byte) 0
   (byte) x#0 ← (byte) 0
@@ -593,15 +593,15 @@ CONTROL FLOW GRAPH
   (byte*~) $4 ← (word) 1024 + (byte~) $3
   (byte*) cursor#0 ← (byte*~) $4 + (byte) x#0
   to:@1
-@1: from @3 @BEGIN
-  (byte) x1#2 ← phi( @BEGIN/(byte) 39 )
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) y#0 )
-  (byte) xd#1 ← phi( @BEGIN/(byte) xd#0 )
-  (byte) yd#1 ← phi( @BEGIN/(byte) yd#0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) x#0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
-  (byte) STAR#1 ← phi( @BEGIN/(byte) 81 )
+@1: from @3 @begin
+  (byte) x1#2 ← phi( @begin/(byte) 39 )
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) y#0 )
+  (byte) xd#1 ← phi( @begin/(byte) xd#0 )
+  (byte) yd#1 ← phi( @begin/(byte) yd#0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) x#0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
+  (byte) STAR#1 ← phi( @begin/(byte) 81 )
   *((byte*) cursor#3) ← (byte) STAR#1
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -621,14 +621,14 @@ CONTROL FLOW GRAPH
   (byte~) $13 ← (byte) x1#2 + (byte) 1
   (boolean~) $14 ← (byte) x#1 < (byte~) $13
   if((boolean~) $14) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Simple Condition (boolean~) $9 if((byte) xd#1<(byte) e#1) goto @2
 Simple Condition (boolean~) $14 if((byte) x#1<(byte~) $13) goto @1
 Succesful SSA optimization Pass2ConditionalJumpSimplification
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) xd#0 ← (byte) 39 - (byte) 0
   (byte) yd#0 ← (byte) 24 - (byte) 0
   (byte) x#0 ← (byte) 0
@@ -638,15 +638,15 @@ CONTROL FLOW GRAPH
   (byte*~) $4 ← (word) 1024 + (byte~) $3
   (byte*) cursor#0 ← (byte*~) $4 + (byte) x#0
   to:@1
-@1: from @3 @BEGIN
-  (byte) x1#2 ← phi( @BEGIN/(byte) 39 )
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) y#0 )
-  (byte) xd#1 ← phi( @BEGIN/(byte) xd#0 )
-  (byte) yd#1 ← phi( @BEGIN/(byte) yd#0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) x#0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
-  (byte) STAR#1 ← phi( @BEGIN/(byte) 81 )
+@1: from @3 @begin
+  (byte) x1#2 ← phi( @begin/(byte) 39 )
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) y#0 )
+  (byte) xd#1 ← phi( @begin/(byte) xd#0 )
+  (byte) yd#1 ← phi( @begin/(byte) yd#0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) x#0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
+  (byte) STAR#1 ← phi( @begin/(byte) 81 )
   *((byte*) cursor#3) ← (byte) STAR#1
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -664,8 +664,8 @@ CONTROL FLOW GRAPH
   (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 )
   (byte~) $13 ← (byte) x1#2 + (byte) 1
   if((byte) x#1<(byte~) $13) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Constant (byte) xd#0 (byte) 39
 Constant (byte) yd#0 (byte) 24
@@ -675,19 +675,19 @@ Constant (byte) STAR#1 (byte) 81
 Constant (byte) x1#2 (byte) 39
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) e#0 ← (byte) 24 / (byte) 2
   (byte~) $3 ← (byte) 0 * (byte) 40
   (byte*~) $4 ← (word) 1024 + (byte~) $3
   (byte*) cursor#0 ← (byte*~) $4 + (byte) 0
   to:@1
-@1: from @3 @BEGIN
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) 0 )
-  (byte) xd#1 ← phi( @BEGIN/(byte) 39 )
-  (byte) yd#1 ← phi( @BEGIN/(byte) 24 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) 0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
+@1: from @3 @begin
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) 0 )
+  (byte) xd#1 ← phi( @begin/(byte) 39 )
+  (byte) yd#1 ← phi( @begin/(byte) 24 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) 0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
   *((byte*) cursor#3) ← (byte) 81
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -705,27 +705,27 @@ CONTROL FLOW GRAPH
   (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 )
   (byte~) $13 ← (byte) 39 + (byte) 1
   if((byte) x#1<(byte~) $13) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Consolidated constant in assignment cursor#0
 Multiple usages for variable. Not optimizing sub-constant (byte) y#2
 Multiple usages for variable. Not optimizing sub-constant (byte*) cursor#1
 Succesful SSA optimization Pass2ConstantAdditionElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) e#0 ← (byte) 24 / (byte) 2
   (byte~) $3 ← (byte) 0 * (byte) 40
   (byte*~) $4 ← (byte~) $3
   (byte*) cursor#0 ← (byte*~) $4 + (word) 1024
   to:@1
-@1: from @3 @BEGIN
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) 0 )
-  (byte) xd#1 ← phi( @BEGIN/(byte) 39 )
-  (byte) yd#1 ← phi( @BEGIN/(byte) 24 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) 0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
+@1: from @3 @begin
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) 0 )
+  (byte) xd#1 ← phi( @begin/(byte) 39 )
+  (byte) yd#1 ← phi( @begin/(byte) 24 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) 0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
   *((byte*) cursor#3) ← (byte) 81
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -743,24 +743,24 @@ CONTROL FLOW GRAPH
   (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 )
   (byte~) $13 ← (byte) 39 + (byte) 1
   if((byte) x#1<(byte~) $13) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Alias (byte~) $3 = (byte*~) $4 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) e#0 ← (byte) 24 / (byte) 2
   (byte~) $3 ← (byte) 0 * (byte) 40
   (byte*) cursor#0 ← (byte~) $3 + (word) 1024
   to:@1
-@1: from @3 @BEGIN
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) 0 )
-  (byte) xd#1 ← phi( @BEGIN/(byte) 39 )
-  (byte) yd#1 ← phi( @BEGIN/(byte) 24 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) 0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
+@1: from @3 @begin
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) 0 )
+  (byte) xd#1 ← phi( @begin/(byte) 39 )
+  (byte) yd#1 ← phi( @begin/(byte) 24 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) 0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
   *((byte*) cursor#3) ← (byte) 81
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -778,23 +778,23 @@ CONTROL FLOW GRAPH
   (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 )
   (byte~) $13 ← (byte) 39 + (byte) 1
   if((byte) x#1<(byte~) $13) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Redundant Phi (byte) yd#1 (byte) 24
 Redundant Phi (byte) xd#1 (byte) 39
 Succesful SSA optimization Pass2RedundantPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) e#0 ← (byte) 24 / (byte) 2
   (byte~) $3 ← (byte) 0 * (byte) 40
   (byte*) cursor#0 ← (byte~) $3 + (word) 1024
   to:@1
-@1: from @3 @BEGIN
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) 0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) e#0 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) 0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
+@1: from @3 @begin
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) 0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) e#0 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) 0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
   *((byte*) cursor#3) ← (byte) 81
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -812,22 +812,22 @@ CONTROL FLOW GRAPH
   (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 )
   (byte~) $13 ← (byte) 39 + (byte) 1
   if((byte) x#1<(byte~) $13) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Constant (byte) e#0 (byte) 12
 Constant (byte~) $3 (byte) 0
 Constant (byte~) $13 (byte) 40
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte*) cursor#0 ← (byte) 0 + (word) 1024
   to:@1
-@1: from @3 @BEGIN
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) 0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) 12 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) 0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(byte*) cursor#0 )
+@1: from @3 @begin
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) 0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) 12 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) 0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(byte*) cursor#0 )
   *((byte*) cursor#3) ← (byte) 81
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -844,21 +844,21 @@ CONTROL FLOW GRAPH
   (byte) e#5 ← phi( @1/(byte) e#1 @2/(byte) e#2 )
   (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 )
   if((byte) x#1<(byte) 40) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Multiple usages for variable. Not optimizing sub-constant (byte) y#2
 Multiple usages for variable. Not optimizing sub-constant (byte*) cursor#1
 Constant (byte*) cursor#0 (word) 1024
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) 0 )
-  (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) 12 )
-  (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) 0 )
-  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(word) 1024 )
+@1: from @3 @begin
+  (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) 0 )
+  (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) 12 )
+  (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) 0 )
+  (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(word) 1024 )
   *((byte*) cursor#3) ← (byte) 81
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -875,25 +875,25 @@ CONTROL FLOW GRAPH
   (byte) e#5 ← phi( @1/(byte) e#1 @2/(byte) e#2 )
   (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 )
   if((byte) x#1<(byte) 40) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Multiple usages for variable. Not optimizing sub-constant (byte) y#2
 Multiple usages for variable. Not optimizing sub-constant (byte*) cursor#1
 Multiple usages for variable. Not optimizing sub-constant (byte) y#2
 Multiple usages for variable. Not optimizing sub-constant (byte*) cursor#1
-Block Sequence Planned @BEGIN @1 @3 @END @2 
+Block Sequence Planned @begin @1 @3 @end @2 
 Added new block during phi lifting @7(between @3 and @1)
 Added new block during phi lifting @8(between @1 and @3)
-Block Sequence Planned @BEGIN @1 @8 @3 @END @7 @2 
+Block Sequence Planned @begin @1 @8 @3 @end @7 @2 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @7 @BEGIN
-  (byte) y#2 ← phi( @7/(byte~) y#5 @BEGIN/(byte) 0 )
-  (byte) e#3 ← phi( @7/(byte~) e#6 @BEGIN/(byte) 12 )
-  (byte) x#2 ← phi( @7/(byte~) x#5 @BEGIN/(byte) 0 )
-  (byte*) cursor#3 ← phi( @7/(byte*~) cursor#6 @BEGIN/(word) 1024 )
+@1: from @7 @begin
+  (byte) y#2 ← phi( @7/(byte~) y#5 @begin/(byte) 0 )
+  (byte) e#3 ← phi( @7/(byte~) e#6 @begin/(byte) 12 )
+  (byte) x#2 ← phi( @7/(byte~) x#5 @begin/(byte) 0 )
+  (byte*) cursor#3 ← phi( @7/(byte*~) cursor#6 @begin/(word) 1024 )
   *((byte*) cursor#3) ← (byte) 81
   (byte) x#1 ← (byte) x#2 + (byte) 1
   (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1
@@ -910,8 +910,8 @@ CONTROL FLOW GRAPH - PHI LIFTED
   (byte) e#5 ← phi( @8/(byte~) e#7 @2/(byte~) e#8 )
   (byte*) cursor#5 ← phi( @8/(byte*~) cursor#7 @2/(byte*~) cursor#8 )
   if((byte) x#1<(byte) 40) goto @7
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 @7: from @3
   (byte*~) cursor#6 ← (byte*) cursor#5
   (byte~) x#5 ← (byte) x#1
@@ -936,13 +936,13 @@ Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @7 @BEGIN
-  [0] (byte) y#2 ← phi( @7/(byte~) y#5 @BEGIN/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte) e#3 ← phi( @7/(byte~) e#6 @BEGIN/(byte) 12 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte) x#2 ← phi( @7/(byte~) x#5 @BEGIN/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte*) cursor#3 ← phi( @7/(byte*~) cursor#6 @BEGIN/(word) 1024 ) [ cursor#3 x#2 e#3 y#2 ]
+@1: from @7 @begin
+  [0] (byte) y#2 ← phi( @7/(byte~) y#5 @begin/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte) e#3 ← phi( @7/(byte~) e#6 @begin/(byte) 12 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte) x#2 ← phi( @7/(byte~) x#5 @begin/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte*) cursor#3 ← phi( @7/(byte*~) cursor#6 @begin/(word) 1024 ) [ cursor#3 x#2 e#3 y#2 ]
   [1] *((byte*) cursor#3) ← (byte) 81 [ cursor#3 x#2 e#3 y#2 ]
   [2] (byte) x#1 ← (byte) x#2 + (byte) 1 [ cursor#3 e#3 y#2 x#1 ]
   [3] (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1 [ e#3 cursor#1 y#2 x#1 ]
@@ -959,8 +959,8 @@ CONTROL FLOW GRAPH - LIVE RANGES
   [9] (byte) e#5 ← phi( @8/(byte~) e#7 @2/(byte~) e#8 ) [ x#1 cursor#5 e#5 y#4 ]
   [9] (byte*) cursor#5 ← phi( @8/(byte*~) cursor#7 @2/(byte*~) cursor#8 ) [ x#1 cursor#5 e#5 y#4 ]
   [10] if((byte) x#1<(byte) 40) goto @7 [ x#1 cursor#5 e#5 y#4 ]
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 @7: from @3
   [11] (byte*~) cursor#6 ← (byte*) cursor#5 [ cursor#6 x#1 e#5 y#4 ]
   [12] (byte~) x#5 ← (byte) x#1 [ cursor#6 x#5 e#5 y#4 ]
@@ -990,7 +990,7 @@ Coalesced [20] y#7 ← y#1
 Coalesced down to 4 phi equivalence classes
 Culled Empty Block (label) @8
 Culled Empty Block (label) @7
-Block Sequence Planned @BEGIN @1 @3 @END @2 
+Block Sequence Planned @begin @1 @3 @end @2 
 Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
@@ -998,13 +998,13 @@ Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  [0] (byte) y#2 ← phi( @3/(byte) y#4 @BEGIN/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte) e#3 ← phi( @3/(byte) e#5 @BEGIN/(byte) 12 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte) x#2 ← phi( @3/(byte) x#1 @BEGIN/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
-  [0] (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @BEGIN/(word) 1024 ) [ cursor#3 x#2 e#3 y#2 ]
+@1: from @3 @begin
+  [0] (byte) y#2 ← phi( @3/(byte) y#4 @begin/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte) e#3 ← phi( @3/(byte) e#5 @begin/(byte) 12 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte) x#2 ← phi( @3/(byte) x#1 @begin/(byte) 0 ) [ cursor#3 x#2 e#3 y#2 ]
+  [0] (byte*) cursor#3 ← phi( @3/(byte*) cursor#5 @begin/(word) 1024 ) [ cursor#3 x#2 e#3 y#2 ]
   [1] *((byte*) cursor#3) ← (byte) 81 [ cursor#3 x#2 e#3 y#2 ]
   [2] (byte) x#1 ← (byte) x#2 + (byte) 1 [ x#1 cursor#3 e#3 y#2 ]
   [3] (byte*) cursor#1 ← (byte*) cursor#3 + (byte) 1 [ x#1 e#3 cursor#1 y#2 ]
@@ -1016,8 +1016,8 @@ CONTROL FLOW GRAPH - PHI MEM COALESCED
   [6] (byte) e#5 ← phi( @1/(byte) e#1 @2/(byte) e#2 ) [ cursor#5 x#1 e#5 y#4 ]
   [6] (byte*) cursor#5 ← phi( @1/(byte*) cursor#1 @2/(byte*) cursor#2 ) [ cursor#5 x#1 e#5 y#4 ]
   [7] if((byte) x#1<(byte) 40) goto @1 [ cursor#5 x#1 e#5 y#4 ]
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 @2: from @1
   [8] (byte) y#1 ← (byte) y#2 + (byte) 1 [ x#1 e#1 cursor#1 y#1 ]
   [9] (byte*) cursor#2 ← (byte*) cursor#1 + (byte) 40 [ x#1 e#1 cursor#2 y#1 ]
@@ -1027,11 +1027,11 @@ CONTROL FLOW GRAPH - PHI MEM COALESCED
 CALL GRAPH
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@1 dominated by  @1 @BEGIN 
-@3 dominated by  @1 @BEGIN @3 
-@END dominated by  @1 @BEGIN @3 @END 
-@2 dominated by  @1 @BEGIN @2 
+@begin dominated by  @begin 
+@1 dominated by  @1 @begin 
+@3 dominated by  @1 @3 @begin 
+@end dominated by  @1 @3 @end @begin 
+@2 dominated by  @1 @2 @begin 
 
 Found back edge: Loop head: @1 tails: @3 blocks: null
 Populated: Loop head: @1 tails: @3 blocks: @3 @1 @2 
@@ -1086,10 +1086,10 @@ Allocated zp byte:4 to zp byte:4 [ x#2 x#1 ]
 Allocated zp byte:5 to zp byte:5 [ e#3 e#5 e#1 e#2 ]
 Allocated zp byte:6 to zp byte:6 [ y#2 y#4 y#1 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) y#2 = (byte) 0 -- zpby1=coby1 
   lda #$0
   sta $6
@@ -1104,16 +1104,16 @@ B1_from_BBEGIN:
   sta $2
   lda #>$400
   sta $2+$1
-  jmp B1
+  jmp b1
 //SEG6 [0] phi from @3 to @1
-B1_from_B3:
+b1_from_b3:
 //SEG7 [0] phi (byte) y#2 = (byte) y#4 -- register_copy 
 //SEG8 [0] phi (byte) e#3 = (byte) e#5 -- register_copy 
 //SEG9 [0] phi (byte) x#2 = (byte) x#1 -- register_copy 
 //SEG10 [0] phi (byte*) cursor#3 = (byte*) cursor#5 -- register_copy 
-  jmp B1
+  jmp b1
 //SEG11 @1
-B1:
+b1:
 //SEG12 [1] *((byte*) cursor#3) ← (byte) 81 [ cursor#3 x#2 e#3 y#2 ] -- _star_zpptrby1=coby1 
   ldy #$0
   lda #$51
@@ -1133,24 +1133,24 @@ B1:
 //SEG16 [5] if((byte) 39<(byte) e#1) goto @2 [ x#1 e#1 cursor#1 y#2 ] -- coby1_lt_zpby1_then_la1 
   lda #$27
   cmp $5
-  bcc B2
+  bcc b2
 //SEG17 [6] phi from @1 to @3
-B3_from_B1:
+b3_from_b1:
 //SEG18 [6] phi (byte) y#4 = (byte) y#2 -- register_copy 
 //SEG19 [6] phi (byte) e#5 = (byte) e#1 -- register_copy 
 //SEG20 [6] phi (byte*) cursor#5 = (byte*) cursor#1 -- register_copy 
-  jmp B3
+  jmp b3
 //SEG21 @3
-B3:
+b3:
 //SEG22 [7] if((byte) x#1<(byte) 40) goto @1 [ cursor#5 x#1 e#5 y#4 ] -- zpby1_lt_coby1_then_la1 
   lda $4
   cmp #$28
-  bcc B1_from_B3
-  jmp BEND
-//SEG23 @END
-BEND:
+  bcc b1_from_b3
+  jmp bend
+//SEG23 @end
+bend:
 //SEG24 @2
-B2:
+b2:
 //SEG25 [8] (byte) y#1 ← (byte) y#2 + (byte) 1 [ x#1 e#1 cursor#1 y#1 ] -- zpby1=zpby1_plus_1 
   inc $6
 //SEG26 [9] (byte*) cursor#2 ← (byte*) cursor#1 + (byte) 40 [ x#1 e#1 cursor#2 y#1 ] -- zpptrby1=zpptrby1_plus_coby1 
@@ -1167,11 +1167,11 @@ B2:
   sbc #$27
   sta $5
 //SEG28 [6] phi from @2 to @3
-B3_from_B2:
+b3_from_b2:
 //SEG29 [6] phi (byte) y#4 = (byte) y#1 -- register_copy 
 //SEG30 [6] phi (byte) e#5 = (byte) e#2 -- register_copy 
 //SEG31 [6] phi (byte*) cursor#5 = (byte*) cursor#2 -- register_copy 
-  jmp B3
+  jmp b3
 
 Statement [1] *((byte*) cursor#3) ← (byte) 81 [ cursor#3 x#2 e#3 y#2 ] always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte a as potential for zp byte:4 [ x#2 x#1 ]
@@ -1198,15 +1198,15 @@ Uplift Scope [] 55: zp byte:5 [ e#3 e#5 e#1 e#2 ] 46.75: zp ptr byte:2 [ cursor#
 
 Uplifting [] best 1180 combination reg byte x [ e#3 e#5 e#1 e#2 ] zp ptr byte:2 [ cursor#3 cursor#5 cursor#1 cursor#2 ] zp byte:6 [ y#2 y#4 y#1 ] zp byte:4 [ x#2 x#1 ] 
 Re-allocated ZP register from zp byte:6 to zp byte:5
-Removing instruction jmp B1
-Removing instruction jmp B3
-Removing instruction jmp BEND
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp bend
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) y#2 = (byte) 0 -- zpby1=coby1 
   lda #$0
   sta $5
@@ -1220,15 +1220,15 @@ B1_from_BBEGIN:
   sta $2
   lda #>$400
   sta $2+$1
-  jmp B1
+  jmp b1
 //SEG6 [0] phi from @3 to @1
-B1_from_B3:
+b1_from_b3:
 //SEG7 [0] phi (byte) y#2 = (byte) y#4 -- register_copy 
 //SEG8 [0] phi (byte) e#3 = (byte) e#5 -- register_copy 
 //SEG9 [0] phi (byte) x#2 = (byte) x#1 -- register_copy 
 //SEG10 [0] phi (byte*) cursor#3 = (byte*) cursor#5 -- register_copy 
 //SEG11 @1
-B1:
+b1:
 //SEG12 [1] *((byte*) cursor#3) ← (byte) 81 [ cursor#3 x#2 e#3 y#2 ] -- _star_zpptrby1=coby1 
   ldy #$0
   lda #$51
@@ -1247,22 +1247,22 @@ B1:
   tax
 //SEG16 [5] if((byte) 39<(byte) e#1) goto @2 [ x#1 e#1 cursor#1 y#2 ] -- coby1_lt_xby_then_la1 
   cpx #$27
-  bcs B2
+  bcs b2
 //SEG17 [6] phi from @1 to @3
-B3_from_B1:
+b3_from_b1:
 //SEG18 [6] phi (byte) y#4 = (byte) y#2 -- register_copy 
 //SEG19 [6] phi (byte) e#5 = (byte) e#1 -- register_copy 
 //SEG20 [6] phi (byte*) cursor#5 = (byte*) cursor#1 -- register_copy 
 //SEG21 @3
-B3:
+b3:
 //SEG22 [7] if((byte) x#1<(byte) 40) goto @1 [ cursor#5 x#1 e#5 y#4 ] -- zpby1_lt_coby1_then_la1 
   lda $4
   cmp #$28
-  bcc B1_from_B3
-//SEG23 @END
-BEND:
+  bcc b1_from_b3
+//SEG23 @end
+bend:
 //SEG24 @2
-B2:
+b2:
 //SEG25 [8] (byte) y#1 ← (byte) y#2 + (byte) 1 [ x#1 e#1 cursor#1 y#1 ] -- zpby1=zpby1_plus_1 
   inc $5
 //SEG26 [9] (byte*) cursor#2 ← (byte*) cursor#1 + (byte) 40 [ x#1 e#1 cursor#2 y#1 ] -- zpptrby1=zpptrby1_plus_coby1 
@@ -1279,19 +1279,19 @@ B2:
   sbc #$27
   tax
 //SEG28 [6] phi from @2 to @3
-B3_from_B2:
+b3_from_b2:
 //SEG29 [6] phi (byte) y#4 = (byte) y#1 -- register_copy 
 //SEG30 [6] phi (byte) e#5 = (byte) e#2 -- register_copy 
 //SEG31 [6] phi (byte*) cursor#5 = (byte*) cursor#2 -- register_copy 
-  jmp B3
+  jmp b3
 
-Removing instruction jmp B1
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) y#2 = (byte) 0 -- zpby1=coby1 
   lda #$0
   sta $5
@@ -1306,13 +1306,13 @@ B1_from_BBEGIN:
   lda #>$400
   sta $2+$1
 //SEG6 [0] phi from @3 to @1
-B1_from_B3:
+b1_from_b3:
 //SEG7 [0] phi (byte) y#2 = (byte) y#4 -- register_copy 
 //SEG8 [0] phi (byte) e#3 = (byte) e#5 -- register_copy 
 //SEG9 [0] phi (byte) x#2 = (byte) x#1 -- register_copy 
 //SEG10 [0] phi (byte*) cursor#3 = (byte*) cursor#5 -- register_copy 
 //SEG11 @1
-B1:
+b1:
 //SEG12 [1] *((byte*) cursor#3) ← (byte) 81 [ cursor#3 x#2 e#3 y#2 ] -- _star_zpptrby1=coby1 
   ldy #$0
   lda #$51
@@ -1331,22 +1331,22 @@ B1:
   tax
 //SEG16 [5] if((byte) 39<(byte) e#1) goto @2 [ x#1 e#1 cursor#1 y#2 ] -- coby1_lt_xby_then_la1 
   cpx #$27
-  bcs B2
+  bcs b2
 //SEG17 [6] phi from @1 to @3
-B3_from_B1:
+b3_from_b1:
 //SEG18 [6] phi (byte) y#4 = (byte) y#2 -- register_copy 
 //SEG19 [6] phi (byte) e#5 = (byte) e#1 -- register_copy 
 //SEG20 [6] phi (byte*) cursor#5 = (byte*) cursor#1 -- register_copy 
 //SEG21 @3
-B3:
+b3:
 //SEG22 [7] if((byte) x#1<(byte) 40) goto @1 [ cursor#5 x#1 e#5 y#4 ] -- zpby1_lt_coby1_then_la1 
   lda $4
   cmp #$28
-  bcc B1_from_B3
-//SEG23 @END
-BEND:
+  bcc b1_from_b3
+//SEG23 @end
+bend:
 //SEG24 @2
-B2:
+b2:
 //SEG25 [8] (byte) y#1 ← (byte) y#2 + (byte) 1 [ x#1 e#1 cursor#1 y#1 ] -- zpby1=zpby1_plus_1 
   inc $5
 //SEG26 [9] (byte*) cursor#2 ← (byte*) cursor#1 + (byte) 40 [ x#1 e#1 cursor#2 y#1 ] -- zpptrby1=zpptrby1_plus_coby1 
@@ -1363,18 +1363,18 @@ B2:
   sbc #$27
   tax
 //SEG28 [6] phi from @2 to @3
-B3_from_B2:
+b3_from_b2:
 //SEG29 [6] phi (byte) y#4 = (byte) y#1 -- register_copy 
 //SEG30 [6] phi (byte) e#5 = (byte) e#2 -- register_copy 
 //SEG31 [6] phi (byte*) cursor#5 = (byte*) cursor#2 -- register_copy 
-  jmp B3
+  jmp b3
 
 FINAL SYMBOL TABLE
 (label) @1
 (label) @2
 (label) @3
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte[1000]) SCREEN
 (byte) STAR
 (byte*) cursor
@@ -1407,10 +1407,10 @@ reg byte x [ e#3 e#5 e#1 e#2 ]
 zp byte:5 [ y#2 y#4 y#1 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) y#2 = (byte) 0 -- zpby1=coby1 
   lda #$0
   sta $5
@@ -1425,13 +1425,13 @@ B1_from_BBEGIN:
   lda #>$400
   sta $2+$1
 //SEG6 [0] phi from @3 to @1
-B1_from_B3:
+b1_from_b3:
 //SEG7 [0] phi (byte) y#2 = (byte) y#4 -- register_copy 
 //SEG8 [0] phi (byte) e#3 = (byte) e#5 -- register_copy 
 //SEG9 [0] phi (byte) x#2 = (byte) x#1 -- register_copy 
 //SEG10 [0] phi (byte*) cursor#3 = (byte*) cursor#5 -- register_copy 
 //SEG11 @1
-B1:
+b1:
 //SEG12 [1] *((byte*) cursor#3) ← (byte) 81 [ cursor#3 x#2 e#3 y#2 ] -- _star_zpptrby1=coby1 
   ldy #$0
   lda #$51
@@ -1450,22 +1450,22 @@ B1:
   tax
 //SEG16 [5] if((byte) 39<(byte) e#1) goto @2 [ x#1 e#1 cursor#1 y#2 ] -- coby1_lt_xby_then_la1 
   cpx #$27
-  bcs B2
+  bcs b2
 //SEG17 [6] phi from @1 to @3
-B3_from_B1:
+b3_from_b1:
 //SEG18 [6] phi (byte) y#4 = (byte) y#2 -- register_copy 
 //SEG19 [6] phi (byte) e#5 = (byte) e#1 -- register_copy 
 //SEG20 [6] phi (byte*) cursor#5 = (byte*) cursor#1 -- register_copy 
 //SEG21 @3
-B3:
+b3:
 //SEG22 [7] if((byte) x#1<(byte) 40) goto @1 [ cursor#5 x#1 e#5 y#4 ] -- zpby1_lt_coby1_then_la1 
   lda $4
   cmp #$28
-  bcc B1_from_B3
-//SEG23 @END
-BEND:
+  bcc b1_from_b3
+//SEG23 @end
+bend:
 //SEG24 @2
-B2:
+b2:
 //SEG25 [8] (byte) y#1 ← (byte) y#2 + (byte) 1 [ x#1 e#1 cursor#1 y#1 ] -- zpby1=zpby1_plus_1 
   inc $5
 //SEG26 [9] (byte*) cursor#2 ← (byte*) cursor#1 + (byte) 40 [ x#1 e#1 cursor#2 y#1 ] -- zpptrby1=zpptrby1_plus_coby1 
@@ -1482,9 +1482,9 @@ B2:
   sbc #$27
   tax
 //SEG28 [6] phi from @2 to @3
-B3_from_B2:
+b3_from_b2:
 //SEG29 [6] phi (byte) y#4 = (byte) y#1 -- register_copy 
 //SEG30 [6] phi (byte) e#5 = (byte) e#2 -- register_copy 
 //SEG31 [6] phi (byte*) cursor#5 = (byte*) cursor#2 -- register_copy 
-  jmp B3
+  jmp b3
 

src/main/java/dk/camelot64/kickc/test/ref/bresenham.sym

@@ -1,8 +1,8 @@
 (label) @1
 (label) @2
 (label) @3
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte[1000]) SCREEN
 (byte) STAR
 (byte*) cursor

src/main/java/dk/camelot64/kickc/test/ref/fibmem.asm

@@ -1,21 +1,22 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-  lda #$0
-  sta $1100
-  lda #$1
-  sta $1101
-main__B1_from_main:
-  ldx #$0
-main__B1_from_B1:
-main__B1:
-  lda $1100,x
-  clc
-  adc $1101,x
-  sta $1102,x
-  inx
-  cpx #$f
-  bcc main__B1_from_B1
-main__Breturn:
-  rts
+bend:
+main: {
+    lda #$0
+    sta $1100
+    lda #$1
+    sta $1101
+  b1_from_main:
+    ldx #$0
+  b1_from_b1:
+  b1:
+    lda $1100,x
+    clc
+    adc $1101,x
+    sta $1102,x
+    inx
+    cpx #$f
+    bcc b1_from_b1
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/fibmem.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] *((word) 4352) ← (byte) 0 [ ]
   [2] *((word) 4353) ← (byte) 1 [ ]
   to:main::@1
@@ -17,4 +17,4 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   [10] return  [ ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/fibmem.log

@@ -47,7 +47,7 @@ SYMBOLS
 (byte) main::i
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte[15]) fibs ← (word) 4352
   (void~) $0 ← call main 
   to:@1
@@ -71,18 +71,18 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
-@1: from @BEGIN
-  to:@END
-@END: from @1
+  to:@return
+@1: from @begin
+  to:@end
+@end: from @1
 
 Removing empty block main::@2
 Removing empty block @1
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte[15]) fibs ← (word) 4352
   (void~) $0 ← call main 
-  to:@END
+  to:@end
 main: from
   *((byte[15]) fibs + (byte) 0) ← (byte) 0
   *((byte[15]) fibs + (byte) 1) ← (byte) 1
@@ -101,19 +101,19 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   (byte[15]) fibs ← (word) 4352
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
+@2: from @begin
+  to:@end
+main: from @begin
   *((byte[15]) fibs + (byte) 0) ← (byte) 0
   *((byte[15]) fibs + (byte) 1) ← (byte) 1
   (byte) main::i ← (byte) 0
@@ -131,19 +131,19 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   (byte[15]) fibs#0 ← (word) 4352
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
-  (byte[15]) fibs#1 ← phi( @BEGIN/(byte[15]) fibs#0 )
+@2: from @begin
+  to:@end
+main: from @begin
+  (byte[15]) fibs#1 ← phi( @begin/(byte[15]) fibs#0 )
   *((byte[15]) fibs#1 + (byte) 0) ← (byte) 0
   *((byte[15]) fibs#1 + (byte) 1) ← (byte) 1
   (byte) main::i#0 ← (byte) 0
@@ -163,18 +163,18 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   (byte[15]) fibs#0 ← (word) 4352
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
-  (byte[15]) fibs#1 ← phi( @BEGIN/(byte[15]) fibs#0 )
+@2: from @begin
+  to:@end
+main: from @begin
+  (byte[15]) fibs#1 ← phi( @begin/(byte[15]) fibs#0 )
   *((byte[15]) fibs#1 + (byte) 0) ← (byte) 0
   *((byte[15]) fibs#1 + (byte) 1) ← (byte) 1
   (byte) main::i#0 ← (byte) 0
@@ -194,18 +194,18 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 Culled Empty Block (label) @2
 Succesful SSA optimization Pass2CullEmptyBlocks
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte[15]) fibs#0 ← (word) 4352
   call main param-assignment
-  to:@END
-main: from @BEGIN
-  (byte[15]) fibs#1 ← phi( @BEGIN/(byte[15]) fibs#0 )
+  to:@end
+main: from @begin
+  (byte[15]) fibs#1 ← phi( @begin/(byte[15]) fibs#0 )
   *((byte[15]) fibs#1 + (byte) 0) ← (byte) 0
   *((byte[15]) fibs#1 + (byte) 1) ← (byte) 1
   (byte) main::i#0 ← (byte) 0
@@ -225,18 +225,18 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Constant (byte[15]) fibs#0 (word) 4352
 Constant (byte) main::i#0 (byte) 0
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
-  (byte[15]) fibs#1 ← phi( @BEGIN/(word) 4352 )
+  to:@end
+main: from @begin
+  (byte[15]) fibs#1 ← phi( @begin/(word) 4352 )
   *((byte[15]) fibs#1 + (byte) 0) ← (byte) 0
   *((byte[15]) fibs#1 + (byte) 1) ← (byte) 1
   to:main::@1
@@ -255,18 +255,18 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Multiple usages for variable. Not optimizing sub-constant (byte) main::i#2
 Multiple usages for variable. Not optimizing sub-constant (byte) main::i#2
 Redundant Phi (byte[15]) fibs#1 (word) 4352
 Succesful SSA optimization Pass2RedundantPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   *((word) 4352 + (byte) 0) ← (byte) 0
   *((word) 4352 + (byte) 1) ← (byte) 1
   to:main::@1
@@ -285,16 +285,16 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Self Phi Eliminated (byte[15]) fibs#2
 Succesful SSA optimization Pass2SelfPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   *((word) 4352 + (byte) 0) ← (byte) 0
   *((word) 4352 + (byte) 1) ← (byte) 1
   to:main::@1
@@ -313,16 +313,16 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Simple Condition (boolean~) main::$5 if((byte) main::i#1<(byte) 15) goto main::@1
 Succesful SSA optimization Pass2ConditionalJumpSimplification
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   *((word) 4352 + (byte) 0) ← (byte) 0
   *((word) 4352 + (byte) 1) ← (byte) 1
   to:main::@1
@@ -340,16 +340,16 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Constant (byte[15]) fibs#2 (word) 4352
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   *((word) 4352 + (byte) 0) ← (byte) 0
   *((word) 4352 + (byte) 1) ← (byte) 1
   to:main::@1
@@ -366,8 +366,8 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Consolidated assigned array index constant in assignment *(4352)
 Consolidated assigned array index constant in assignment *(4353)
@@ -378,10 +378,10 @@ Consolidated referenced array index constant in assignment main::$3
 Consolidated assigned array index constant in assignment *(4354 + main::$0)
 Succesful SSA optimization Pass2ConstantAdditionElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   *((word) 4352) ← (byte) 0
   *((word) 4353) ← (byte) 1
   to:main::@1
@@ -398,16 +398,16 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Alias (byte) main::i#2 = (byte~) main::$0 (byte~) main::$2 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   *((word) 4352) ← (byte) 0
   *((word) 4353) ← (byte) 1
   to:main::@1
@@ -422,21 +422,21 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Multiple usages for variable. Not optimizing sub-constant (byte) main::i#2
 Multiple usages for variable. Not optimizing sub-constant (byte) main::i#2
 Multiple usages for variable. Not optimizing sub-constant (byte) main::i#2
-Block Sequence Planned @BEGIN @END main main::@1 main::@return 
+Block Sequence Planned @begin @end main main::@1 main::@return 
 Added new block during phi lifting main::@3(between main::@1 and main::@1)
-Block Sequence Planned @BEGIN @END main main::@1 main::@return main::@3 
+Block Sequence Planned @begin @end main main::@1 main::@return main::@3 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   *((word) 4352) ← (byte) 0
   *((word) 4353) ← (byte) 1
   to:main::@1
@@ -451,7 +451,7 @@ main::@1: from main main::@3
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
+  to:@return
 main::@3: from main::@1
   (byte~) main::i#3 ← (byte) main::i#1
   to:main::@1
@@ -459,11 +459,11 @@ main::@3: from main::@1
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] *((word) 4352) ← (byte) 0 [ ]
   [2] *((word) 4353) ← (byte) 1 [ ]
   to:main::@1
@@ -478,7 +478,7 @@ main::@1: from main main::@3
   to:main::@return
 main::@return: from main::@1
   [10] return  [ ]
-  to:@RETURN
+  to:@return
 main::@3: from main::@1
   [11] (byte~) main::i#3 ← (byte) main::i#1 [ main::i#3 ]
   to:main::@1
@@ -487,15 +487,15 @@ Created 1 initial phi equivalence classes
 Coalesced [11] main::i#3 ← main::i#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@3
-Block Sequence Planned @BEGIN @END main main::@1 main::@return 
+Block Sequence Planned @begin @end main main::@1 main::@return 
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] *((word) 4352) ← (byte) 0 [ ]
   [2] *((word) 4353) ← (byte) 1 [ ]
   to:main::@1
@@ -510,17 +510,17 @@ main::@1: from main main::@1
   to:main::@return
 main::@return: from main::@1
   [10] return  [ ]
-  to:@RETURN
+  to:@return
 
 CALL GRAPH
 Calls in [] to 0:main 
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@END dominated by  @BEGIN @END 
-main dominated by  @BEGIN main 
-main::@1 dominated by  @BEGIN main::@1 main 
-main::@return dominated by  @BEGIN main::@return main::@1 main 
+@begin dominated by  @begin 
+@end dominated by  @end @begin 
+main dominated by  @begin main 
+main::@1 dominated by  @begin main::@1 main 
+main::@return dominated by  main::@return @begin main::@1 main 
 
 Found back edge: Loop head: main::@1 tails: main::@1 blocks: null
 Populated: Loop head: main::@1 tails: main::@1 blocks: main::@1 
@@ -559,61 +559,62 @@ Allocated zp byte:3 to zp byte:3 [ main::$1 ]
 Allocated zp byte:4 to zp byte:4 [ main::$3 ]
 Allocated zp byte:5 to zp byte:5 [ main::$4 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-  jmp BEND
-//SEG2 @END
-BEND:
+  jmp bend
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] *((word) 4352) ← (byte) 0 [ ] -- _star_cowo1=coby2 
-  lda #$0
-  sta $1100
-//SEG5 [2] *((word) 4353) ← (byte) 1 [ ] -- _star_cowo1=coby2 
-  lda #$1
-  sta $1101
-//SEG6 [3] phi from main to main::@1
-main__B1_from_main:
-//SEG7 [3] phi (byte) main::i#2 = (byte) 0 -- zpby1=coby1 
-  lda #$0
-  sta $2
-  jmp main__B1
-//SEG8 [3] phi from main::@1 to main::@1
-main__B1_from_B1:
-//SEG9 [3] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
-//SEG10 main::@1
-main__B1:
-//SEG11 [4] (byte~) main::$1 ← (word) 4352 *idx (byte) main::i#2 [ main::i#2 main::$1 ] -- zpby1=cowo1_staridx_zpby2 
-  ldx $2
-  lda $1100,x
-  sta $3
-//SEG12 [5] (byte~) main::$3 ← (word) 4353 *idx (byte) main::i#2 [ main::i#2 main::$1 main::$3 ] -- zpby1=cowo1_staridx_zpby2 
-  ldx $2
-  lda $1101,x
-  sta $4
-//SEG13 [6] (byte~) main::$4 ← (byte~) main::$1 + (byte~) main::$3 [ main::i#2 main::$4 ] -- zpby1=zpby2_plus_zpby3 
-  lda $3
-  clc
-  adc $4
-  sta $5
-//SEG14 [7] *((word) 4354 + (byte) main::i#2) ← (byte~) main::$4 [ main::i#2 ] -- cowo1_staridx_zpby1=zpby2 
-  lda $5
-  ldx $2
-  sta $1102,x
-//SEG15 [8] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- zpby1=_inc_zpby1 
-  inc $2
-//SEG16 [9] if((byte) main::i#1<(byte) 15) goto main::@1 [ main::i#1 ] -- zpby1_lt_coby1_then_la1 
-  lda $2
-  cmp #$f
-  bcc main__B1_from_B1
-  jmp main__Breturn
-//SEG17 main::@return
-main__Breturn:
-//SEG18 [10] return  [ ]
-  rts
+main: {
+  //SEG4 [1] *((word) 4352) ← (byte) 0 [ ] -- _star_cowo1=coby2 
+    lda #$0
+    sta $1100
+  //SEG5 [2] *((word) 4353) ← (byte) 1 [ ] -- _star_cowo1=coby2 
+    lda #$1
+    sta $1101
+  //SEG6 [3] phi from main to main::@1
+  b1_from_main:
+  //SEG7 [3] phi (byte) main::i#2 = (byte) 0 -- zpby1=coby1 
+    lda #$0
+    sta $2
+    jmp b1
+  //SEG8 [3] phi from main::@1 to main::@1
+  b1_from_b1:
+  //SEG9 [3] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
+    jmp b1
+  //SEG10 main::@1
+  b1:
+  //SEG11 [4] (byte~) main::$1 ← (word) 4352 *idx (byte) main::i#2 [ main::i#2 main::$1 ] -- zpby1=cowo1_staridx_zpby2 
+    ldx $2
+    lda $1100,x
+    sta $3
+  //SEG12 [5] (byte~) main::$3 ← (word) 4353 *idx (byte) main::i#2 [ main::i#2 main::$1 main::$3 ] -- zpby1=cowo1_staridx_zpby2 
+    ldx $2
+    lda $1101,x
+    sta $4
+  //SEG13 [6] (byte~) main::$4 ← (byte~) main::$1 + (byte~) main::$3 [ main::i#2 main::$4 ] -- zpby1=zpby2_plus_zpby3 
+    lda $3
+    clc
+    adc $4
+    sta $5
+  //SEG14 [7] *((word) 4354 + (byte) main::i#2) ← (byte~) main::$4 [ main::i#2 ] -- cowo1_staridx_zpby1=zpby2 
+    lda $5
+    ldx $2
+    sta $1102,x
+  //SEG15 [8] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- zpby1=_inc_zpby1 
+    inc $2
+  //SEG16 [9] if((byte) main::i#1<(byte) 15) goto main::@1 [ main::i#1 ] -- zpby1_lt_coby1_then_la1 
+    lda $2
+    cmp #$f
+    bcc b1_from_b1
+    jmp breturn
+  //SEG17 main::@return
+  breturn:
+  //SEG18 [10] return  [ ]
+    rts
+}
 
 Statement [1] *((word) 4352) ← (byte) 0 [ ] always clobbers reg byte a 
 Statement [2] *((word) 4353) ← (byte) 1 [ ] always clobbers reg byte a 
@@ -689,102 +690,104 @@ MISSING FRAGMENTS
   yby=yby_plus_cowo1_staridx_aby
   yby=yby_plus_cowo1_staridx_xby
   yby=yby_plus_cowo1_staridx_yby
-Removing instruction jmp BEND
-Removing instruction jmp main__B1
-Removing instruction jmp main__Breturn
+Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] *((word) 4352) ← (byte) 0 [ ] -- _star_cowo1=coby2 
-  lda #$0
-  sta $1100
-//SEG5 [2] *((word) 4353) ← (byte) 1 [ ] -- _star_cowo1=coby2 
-  lda #$1
-  sta $1101
-//SEG6 [3] phi from main to main::@1
-main__B1_from_main:
-//SEG7 [3] phi (byte) main::i#2 = (byte) 0 -- xby=coby1 
-  ldx #$0
-  jmp main__B1
-//SEG8 [3] phi from main::@1 to main::@1
-main__B1_from_B1:
-//SEG9 [3] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-//SEG10 main::@1
-main__B1:
-//SEG11 [4] (byte~) main::$1 ← (word) 4352 *idx (byte) main::i#2 [ main::i#2 main::$1 ] -- aby=cowo1_staridx_xby 
-  lda $1100,x
-//SEG12 [5] (byte~) main::$3 ← (word) 4353 *idx (byte) main::i#2 [ main::i#2 main::$1 main::$3 ]
-  // [5] main::$3 ← 4353 *idx main::i#2  //  ALU
-//SEG13 [6] (byte~) main::$4 ← (byte~) main::$1 + (byte~) main::$3 [ main::i#2 main::$4 ] -- aby=aby_plus_cowo1_staridx_xby 
-  clc
-  adc $1101,x
-//SEG14 [7] *((word) 4354 + (byte) main::i#2) ← (byte~) main::$4 [ main::i#2 ] -- cowo1_staridx_xby=aby 
-  sta $1102,x
-//SEG15 [8] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- xby=_inc_xby 
-  inx
-//SEG16 [9] if((byte) main::i#1<(byte) 15) goto main::@1 [ main::i#1 ] -- xby_lt_coby1_then_la1 
-  cpx #$f
-  bcc main__B1_from_B1
-//SEG17 main::@return
-main__Breturn:
-//SEG18 [10] return  [ ]
-  rts
+main: {
+  //SEG4 [1] *((word) 4352) ← (byte) 0 [ ] -- _star_cowo1=coby2 
+    lda #$0
+    sta $1100
+  //SEG5 [2] *((word) 4353) ← (byte) 1 [ ] -- _star_cowo1=coby2 
+    lda #$1
+    sta $1101
+  //SEG6 [3] phi from main to main::@1
+  b1_from_main:
+  //SEG7 [3] phi (byte) main::i#2 = (byte) 0 -- xby=coby1 
+    ldx #$0
+    jmp b1
+  //SEG8 [3] phi from main::@1 to main::@1
+  b1_from_b1:
+  //SEG9 [3] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
+  //SEG10 main::@1
+  b1:
+  //SEG11 [4] (byte~) main::$1 ← (word) 4352 *idx (byte) main::i#2 [ main::i#2 main::$1 ] -- aby=cowo1_staridx_xby 
+    lda $1100,x
+  //SEG12 [5] (byte~) main::$3 ← (word) 4353 *idx (byte) main::i#2 [ main::i#2 main::$1 main::$3 ]
+    // [5] main::$3 ← 4353 *idx main::i#2  //  ALU
+  //SEG13 [6] (byte~) main::$4 ← (byte~) main::$1 + (byte~) main::$3 [ main::i#2 main::$4 ] -- aby=aby_plus_cowo1_staridx_xby 
+    clc
+    adc $1101,x
+  //SEG14 [7] *((word) 4354 + (byte) main::i#2) ← (byte~) main::$4 [ main::i#2 ] -- cowo1_staridx_xby=aby 
+    sta $1102,x
+  //SEG15 [8] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- xby=_inc_xby 
+    inx
+  //SEG16 [9] if((byte) main::i#1<(byte) 15) goto main::@1 [ main::i#1 ] -- xby_lt_coby1_then_la1 
+    cpx #$f
+    bcc b1_from_b1
+  //SEG17 main::@return
+  breturn:
+  //SEG18 [10] return  [ ]
+    rts
+}
 
-Removing instruction jmp main__B1
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] *((word) 4352) ← (byte) 0 [ ] -- _star_cowo1=coby2 
-  lda #$0
-  sta $1100
-//SEG5 [2] *((word) 4353) ← (byte) 1 [ ] -- _star_cowo1=coby2 
-  lda #$1
-  sta $1101
-//SEG6 [3] phi from main to main::@1
-main__B1_from_main:
-//SEG7 [3] phi (byte) main::i#2 = (byte) 0 -- xby=coby1 
-  ldx #$0
-//SEG8 [3] phi from main::@1 to main::@1
-main__B1_from_B1:
-//SEG9 [3] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-//SEG10 main::@1
-main__B1:
-//SEG11 [4] (byte~) main::$1 ← (word) 4352 *idx (byte) main::i#2 [ main::i#2 main::$1 ] -- aby=cowo1_staridx_xby 
-  lda $1100,x
-//SEG12 [5] (byte~) main::$3 ← (word) 4353 *idx (byte) main::i#2 [ main::i#2 main::$1 main::$3 ]
-  // [5] main::$3 ← 4353 *idx main::i#2  //  ALU
-//SEG13 [6] (byte~) main::$4 ← (byte~) main::$1 + (byte~) main::$3 [ main::i#2 main::$4 ] -- aby=aby_plus_cowo1_staridx_xby 
-  clc
-  adc $1101,x
-//SEG14 [7] *((word) 4354 + (byte) main::i#2) ← (byte~) main::$4 [ main::i#2 ] -- cowo1_staridx_xby=aby 
-  sta $1102,x
-//SEG15 [8] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- xby=_inc_xby 
-  inx
-//SEG16 [9] if((byte) main::i#1<(byte) 15) goto main::@1 [ main::i#1 ] -- xby_lt_coby1_then_la1 
-  cpx #$f
-  bcc main__B1_from_B1
-//SEG17 main::@return
-main__Breturn:
-//SEG18 [10] return  [ ]
-  rts
+main: {
+  //SEG4 [1] *((word) 4352) ← (byte) 0 [ ] -- _star_cowo1=coby2 
+    lda #$0
+    sta $1100
+  //SEG5 [2] *((word) 4353) ← (byte) 1 [ ] -- _star_cowo1=coby2 
+    lda #$1
+    sta $1101
+  //SEG6 [3] phi from main to main::@1
+  b1_from_main:
+  //SEG7 [3] phi (byte) main::i#2 = (byte) 0 -- xby=coby1 
+    ldx #$0
+  //SEG8 [3] phi from main::@1 to main::@1
+  b1_from_b1:
+  //SEG9 [3] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
+  //SEG10 main::@1
+  b1:
+  //SEG11 [4] (byte~) main::$1 ← (word) 4352 *idx (byte) main::i#2 [ main::i#2 main::$1 ] -- aby=cowo1_staridx_xby 
+    lda $1100,x
+  //SEG12 [5] (byte~) main::$3 ← (word) 4353 *idx (byte) main::i#2 [ main::i#2 main::$1 main::$3 ]
+    // [5] main::$3 ← 4353 *idx main::i#2  //  ALU
+  //SEG13 [6] (byte~) main::$4 ← (byte~) main::$1 + (byte~) main::$3 [ main::i#2 main::$4 ] -- aby=aby_plus_cowo1_staridx_xby 
+    clc
+    adc $1101,x
+  //SEG14 [7] *((word) 4354 + (byte) main::i#2) ← (byte~) main::$4 [ main::i#2 ] -- cowo1_staridx_xby=aby 
+    sta $1102,x
+  //SEG15 [8] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- xby=_inc_xby 
+    inx
+  //SEG16 [9] if((byte) main::i#1<(byte) 15) goto main::@1 [ main::i#1 ] -- xby_lt_coby1_then_la1 
+    cpx #$f
+    bcc b1_from_b1
+  //SEG17 main::@return
+  breturn:
+  //SEG18 [10] return  [ ]
+    rts
+}
 
 FINAL SYMBOL TABLE
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte[15]) fibs
 (void()) main()
 (byte~) main::$1 reg byte a 11.0
@@ -802,45 +805,46 @@ reg byte alu [ main::$3 ]
 reg byte a [ main::$4 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] *((word) 4352) ← (byte) 0 [ ] -- _star_cowo1=coby2 
-  lda #$0
-  sta $1100
-//SEG5 [2] *((word) 4353) ← (byte) 1 [ ] -- _star_cowo1=coby2 
-  lda #$1
-  sta $1101
-//SEG6 [3] phi from main to main::@1
-main__B1_from_main:
-//SEG7 [3] phi (byte) main::i#2 = (byte) 0 -- xby=coby1 
-  ldx #$0
-//SEG8 [3] phi from main::@1 to main::@1
-main__B1_from_B1:
-//SEG9 [3] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-//SEG10 main::@1
-main__B1:
-//SEG11 [4] (byte~) main::$1 ← (word) 4352 *idx (byte) main::i#2 [ main::i#2 main::$1 ] -- aby=cowo1_staridx_xby 
-  lda $1100,x
-//SEG12 [5] (byte~) main::$3 ← (word) 4353 *idx (byte) main::i#2 [ main::i#2 main::$1 main::$3 ]
-  // [5] main::$3 ← 4353 *idx main::i#2  //  ALU
-//SEG13 [6] (byte~) main::$4 ← (byte~) main::$1 + (byte~) main::$3 [ main::i#2 main::$4 ] -- aby=aby_plus_cowo1_staridx_xby 
-  clc
-  adc $1101,x
-//SEG14 [7] *((word) 4354 + (byte) main::i#2) ← (byte~) main::$4 [ main::i#2 ] -- cowo1_staridx_xby=aby 
-  sta $1102,x
-//SEG15 [8] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- xby=_inc_xby 
-  inx
-//SEG16 [9] if((byte) main::i#1<(byte) 15) goto main::@1 [ main::i#1 ] -- xby_lt_coby1_then_la1 
-  cpx #$f
-  bcc main__B1_from_B1
-//SEG17 main::@return
-main__Breturn:
-//SEG18 [10] return  [ ]
-  rts
+main: {
+  //SEG4 [1] *((word) 4352) ← (byte) 0 [ ] -- _star_cowo1=coby2 
+    lda #$0
+    sta $1100
+  //SEG5 [2] *((word) 4353) ← (byte) 1 [ ] -- _star_cowo1=coby2 
+    lda #$1
+    sta $1101
+  //SEG6 [3] phi from main to main::@1
+  b1_from_main:
+  //SEG7 [3] phi (byte) main::i#2 = (byte) 0 -- xby=coby1 
+    ldx #$0
+  //SEG8 [3] phi from main::@1 to main::@1
+  b1_from_b1:
+  //SEG9 [3] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
+  //SEG10 main::@1
+  b1:
+  //SEG11 [4] (byte~) main::$1 ← (word) 4352 *idx (byte) main::i#2 [ main::i#2 main::$1 ] -- aby=cowo1_staridx_xby 
+    lda $1100,x
+  //SEG12 [5] (byte~) main::$3 ← (word) 4353 *idx (byte) main::i#2 [ main::i#2 main::$1 main::$3 ]
+    // [5] main::$3 ← 4353 *idx main::i#2  //  ALU
+  //SEG13 [6] (byte~) main::$4 ← (byte~) main::$1 + (byte~) main::$3 [ main::i#2 main::$4 ] -- aby=aby_plus_cowo1_staridx_xby 
+    clc
+    adc $1101,x
+  //SEG14 [7] *((word) 4354 + (byte) main::i#2) ← (byte~) main::$4 [ main::i#2 ] -- cowo1_staridx_xby=aby 
+    sta $1102,x
+  //SEG15 [8] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- xby=_inc_xby 
+    inx
+  //SEG16 [9] if((byte) main::i#1<(byte) 15) goto main::@1 [ main::i#1 ] -- xby_lt_coby1_then_la1 
+    cpx #$f
+    bcc b1_from_b1
+  //SEG17 main::@return
+  breturn:
+  //SEG18 [10] return  [ ]
+    rts
+}
 

src/main/java/dk/camelot64/kickc/test/ref/fibmem.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte[15]) fibs
 (void()) main()
 (byte~) main::$1 reg byte a 11.0

src/main/java/dk/camelot64/kickc/test/ref/flipper-rex2.asm

@@ -1,117 +1,121 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-  jsr prepare
-main__B3_from_main:
-  ldx #$19
-  jmp main__B3
-main__B3_from_B11:
-  ldx #$19
-main__B3_from_B3:
-main__B3_from_B6:
-main__B3:
-  lda $d012
-  cmp #$fe
-  bne main__B3_from_B3
-main__B4:
-  lda $d012
-  cmp #$ff
-  bne main__B4
-main__B6:
-  dex
-  cpx #$0
-  bne main__B3_from_B6
-main__B7:
-  jsr flip
-main__B10:
-  jsr plot
-main__B11:
-  jmp main__B3_from_B11
-main__Breturn:
-  rts
-plot:
-plot__B1_from_plot:
-  lda #$10
-  sta $4
-  lda #<$4d4
-  sta $2
-  lda #>$4d4
-  sta $2+$1
-  ldx #$0
-plot__B1_from_B3:
-plot__B1:
-plot__B2_from_B1:
-  ldy #$0
-plot__B2_from_B2:
-plot__B2:
-  lda $1000,x
-  sta ($2),y
-  inx
-  iny
-  cpy #$10
-  bcc plot__B2_from_B2
-plot__B3:
-  lda $2
-  clc
-  adc #$28
-  sta $2
-  bcc !+
-  inc $2+$1
-!:
-  dec $4
-  lda $4
-  bne plot__B1_from_B3
-plot__Breturn:
-  rts
-flip:
-flip__B1_from_flip:
-  lda #$10
-  sta $4
-  ldy #$f
-  ldx #$0
-flip__B1_from_B4:
-flip__B1:
-flip__B2_from_B1:
-  lda #$10
-  sta $5
-flip__B2_from_B2:
-flip__B2:
-  lda $1000,x
-  sta $1100,y
-  inx
-  tya
-  clc
-  adc #$10
-  tay
-  dec $5
-  lda $5
-  bne flip__B2_from_B2
-flip__B4:
-  dey
-  dec $4
-  lda $4
-  bne flip__B1_from_B4
-flip__B3_from_B4:
-  ldx #$0
-flip__B3_from_B3:
-flip__B3:
-  lda $1100,x
-  sta $1000,x
-  inx
-  cpx #$0
-  bne flip__B3_from_B3
-flip__Breturn:
-  rts
-prepare:
-prepare__B1_from_prepare:
-  ldx #$0
-prepare__B1_from_B1:
-prepare__B1:
-  txa
-  sta $1000,x
-  inx
-  cpx #$0
-  bne prepare__B1_from_B1
-prepare__Breturn:
-  rts
+bend:
+main: {
+    jsr prepare
+  b3_from_main:
+    ldx #$19
+    jmp b3
+  b3_from_b11:
+    ldx #$19
+  b3_from_b3:
+  b3_from_b6:
+  b3:
+    lda $d012
+    cmp #$fe
+    bne b3_from_b3
+  b4:
+    lda $d012
+    cmp #$ff
+    bne b4
+  b6:
+    dex
+    cpx #$0
+    bne b3_from_b6
+  b7:
+    jsr flip
+  b10:
+    jsr plot
+  b11:
+    jmp b3_from_b11
+  breturn:
+    rts
+}
+plot: {
+  b1_from_plot:
+    lda #$10
+    sta $4
+    lda #<$4d4
+    sta $2
+    lda #>$4d4
+    sta $2+$1
+    ldx #$0
+  b1_from_b3:
+  b1:
+  b2_from_b1:
+    ldy #$0
+  b2_from_b2:
+  b2:
+    lda $1000,x
+    sta ($2),y
+    inx
+    iny
+    cpy #$10
+    bcc b2_from_b2
+  b3:
+    lda $2
+    clc
+    adc #$28
+    sta $2
+    bcc !+
+    inc $2+$1
+  !:
+    dec $4
+    lda $4
+    bne b1_from_b3
+  breturn:
+    rts
+}
+flip: {
+  b1_from_flip:
+    lda #$10
+    sta $4
+    ldy #$f
+    ldx #$0
+  b1_from_b4:
+  b1:
+  b2_from_b1:
+    lda #$10
+    sta $5
+  b2_from_b2:
+  b2:
+    lda $1000,x
+    sta $1100,y
+    inx
+    tya
+    clc
+    adc #$10
+    tay
+    dec $5
+    lda $5
+    bne b2_from_b2
+  b4:
+    dey
+    dec $4
+    lda $4
+    bne b1_from_b4
+  b3_from_b4:
+    ldx #$0
+  b3_from_b3:
+  b3:
+    lda $1100,x
+    sta $1000,x
+    inx
+    cpx #$0
+    bne b3_from_b3
+  breturn:
+    rts
+}
+prepare: {
+  b1_from_prepare:
+    ldx #$0
+  b1_from_b1:
+  b1:
+    txa
+    sta $1000,x
+    inx
+    cpx #$0
+    bne b1_from_b1
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/flipper-rex2.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call prepare param-assignment [ ]
   to:main::@3
 main::@3: from main main::@11 main::@3 main::@6
@@ -29,7 +29,7 @@ main::@11: from main::@10
   to:main::@return
 main::@return: from main::@11
   [12] return  [ ]
-  to:@RETURN
+  to:@return
 plot: from main::@10
   to:plot::@1
 plot::@1: from plot plot::@3
@@ -53,7 +53,7 @@ plot::@3: from plot::@2
   to:plot::@return
 plot::@return: from plot::@3
   [23] return  [ ]
-  to:@RETURN
+  to:@return
 flip: from main::@7
   to:flip::@1
 flip::@1: from flip flip::@4
@@ -86,7 +86,7 @@ flip::@3: from flip::@3 flip::@4
   to:flip::@return
 flip::@return: from flip::@3
   [40] return  [ ]
-  to:@RETURN
+  to:@return
 prepare: from main
   to:prepare::@1
 prepare::@1: from prepare prepare::@1
@@ -97,4 +97,4 @@ prepare::@1: from prepare prepare::@1
   to:prepare::@return
 prepare::@return: from prepare::@1
   [45] return  [ ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/flipper-rex2.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte*) RASTER
 (byte[1000]) SCREEN
 (byte[256]) buffer1

src/main/java/dk/camelot64/kickc/test/ref/loopmin.asm

@@ -1,22 +1,22 @@
-BBEGIN:
-B1_from_BBEGIN:
+bbegin:
+b1_from_bbegin:
   lda #$0
   ldx #$a
-B1_from_B3:
-B1:
+b1_from_b3:
+b1:
   cpx #$5
   beq !+
-  bcs B2
+  bcs b2
 !:
-B3_from_B1:
-B3:
+b3_from_b1:
+b3:
   dex
   cpx #$0
-  bne B1_from_B3
-BEND:
-B2:
+  bne b1_from_b3
+bend:
+b2:
   stx $ff
   clc
   adc $ff
-B3_from_B2:
-  jmp B3
+b3_from_b2:
+  jmp b3

src/main/java/dk/camelot64/kickc/test/ref/loopmin.cfg

@@ -1,16 +1,16 @@
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  [0] (byte) s#2 ← phi( @3/(byte) s#4 @BEGIN/(byte) 0 ) [ i#2 s#2 ]
-  [0] (byte) i#2 ← phi( @3/(byte) i#1 @BEGIN/(byte) 10 ) [ i#2 s#2 ]
+@1: from @3 @begin
+  [0] (byte) s#2 ← phi( @3/(byte) s#4 @begin/(byte) 0 ) [ i#2 s#2 ]
+  [0] (byte) i#2 ← phi( @3/(byte) i#1 @begin/(byte) 10 ) [ i#2 s#2 ]
   [1] if((byte) i#2>(byte) 5) goto @2 [ i#2 s#2 ]
   to:@3
 @3: from @1 @2
   [2] (byte) s#4 ← phi( @1/(byte) s#2 @2/(byte) s#1 ) [ s#4 i#2 ]
   [3] (byte) i#1 ← -- (byte) i#2 [ i#1 s#4 ]
   [4] if((byte) i#1>(byte) 0) goto @1 [ i#1 s#4 ]
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 @2: from @1
   [5] (byte) s#1 ← (byte) s#2 + (byte) i#2 [ i#2 s#1 ]
   to:@3

src/main/java/dk/camelot64/kickc/test/ref/loopmin.log

@@ -33,11 +33,11 @@ SYMBOLS
 (byte) s
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) i ← (byte) 10
   (byte) s ← (byte) 0
   to:@1
-@1: from @3 @BEGIN
+@1: from @3 @begin
   (boolean~) $0 ← (byte) i > (byte) 5
   if((boolean~) $0) goto @2
   to:@4
@@ -55,18 +55,18 @@ INITIAL CONTROL FLOW GRAPH
 @5: from
   to:@2
 @6: from @3
-  to:@END
-@END: from @6
+  to:@end
+@end: from @6
 
 Removing empty block @4
 Removing empty block @5
 Removing empty block @6
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) i ← (byte) 10
   (byte) s ← (byte) 0
   to:@1
-@1: from @3 @BEGIN
+@1: from @3 @begin
   (boolean~) $0 ← (byte) i > (byte) 5
   if((boolean~) $0) goto @2
   to:@3
@@ -78,17 +78,17 @@ CONTROL FLOW GRAPH
   (byte) i ← -- (byte) i
   (boolean~) $2 ← (byte) i > (byte) 0
   if((boolean~) $2) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   (byte) i ← (byte) 10
   (byte) s ← (byte) 0
   to:@1
-@1: from @3 @BEGIN
+@1: from @3 @begin
   (boolean~) $0 ← (byte) i > (byte) 5
   if((boolean~) $0) goto @2
   to:@3
@@ -100,20 +100,20 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
   (byte) i ← -- (byte) i
   (boolean~) $2 ← (byte) i > (byte) 0
   if((boolean~) $2) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Completing Phi functions...
 Completing Phi functions...
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   (byte) i#0 ← (byte) 10
   (byte) s#0 ← (byte) 0
   to:@1
-@1: from @3 @BEGIN
-  (byte) s#3 ← phi( @3/(byte) s#4 @BEGIN/(byte) s#0 )
-  (byte) i#2 ← phi( @3/(byte) i#1 @BEGIN/(byte) i#0 )
+@1: from @3 @begin
+  (byte) s#3 ← phi( @3/(byte) s#4 @begin/(byte) s#0 )
+  (byte) i#2 ← phi( @3/(byte) i#1 @begin/(byte) i#0 )
   (boolean~) $0 ← (byte) i#2 > (byte) 5
   if((boolean~) $0) goto @2
   to:@3
@@ -129,17 +129,17 @@ CONTROL FLOW GRAPH SSA
   (byte) i#1 ← -- (byte) i#4
   (boolean~) $2 ← (byte) i#1 > (byte) 0
   if((boolean~) $2) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   (byte) i#0 ← (byte) 10
   (byte) s#0 ← (byte) 0
   to:@1
-@1: from @3 @BEGIN
-  (byte) s#3 ← phi( @3/(byte) s#4 @BEGIN/(byte) s#0 )
-  (byte) i#2 ← phi( @3/(byte) i#1 @BEGIN/(byte) i#0 )
+@1: from @3 @begin
+  (byte) s#3 ← phi( @3/(byte) s#4 @begin/(byte) s#0 )
+  (byte) i#2 ← phi( @3/(byte) i#1 @begin/(byte) i#0 )
   (boolean~) $0 ← (byte) i#2 > (byte) 5
   if((boolean~) $0) goto @2
   to:@3
@@ -155,18 +155,18 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
   (byte) i#1 ← -- (byte) i#4
   (boolean~) $2 ← (byte) i#1 > (byte) 0
   if((boolean~) $2) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Constant (byte) i#0 (byte) 10
 Constant (byte) s#0 (byte) 0
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  (byte) s#3 ← phi( @3/(byte) s#4 @BEGIN/(byte) 0 )
-  (byte) i#2 ← phi( @3/(byte) i#1 @BEGIN/(byte) 10 )
+@1: from @3 @begin
+  (byte) s#3 ← phi( @3/(byte) s#4 @begin/(byte) 0 )
+  (byte) i#2 ← phi( @3/(byte) i#1 @begin/(byte) 10 )
   (boolean~) $0 ← (byte) i#2 > (byte) 5
   if((boolean~) $0) goto @2
   to:@3
@@ -182,19 +182,19 @@ CONTROL FLOW GRAPH
   (byte) i#1 ← -- (byte) i#4
   (boolean~) $2 ← (byte) i#1 > (byte) 0
   if((boolean~) $2) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Alias (byte) s#2 = (byte) s#3 
 Alias (byte) i#2 = (byte) i#3 
 Alias (byte) s#1 = (byte~) $1 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  (byte) s#2 ← phi( @3/(byte) s#4 @BEGIN/(byte) 0 )
-  (byte) i#2 ← phi( @3/(byte) i#1 @BEGIN/(byte) 10 )
+@1: from @3 @begin
+  (byte) s#2 ← phi( @3/(byte) s#4 @begin/(byte) 0 )
+  (byte) i#2 ← phi( @3/(byte) i#1 @begin/(byte) 10 )
   (boolean~) $0 ← (byte) i#2 > (byte) 5
   if((boolean~) $0) goto @2
   to:@3
@@ -207,17 +207,17 @@ CONTROL FLOW GRAPH
   (byte) i#1 ← -- (byte) i#4
   (boolean~) $2 ← (byte) i#1 > (byte) 0
   if((boolean~) $2) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Redundant Phi (byte) i#4 (byte) i#2
 Succesful SSA optimization Pass2RedundantPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  (byte) s#2 ← phi( @3/(byte) s#4 @BEGIN/(byte) 0 )
-  (byte) i#2 ← phi( @3/(byte) i#1 @BEGIN/(byte) 10 )
+@1: from @3 @begin
+  (byte) s#2 ← phi( @3/(byte) s#4 @begin/(byte) 0 )
+  (byte) i#2 ← phi( @3/(byte) i#1 @begin/(byte) 10 )
   (boolean~) $0 ← (byte) i#2 > (byte) 5
   if((boolean~) $0) goto @2
   to:@3
@@ -229,18 +229,18 @@ CONTROL FLOW GRAPH
   (byte) i#1 ← -- (byte) i#2
   (boolean~) $2 ← (byte) i#1 > (byte) 0
   if((boolean~) $2) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
 Simple Condition (boolean~) $0 if((byte) i#2>(byte) 5) goto @2
 Simple Condition (boolean~) $2 if((byte) i#1>(byte) 0) goto @1
 Succesful SSA optimization Pass2ConditionalJumpSimplification
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  (byte) s#2 ← phi( @3/(byte) s#4 @BEGIN/(byte) 0 )
-  (byte) i#2 ← phi( @3/(byte) i#1 @BEGIN/(byte) 10 )
+@1: from @3 @begin
+  (byte) s#2 ← phi( @3/(byte) s#4 @begin/(byte) 0 )
+  (byte) i#2 ← phi( @3/(byte) i#1 @begin/(byte) 10 )
   if((byte) i#2>(byte) 5) goto @2
   to:@3
 @2: from @1
@@ -250,19 +250,19 @@ CONTROL FLOW GRAPH
   (byte) s#4 ← phi( @1/(byte) s#2 @2/(byte) s#1 )
   (byte) i#1 ← -- (byte) i#2
   if((byte) i#1>(byte) 0) goto @1
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 
-Block Sequence Planned @BEGIN @1 @3 @END @2 
+Block Sequence Planned @begin @1 @3 @end @2 
 Added new block during phi lifting @7(between @3 and @1)
 Added new block during phi lifting @8(between @1 and @3)
-Block Sequence Planned @BEGIN @1 @8 @3 @END @7 @2 
+Block Sequence Planned @begin @1 @8 @3 @end @7 @2 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @7 @BEGIN
-  (byte) s#2 ← phi( @7/(byte~) s#5 @BEGIN/(byte) 0 )
-  (byte) i#2 ← phi( @7/(byte~) i#5 @BEGIN/(byte) 10 )
+@1: from @7 @begin
+  (byte) s#2 ← phi( @7/(byte~) s#5 @begin/(byte) 0 )
+  (byte) i#2 ← phi( @7/(byte~) i#5 @begin/(byte) 10 )
   if((byte) i#2>(byte) 5) goto @2
   to:@8
 @8: from @1
@@ -272,8 +272,8 @@ CONTROL FLOW GRAPH - PHI LIFTED
   (byte) s#4 ← phi( @8/(byte~) s#6 @2/(byte~) s#7 )
   (byte) i#1 ← -- (byte) i#2
   if((byte) i#1>(byte) 0) goto @7
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 @7: from @3
   (byte~) i#5 ← (byte) i#1
   (byte~) s#5 ← (byte) s#4
@@ -288,11 +288,11 @@ Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @7 @BEGIN
-  [0] (byte) s#2 ← phi( @7/(byte~) s#5 @BEGIN/(byte) 0 ) [ i#2 s#2 ]
-  [0] (byte) i#2 ← phi( @7/(byte~) i#5 @BEGIN/(byte) 10 ) [ i#2 s#2 ]
+@1: from @7 @begin
+  [0] (byte) s#2 ← phi( @7/(byte~) s#5 @begin/(byte) 0 ) [ i#2 s#2 ]
+  [0] (byte) i#2 ← phi( @7/(byte~) i#5 @begin/(byte) 10 ) [ i#2 s#2 ]
   [1] if((byte) i#2>(byte) 5) goto @2 [ i#2 s#2 ]
   to:@8
 @8: from @1
@@ -302,8 +302,8 @@ CONTROL FLOW GRAPH - LIVE RANGES
   [3] (byte) s#4 ← phi( @8/(byte~) s#6 @2/(byte~) s#7 ) [ i#2 s#4 ]
   [4] (byte) i#1 ← -- (byte) i#2 [ i#1 s#4 ]
   [5] if((byte) i#1>(byte) 0) goto @7 [ i#1 s#4 ]
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 @7: from @3
   [6] (byte~) i#5 ← (byte) i#1 [ i#5 s#4 ]
   [7] (byte~) s#5 ← (byte) s#4 [ i#5 s#5 ]
@@ -321,24 +321,24 @@ Coalesced [9] s#7 ← s#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) @8
 Culled Empty Block (label) @7
-Block Sequence Planned @BEGIN @1 @3 @END @2 
+Block Sequence Planned @begin @1 @3 @end @2 
 Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  [0] (byte) s#2 ← phi( @3/(byte) s#4 @BEGIN/(byte) 0 ) [ i#2 s#2 ]
-  [0] (byte) i#2 ← phi( @3/(byte) i#1 @BEGIN/(byte) 10 ) [ i#2 s#2 ]
+@1: from @3 @begin
+  [0] (byte) s#2 ← phi( @3/(byte) s#4 @begin/(byte) 0 ) [ i#2 s#2 ]
+  [0] (byte) i#2 ← phi( @3/(byte) i#1 @begin/(byte) 10 ) [ i#2 s#2 ]
   [1] if((byte) i#2>(byte) 5) goto @2 [ i#2 s#2 ]
   to:@3
 @3: from @1 @2
   [2] (byte) s#4 ← phi( @1/(byte) s#2 @2/(byte) s#1 ) [ s#4 i#2 ]
   [3] (byte) i#1 ← -- (byte) i#2 [ i#1 s#4 ]
   [4] if((byte) i#1>(byte) 0) goto @1 [ i#1 s#4 ]
-  to:@END
-@END: from @3
+  to:@end
+@end: from @3
 @2: from @1
   [5] (byte) s#1 ← (byte) s#2 + (byte) i#2 [ i#2 s#1 ]
   to:@3
@@ -346,11 +346,11 @@ CONTROL FLOW GRAPH - PHI MEM COALESCED
 CALL GRAPH
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@1 dominated by  @1 @BEGIN 
-@3 dominated by  @1 @BEGIN @3 
-@END dominated by  @1 @BEGIN @3 @END 
-@2 dominated by  @1 @BEGIN @2 
+@begin dominated by  @begin 
+@1 dominated by  @1 @begin 
+@3 dominated by  @1 @3 @begin 
+@end dominated by  @1 @3 @end @begin 
+@2 dominated by  @1 @2 @begin 
 
 Found back edge: Loop head: @1 tails: @3 blocks: null
 Populated: Loop head: @1 tails: @3 blocks: @3 @1 @2 
@@ -381,55 +381,55 @@ Complete equivalence classes
 Allocated zp byte:2 to zp byte:2 [ i#2 i#1 ]
 Allocated zp byte:3 to zp byte:3 [ s#2 s#4 s#1 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) s#2 = (byte) 0 -- zpby1=coby1 
   lda #$0
   sta $3
 //SEG3 [0] phi (byte) i#2 = (byte) 10 -- zpby1=coby1 
   lda #$a
   sta $2
-  jmp B1
+  jmp b1
 //SEG4 [0] phi from @3 to @1
-B1_from_B3:
+b1_from_b3:
 //SEG5 [0] phi (byte) s#2 = (byte) s#4 -- register_copy 
 //SEG6 [0] phi (byte) i#2 = (byte) i#1 -- register_copy 
-  jmp B1
+  jmp b1
 //SEG7 @1
-B1:
+b1:
 //SEG8 [1] if((byte) i#2>(byte) 5) goto @2 [ i#2 s#2 ] -- zpby1_gt_coby1_then_la1 
   lda $2
   cmp #$5
   beq !+
-  bcs B2
+  bcs b2
 !:
 //SEG9 [2] phi from @1 to @3
-B3_from_B1:
+b3_from_b1:
 //SEG10 [2] phi (byte) s#4 = (byte) s#2 -- register_copy 
-  jmp B3
+  jmp b3
 //SEG11 @3
-B3:
+b3:
 //SEG12 [3] (byte) i#1 ← -- (byte) i#2 [ i#1 s#4 ] -- zpby1=_dec_zpby1 
   dec $2
 //SEG13 [4] if((byte) i#1>(byte) 0) goto @1 [ i#1 s#4 ] -- zpby1_gt_0_then_la1 
   lda $2
-  bne B1_from_B3
-  jmp BEND
-//SEG14 @END
-BEND:
+  bne b1_from_b3
+  jmp bend
+//SEG14 @end
+bend:
 //SEG15 @2
-B2:
+b2:
 //SEG16 [5] (byte) s#1 ← (byte) s#2 + (byte) i#2 [ i#2 s#1 ] -- zpby1=zpby1_plus_zpby2 
   lda $3
   clc
   adc $2
   sta $3
 //SEG17 [2] phi from @2 to @3
-B3_from_B2:
+b3_from_b2:
 //SEG18 [2] phi (byte) s#4 = (byte) s#1 -- register_copy 
-  jmp B3
+  jmp b3
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Potential registers zp byte:2 [ i#2 i#1 ] : zp byte:2 , reg byte a , reg byte x , reg byte y , 
@@ -439,105 +439,105 @@ REGISTER UPLIFT SCOPES
 Uplift Scope [] 49.5: zp byte:3 [ s#2 s#4 s#1 ] 27.5: zp byte:2 [ i#2 i#1 ] 
 
 Uplifting [] best 405 combination reg byte a [ s#2 s#4 s#1 ] reg byte x [ i#2 i#1 ] 
-Removing instruction jmp B1
-Removing instruction jmp B3
-Removing instruction jmp BEND
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp bend
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) s#2 = (byte) 0 -- aby=coby1 
   lda #$0
 //SEG3 [0] phi (byte) i#2 = (byte) 10 -- xby=coby1 
   ldx #$a
-  jmp B1
+  jmp b1
 //SEG4 [0] phi from @3 to @1
-B1_from_B3:
+b1_from_b3:
 //SEG5 [0] phi (byte) s#2 = (byte) s#4 -- register_copy 
 //SEG6 [0] phi (byte) i#2 = (byte) i#1 -- register_copy 
 //SEG7 @1
-B1:
+b1:
 //SEG8 [1] if((byte) i#2>(byte) 5) goto @2 [ i#2 s#2 ] -- xby_gt_coby1_then_la1 
   cpx #$5
   beq !+
-  bcs B2
+  bcs b2
 !:
 //SEG9 [2] phi from @1 to @3
-B3_from_B1:
+b3_from_b1:
 //SEG10 [2] phi (byte) s#4 = (byte) s#2 -- register_copy 
 //SEG11 @3
-B3:
+b3:
 //SEG12 [3] (byte) i#1 ← -- (byte) i#2 [ i#1 s#4 ] -- xby=_dec_xby 
   dex
 //SEG13 [4] if((byte) i#1>(byte) 0) goto @1 [ i#1 s#4 ] -- xby_gt_0_then_la1 
   cpx #$0
-  bne B1_from_B3
-//SEG14 @END
-BEND:
+  bne b1_from_b3
+//SEG14 @end
+bend:
 //SEG15 @2
-B2:
+b2:
 //SEG16 [5] (byte) s#1 ← (byte) s#2 + (byte) i#2 [ i#2 s#1 ] -- aby=aby_plus_xby 
   stx $ff
   clc
   adc $ff
 //SEG17 [2] phi from @2 to @3
-B3_from_B2:
+b3_from_b2:
 //SEG18 [2] phi (byte) s#4 = (byte) s#1 -- register_copy 
-  jmp B3
+  jmp b3
 
-Removing instruction jmp B1
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) s#2 = (byte) 0 -- aby=coby1 
   lda #$0
 //SEG3 [0] phi (byte) i#2 = (byte) 10 -- xby=coby1 
   ldx #$a
 //SEG4 [0] phi from @3 to @1
-B1_from_B3:
+b1_from_b3:
 //SEG5 [0] phi (byte) s#2 = (byte) s#4 -- register_copy 
 //SEG6 [0] phi (byte) i#2 = (byte) i#1 -- register_copy 
 //SEG7 @1
-B1:
+b1:
 //SEG8 [1] if((byte) i#2>(byte) 5) goto @2 [ i#2 s#2 ] -- xby_gt_coby1_then_la1 
   cpx #$5
   beq !+
-  bcs B2
+  bcs b2
 !:
 //SEG9 [2] phi from @1 to @3
-B3_from_B1:
+b3_from_b1:
 //SEG10 [2] phi (byte) s#4 = (byte) s#2 -- register_copy 
 //SEG11 @3
-B3:
+b3:
 //SEG12 [3] (byte) i#1 ← -- (byte) i#2 [ i#1 s#4 ] -- xby=_dec_xby 
   dex
 //SEG13 [4] if((byte) i#1>(byte) 0) goto @1 [ i#1 s#4 ] -- xby_gt_0_then_la1 
   cpx #$0
-  bne B1_from_B3
-//SEG14 @END
-BEND:
+  bne b1_from_b3
+//SEG14 @end
+bend:
 //SEG15 @2
-B2:
+b2:
 //SEG16 [5] (byte) s#1 ← (byte) s#2 + (byte) i#2 [ i#2 s#1 ] -- aby=aby_plus_xby 
   stx $ff
   clc
   adc $ff
 //SEG17 [2] phi from @2 to @3
-B3_from_B2:
+b3_from_b2:
 //SEG18 [2] phi (byte) s#4 = (byte) s#1 -- register_copy 
-  jmp B3
+  jmp b3
 
 FINAL SYMBOL TABLE
 (label) @1
 (label) @2
 (label) @3
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte) i
 (byte) i#1 reg byte x 16.5
 (byte) i#2 reg byte x 11.0
@@ -550,45 +550,45 @@ reg byte x [ i#2 i#1 ]
 reg byte a [ s#2 s#4 s#1 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) s#2 = (byte) 0 -- aby=coby1 
   lda #$0
 //SEG3 [0] phi (byte) i#2 = (byte) 10 -- xby=coby1 
   ldx #$a
 //SEG4 [0] phi from @3 to @1
-B1_from_B3:
+b1_from_b3:
 //SEG5 [0] phi (byte) s#2 = (byte) s#4 -- register_copy 
 //SEG6 [0] phi (byte) i#2 = (byte) i#1 -- register_copy 
 //SEG7 @1
-B1:
+b1:
 //SEG8 [1] if((byte) i#2>(byte) 5) goto @2 [ i#2 s#2 ] -- xby_gt_coby1_then_la1 
   cpx #$5
   beq !+
-  bcs B2
+  bcs b2
 !:
 //SEG9 [2] phi from @1 to @3
-B3_from_B1:
+b3_from_b1:
 //SEG10 [2] phi (byte) s#4 = (byte) s#2 -- register_copy 
 //SEG11 @3
-B3:
+b3:
 //SEG12 [3] (byte) i#1 ← -- (byte) i#2 [ i#1 s#4 ] -- xby=_dec_xby 
   dex
 //SEG13 [4] if((byte) i#1>(byte) 0) goto @1 [ i#1 s#4 ] -- xby_gt_0_then_la1 
   cpx #$0
-  bne B1_from_B3
-//SEG14 @END
-BEND:
+  bne b1_from_b3
+//SEG14 @end
+bend:
 //SEG15 @2
-B2:
+b2:
 //SEG16 [5] (byte) s#1 ← (byte) s#2 + (byte) i#2 [ i#2 s#1 ] -- aby=aby_plus_xby 
   stx $ff
   clc
   adc $ff
 //SEG17 [2] phi from @2 to @3
-B3_from_B2:
+b3_from_b2:
 //SEG18 [2] phi (byte) s#4 = (byte) s#1 -- register_copy 
-  jmp B3
+  jmp b3
 

src/main/java/dk/camelot64/kickc/test/ref/loopmin.sym

@@ -1,8 +1,8 @@
 (label) @1
 (label) @2
 (label) @3
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte) i
 (byte) i#1 reg byte x 16.5
 (byte) i#2 reg byte x 11.0

src/main/java/dk/camelot64/kickc/test/ref/loopnest.asm

@@ -1,26 +1,28 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-main__B1_from_main:
-  ldy #$64
-main__B1_from_B3:
-main__B1:
-  jsr nest
-main__B3:
-  dey
-  cpy #$0
-  bne main__B1_from_B3
-main__Breturn:
-  rts
-nest:
-nest__B1_from_nest:
-  ldx #$64
-nest__B1_from_B1:
-nest__B1:
-  stx $400
-  dex
-  cpx #$0
-  bne nest__B1_from_B1
-nest__Breturn:
-  rts
+bend:
+main: {
+  b1_from_main:
+    ldy #$64
+  b1_from_b3:
+  b1:
+    jsr nest
+  b3:
+    dey
+    cpy #$0
+    bne b1_from_b3
+  breturn:
+    rts
+}
+nest: {
+  b1_from_nest:
+    ldx #$64
+  b1_from_b1:
+  b1:
+    stx $400
+    dex
+    cpx #$0
+    bne b1_from_b1
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/loopnest.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@3
   [1] (byte) main::i#2 ← phi( main/(byte) 100 main::@3/(byte) main::i#1 ) [ main::i#2 ]
@@ -14,7 +14,7 @@ main::@3: from main::@1
   to:main::@return
 main::@return: from main::@3
   [5] return  [ ]
-  to:@RETURN
+  to:@return
 nest: from main::@1
   to:nest::@1
 nest::@1: from nest nest::@1
@@ -25,4 +25,4 @@ nest::@1: from nest nest::@1
   to:nest::@return
 nest::@return: from nest::@1
   [10] return  [ main::i#2 ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/loopnest.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte*) SCREEN
 (void()) main()
 (label) main::@1

src/main/java/dk/camelot64/kickc/test/ref/loopnest2.asm

@@ -1,66 +1,69 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-main__B1_from_main:
-  lda #$64
-  sta $2
-main__B1_from_B3:
-main__B1:
-main__B2_from_B1:
-  lda #$64
-  sta $3
-main__B2_from_B5:
-main__B2:
-  jsr nest1
-main__B5:
-  dec $3
-  lda $3
-  bne main__B2_from_B5
-main__B3:
-  dec $2
-  lda $2
-  bne main__B1_from_B3
-main__Breturn:
-  rts
-nest1:
-nest1__B1_from_nest1:
-  lda #$64
-  sta $4
-nest1__B1_from_B3:
-nest1__B1:
-nest1__B2_from_B1:
-  lda #$64
-nest1__B2_from_B5:
-nest1__B2:
-  jsr nest2
-nest1__B5:
-  sec
-  sbc #$1
-  cmp #$0
-  bne nest1__B2_from_B5
-nest1__B3:
-  dec $4
-  lda $4
-  bne nest1__B1_from_B3
-nest1__Breturn:
-  rts
-nest2:
-nest2__B1_from_nest2:
-  ldx #$64
-nest2__B1_from_B3:
-nest2__B1:
-nest2__B2_from_B1:
-  ldy #$64
-nest2__B2_from_B2:
-nest2__B2:
-  sty $400
-  dey
-  cpy #$0
-  bne nest2__B2_from_B2
-nest2__B3:
-  dex
-  cpx #$0
-  bne nest2__B1_from_B3
-nest2__Breturn:
-  rts
+bend:
+main: {
+  b1_from_main:
+    lda #$64
+    sta $2
+  b1_from_b3:
+  b1:
+  b2_from_b1:
+    lda #$64
+    sta $3
+  b2_from_b5:
+  b2:
+    jsr nest1
+  b5:
+    dec $3
+    lda $3
+    bne b2_from_b5
+  b3:
+    dec $2
+    lda $2
+    bne b1_from_b3
+  breturn:
+    rts
+}
+nest1: {
+  b1_from_nest1:
+    lda #$64
+    sta $4
+  b1_from_b3:
+  b1:
+  b2_from_b1:
+    lda #$64
+  b2_from_b5:
+  b2:
+    jsr nest2
+  b5:
+    sec
+    sbc #$1
+    cmp #$0
+    bne b2_from_b5
+  b3:
+    dec $4
+    lda $4
+    bne b1_from_b3
+  breturn:
+    rts
+}
+nest2: {
+  b1_from_nest2:
+    ldx #$64
+  b1_from_b3:
+  b1:
+  b2_from_b1:
+    ldy #$64
+  b2_from_b2:
+  b2:
+    sty $400
+    dey
+    cpy #$0
+    bne b2_from_b2
+  b3:
+    dex
+    cpx #$0
+    bne b1_from_b3
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/loopnest2.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@3
   [1] (byte) main::i#2 ← phi( main/(byte) 100 main::@3/(byte) main::i#1 ) [ main::i#2 ]
@@ -21,7 +21,7 @@ main::@3: from main::@5
   to:main::@return
 main::@return: from main::@3
   [8] return  [ ]
-  to:@RETURN
+  to:@return
 nest1: from main::@2
   to:nest1::@1
 nest1::@1: from nest1 nest1::@3
@@ -41,7 +41,7 @@ nest1::@3: from nest1::@5
   to:nest1::@return
 nest1::@return: from nest1::@3
   [16] return  [ main::j#2 main::i#2 ]
-  to:@RETURN
+  to:@return
 nest2: from nest1::@2
   to:nest2::@1
 nest2::@1: from nest2 nest2::@3
@@ -59,4 +59,4 @@ nest2::@3: from nest2::@2
   to:nest2::@return
 nest2::@return: from nest2::@3
   [24] return  [ main::j#2 main::i#2 nest1::j#2 nest1::i#2 ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/loopnest2.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte*) SCREEN
 (void()) main()
 (label) main::@1

src/main/java/dk/camelot64/kickc/test/ref/loopsplit.asm

@@ -1,26 +1,27 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-main__B1_from_main:
-  ldy #$0
-  ldx #$64
-main__B1:
-  dex
-  cpx #$0
-  bne main__B2
-main__Breturn:
-  rts
-main__B2:
+bend:
+main: {
+  b1_from_main:
+    ldy #$0
+    ldx #$64
+  b1:
+    dex
+    cpx #$0
+    bne b2
+  breturn:
+    rts
+}
+b2:
   cpx #$32
   beq !+
-  bcs main__B4
+  bcs b4
 !:
-main__B5:
+b5:
   dey
-main__B1_from_B5:
-  jmp main__B1
-main__B4:
+b1_from_b5:
+  jmp b1
+b4:
   iny
-main__B1_from_B4:
-  jmp main__B1
+b1_from_b4:
+  jmp b1

src/main/java/dk/camelot64/kickc/test/ref/loopsplit.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@4 main::@5
   [1] (byte) main::s#3 ← phi( main/(byte) 0 main::@4/(byte) main::s#1 main::@5/(byte) main::s#2 ) [ main::i#2 main::s#3 ]
@@ -12,7 +12,7 @@ main::@1: from main main::@4 main::@5
   to:main::@return
 main::@return: from main::@1
   [4] return  [ ]
-  to:@RETURN
+  to:@return
 main::@2: from main::@1
   [5] if((byte) main::i#1>(byte) 50) goto main::@4 [ main::i#1 main::s#3 ]
   to:main::@5

src/main/java/dk/camelot64/kickc/test/ref/loopsplit.log

@@ -57,7 +57,7 @@ SYMBOLS
 (byte) main::s
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (void~) $0 ← call main 
   to:@1
 main: from
@@ -97,10 +97,10 @@ main::@12: from
   to:main::@3
 main::@return: from main::@3
   return 
-  to:@RETURN
-@1: from @BEGIN
-  to:@END
-@END: from @1
+  to:@return
+@1: from @begin
+  to:@end
+@end: from @1
 
 Removing empty block main::@7
 Removing empty block main::@3
@@ -112,9 +112,9 @@ Removing empty block main::@11
 Removing empty block main::@12
 Removing empty block @1
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (void~) $0 ← call main 
-  to:@END
+  to:@end
 main: from
   (byte) main::i ← (byte) 100
   (byte) main::s ← (byte) 0
@@ -136,18 +136,18 @@ main::@5: from main::@2
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
+@2: from @begin
+  to:@end
+main: from @begin
   (byte) main::i ← (byte) 100
   (byte) main::s ← (byte) 0
   to:main::@1
@@ -168,19 +168,19 @@ main::@5: from main::@2
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 Completing Phi functions...
 Completing Phi functions...
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
+@2: from @begin
+  to:@end
+main: from @begin
   (byte) main::i#0 ← (byte) 100
   (byte) main::s#0 ← (byte) 0
   to:main::@1
@@ -209,16 +209,16 @@ main::@5: from main::@2
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
+@2: from @begin
+  to:@end
+main: from @begin
   (byte) main::i#0 ← (byte) 100
   (byte) main::s#0 ← (byte) 0
   to:main::@1
@@ -247,16 +247,16 @@ main::@5: from main::@2
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 Culled Empty Block (label) @2
 Succesful SSA optimization Pass2CullEmptyBlocks
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   (byte) main::i#0 ← (byte) 100
   (byte) main::s#0 ← (byte) 0
   to:main::@1
@@ -285,17 +285,17 @@ main::@5: from main::@2
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Constant (byte) main::i#0 (byte) 100
 Constant (byte) main::s#0 (byte) 0
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   to:main::@1
 main::@1: from main main::@4 main::@5
   (byte) main::s#6 ← phi( main/(byte) 0 main::@4/(byte) main::s#1 main::@5/(byte) main::s#2 )
@@ -322,17 +322,17 @@ main::@5: from main::@2
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Alias (byte) main::i#1 = (byte) main::i#3 (byte) main::i#4 (byte) main::i#5 
 Alias (byte) main::s#3 = (byte) main::s#5 (byte) main::s#6 (byte) main::s#4 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   to:main::@1
 main::@1: from main main::@4 main::@5
   (byte) main::s#3 ← phi( main/(byte) 0 main::@4/(byte) main::s#1 main::@5/(byte) main::s#2 )
@@ -353,17 +353,17 @@ main::@5: from main::@2
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Simple Condition (boolean~) main::$0 if((byte) main::i#1>(byte) 0) goto main::@2
 Simple Condition (boolean~) main::$1 if((byte) main::i#1>(byte) 50) goto main::@4
 Succesful SSA optimization Pass2ConditionalJumpSimplification
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   to:main::@1
 main::@1: from main main::@4 main::@5
   (byte) main::s#3 ← phi( main/(byte) 0 main::@4/(byte) main::s#1 main::@5/(byte) main::s#2 )
@@ -382,17 +382,17 @@ main::@5: from main::@2
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
-Block Sequence Planned @BEGIN @END main main::@1 main::@return main::@2 main::@5 main::@4 
-Block Sequence Planned @BEGIN @END main main::@1 main::@return main::@2 main::@5 main::@4 
+Block Sequence Planned @begin @end main main::@1 main::@return main::@2 main::@5 main::@4 
+Block Sequence Planned @begin @end main main::@1 main::@return main::@2 main::@5 main::@4 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@4 main::@5
   (byte) main::s#3 ← phi( main/(byte) 0 main::@4/(byte~) main::s#7 main::@5/(byte~) main::s#8 )
@@ -402,7 +402,7 @@ main::@1: from main main::@4 main::@5
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
+  to:@return
 main::@2: from main::@1
   if((byte) main::i#1>(byte) 50) goto main::@4
   to:main::@5
@@ -422,11 +422,11 @@ Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@4 main::@5
   [1] (byte) main::s#3 ← phi( main/(byte) 0 main::@4/(byte~) main::s#7 main::@5/(byte~) main::s#8 ) [ main::i#2 main::s#3 ]
@@ -436,7 +436,7 @@ main::@1: from main main::@4 main::@5
   to:main::@return
 main::@return: from main::@1
   [4] return  [ ]
-  to:@RETURN
+  to:@return
 main::@2: from main::@1
   [5] if((byte) main::i#1>(byte) 50) goto main::@4 [ main::i#1 main::s#3 ]
   to:main::@5
@@ -457,17 +457,17 @@ Coalesced [8] main::s#8 ← main::s#2
 Coalesced (already) [10] main::i#6 ← main::i#1
 Coalesced [11] main::s#7 ← main::s#1
 Coalesced down to 2 phi equivalence classes
-Block Sequence Planned @BEGIN @END main main::@1 main::@return main::@2 main::@5 main::@4 
+Block Sequence Planned @begin @end main main::@1 main::@return main::@2 main::@5 main::@4 
 Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@4 main::@5
   [1] (byte) main::s#3 ← phi( main/(byte) 0 main::@4/(byte) main::s#1 main::@5/(byte) main::s#2 ) [ main::i#2 main::s#3 ]
@@ -477,7 +477,7 @@ main::@1: from main main::@4 main::@5
   to:main::@return
 main::@return: from main::@1
   [4] return  [ ]
-  to:@RETURN
+  to:@return
 main::@2: from main::@1
   [5] if((byte) main::i#1>(byte) 50) goto main::@4 [ main::i#1 main::s#3 ]
   to:main::@5
@@ -492,14 +492,14 @@ CALL GRAPH
 Calls in [] to 0:main 
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@END dominated by  @BEGIN @END 
-main dominated by  @BEGIN main 
-main::@1 dominated by  @BEGIN main::@1 main 
-main::@return dominated by  @BEGIN main::@return main::@1 main 
-main::@2 dominated by  @BEGIN main::@2 main::@1 main 
-main::@5 dominated by  @BEGIN main::@2 main::@1 main::@5 main 
-main::@4 dominated by  @BEGIN main::@2 main::@1 main::@4 main 
+@begin dominated by  @begin 
+@end dominated by  @end @begin 
+main dominated by  @begin main 
+main::@1 dominated by  @begin main::@1 main 
+main::@return dominated by  main::@return @begin main::@1 main 
+main::@2 dominated by  @begin main::@2 main::@1 main 
+main::@5 dominated by  @begin main::@2 main::@1 main::@5 main 
+main::@4 dominated by  @begin main::@2 main::@1 main::@4 main 
 
 Found back edge: Loop head: main::@1 tails: main::@5 blocks: null
 Found back edge: Loop head: main::@1 tails: main::@4 blocks: null
@@ -535,63 +535,64 @@ Complete equivalence classes
 Allocated zp byte:2 to zp byte:2 [ main::i#2 main::i#1 ]
 Allocated zp byte:3 to zp byte:3 [ main::s#3 main::s#1 main::s#2 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-  jmp BEND
-//SEG2 @END
-BEND:
+  jmp bend
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] phi from main to main::@1
-main__B1_from_main:
-//SEG5 [1] phi (byte) main::s#3 = (byte) 0 -- zpby1=coby1 
-  lda #$0
-  sta $3
-//SEG6 [1] phi (byte) main::i#2 = (byte) 100 -- zpby1=coby1 
-  lda #$64
-  sta $2
-  jmp main__B1
-//SEG7 main::@1
-main__B1:
-//SEG8 [2] (byte) main::i#1 ← -- (byte) main::i#2 [ main::i#1 main::s#3 ] -- zpby1=_dec_zpby1 
-  dec $2
-//SEG9 [3] if((byte) main::i#1>(byte) 0) goto main::@2 [ main::i#1 main::s#3 ] -- zpby1_gt_0_then_la1 
-  lda $2
-  bne main__B2
-  jmp main__Breturn
-//SEG10 main::@return
-main__Breturn:
-//SEG11 [4] return  [ ]
-  rts
+main: {
+  //SEG4 [1] phi from main to main::@1
+  b1_from_main:
+  //SEG5 [1] phi (byte) main::s#3 = (byte) 0 -- zpby1=coby1 
+    lda #$0
+    sta $3
+  //SEG6 [1] phi (byte) main::i#2 = (byte) 100 -- zpby1=coby1 
+    lda #$64
+    sta $2
+    jmp b1
+  //SEG7 main::@1
+  b1:
+  //SEG8 [2] (byte) main::i#1 ← -- (byte) main::i#2 [ main::i#1 main::s#3 ] -- zpby1=_dec_zpby1 
+    dec $2
+  //SEG9 [3] if((byte) main::i#1>(byte) 0) goto main::@2 [ main::i#1 main::s#3 ] -- zpby1_gt_0_then_la1 
+    lda $2
+    bne b2
+    jmp breturn
+  //SEG10 main::@return
+  breturn:
+  //SEG11 [4] return  [ ]
+    rts
+}
 //SEG12 main::@2
-main__B2:
+b2:
 //SEG13 [5] if((byte) main::i#1>(byte) 50) goto main::@4 [ main::i#1 main::s#3 ] -- zpby1_gt_coby1_then_la1 
   lda $2
   cmp #$32
   beq !+
-  bcs main__B4
+  bcs b4
 !:
-  jmp main__B5
+  jmp b5
 //SEG14 main::@5
-main__B5:
+b5:
 //SEG15 [6] (byte) main::s#2 ← -- (byte) main::s#3 [ main::i#1 main::s#2 ] -- zpby1=_dec_zpby1 
   dec $3
 //SEG16 [1] phi from main::@5 to main::@1
-main__B1_from_B5:
+b1_from_b5:
 //SEG17 [1] phi (byte) main::s#3 = (byte) main::s#2 -- register_copy 
 //SEG18 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 //SEG19 main::@4
-main__B4:
+b4:
 //SEG20 [7] (byte) main::s#1 ← ++ (byte) main::s#3 [ main::i#1 main::s#1 ] -- zpby1=_inc_zpby1 
   inc $3
 //SEG21 [1] phi from main::@4 to main::@1
-main__B1_from_B4:
+b1_from_b4:
 //SEG22 [1] phi (byte) main::s#3 = (byte) main::s#1 -- register_copy 
 //SEG23 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Potential registers zp byte:2 [ main::i#2 main::i#1 ] : zp byte:2 , reg byte a , reg byte x , reg byte y , 
@@ -603,66 +604,67 @@ Uplift Scope []
 
 Uplifting [main] best 380 combination reg byte y [ main::s#3 main::s#1 main::s#2 ] reg byte x [ main::i#2 main::i#1 ] 
 Uplifting [] best 380 combination 
-Removing instruction jmp BEND
-Removing instruction jmp main__B1
-Removing instruction jmp main__Breturn
-Removing instruction jmp main__B5
+Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b5
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] phi from main to main::@1
-main__B1_from_main:
-//SEG5 [1] phi (byte) main::s#3 = (byte) 0 -- yby=coby1 
-  ldy #$0
-//SEG6 [1] phi (byte) main::i#2 = (byte) 100 -- xby=coby1 
-  ldx #$64
-//SEG7 main::@1
-main__B1:
-//SEG8 [2] (byte) main::i#1 ← -- (byte) main::i#2 [ main::i#1 main::s#3 ] -- xby=_dec_xby 
-  dex
-//SEG9 [3] if((byte) main::i#1>(byte) 0) goto main::@2 [ main::i#1 main::s#3 ] -- xby_gt_0_then_la1 
-  cpx #$0
-  bne main__B2
-//SEG10 main::@return
-main__Breturn:
-//SEG11 [4] return  [ ]
-  rts
+main: {
+  //SEG4 [1] phi from main to main::@1
+  b1_from_main:
+  //SEG5 [1] phi (byte) main::s#3 = (byte) 0 -- yby=coby1 
+    ldy #$0
+  //SEG6 [1] phi (byte) main::i#2 = (byte) 100 -- xby=coby1 
+    ldx #$64
+  //SEG7 main::@1
+  b1:
+  //SEG8 [2] (byte) main::i#1 ← -- (byte) main::i#2 [ main::i#1 main::s#3 ] -- xby=_dec_xby 
+    dex
+  //SEG9 [3] if((byte) main::i#1>(byte) 0) goto main::@2 [ main::i#1 main::s#3 ] -- xby_gt_0_then_la1 
+    cpx #$0
+    bne b2
+  //SEG10 main::@return
+  breturn:
+  //SEG11 [4] return  [ ]
+    rts
+}
 //SEG12 main::@2
-main__B2:
+b2:
 //SEG13 [5] if((byte) main::i#1>(byte) 50) goto main::@4 [ main::i#1 main::s#3 ] -- xby_gt_coby1_then_la1 
   cpx #$32
   beq !+
-  bcs main__B4
+  bcs b4
 !:
 //SEG14 main::@5
-main__B5:
+b5:
 //SEG15 [6] (byte) main::s#2 ← -- (byte) main::s#3 [ main::i#1 main::s#2 ] -- yby=_dec_yby 
   dey
 //SEG16 [1] phi from main::@5 to main::@1
-main__B1_from_B5:
+b1_from_b5:
 //SEG17 [1] phi (byte) main::s#3 = (byte) main::s#2 -- register_copy 
 //SEG18 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 //SEG19 main::@4
-main__B4:
+b4:
 //SEG20 [7] (byte) main::s#1 ← ++ (byte) main::s#3 [ main::i#1 main::s#1 ] -- yby=_inc_yby 
   iny
 //SEG21 [1] phi from main::@4 to main::@1
-main__B1_from_B4:
+b1_from_b4:
 //SEG22 [1] phi (byte) main::s#3 = (byte) main::s#1 -- register_copy 
 //SEG23 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 
 FINAL SYMBOL TABLE
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (void()) main()
 (label) main::@1
 (label) main::@2
@@ -681,54 +683,55 @@ reg byte x [ main::i#2 main::i#1 ]
 reg byte y [ main::s#3 main::s#1 main::s#2 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] phi from main to main::@1
-main__B1_from_main:
-//SEG5 [1] phi (byte) main::s#3 = (byte) 0 -- yby=coby1 
-  ldy #$0
-//SEG6 [1] phi (byte) main::i#2 = (byte) 100 -- xby=coby1 
-  ldx #$64
-//SEG7 main::@1
-main__B1:
-//SEG8 [2] (byte) main::i#1 ← -- (byte) main::i#2 [ main::i#1 main::s#3 ] -- xby=_dec_xby 
-  dex
-//SEG9 [3] if((byte) main::i#1>(byte) 0) goto main::@2 [ main::i#1 main::s#3 ] -- xby_gt_0_then_la1 
-  cpx #$0
-  bne main__B2
-//SEG10 main::@return
-main__Breturn:
-//SEG11 [4] return  [ ]
-  rts
+main: {
+  //SEG4 [1] phi from main to main::@1
+  b1_from_main:
+  //SEG5 [1] phi (byte) main::s#3 = (byte) 0 -- yby=coby1 
+    ldy #$0
+  //SEG6 [1] phi (byte) main::i#2 = (byte) 100 -- xby=coby1 
+    ldx #$64
+  //SEG7 main::@1
+  b1:
+  //SEG8 [2] (byte) main::i#1 ← -- (byte) main::i#2 [ main::i#1 main::s#3 ] -- xby=_dec_xby 
+    dex
+  //SEG9 [3] if((byte) main::i#1>(byte) 0) goto main::@2 [ main::i#1 main::s#3 ] -- xby_gt_0_then_la1 
+    cpx #$0
+    bne b2
+  //SEG10 main::@return
+  breturn:
+  //SEG11 [4] return  [ ]
+    rts
+}
 //SEG12 main::@2
-main__B2:
+b2:
 //SEG13 [5] if((byte) main::i#1>(byte) 50) goto main::@4 [ main::i#1 main::s#3 ] -- xby_gt_coby1_then_la1 
   cpx #$32
   beq !+
-  bcs main__B4
+  bcs b4
 !:
 //SEG14 main::@5
-main__B5:
+b5:
 //SEG15 [6] (byte) main::s#2 ← -- (byte) main::s#3 [ main::i#1 main::s#2 ] -- yby=_dec_yby 
   dey
 //SEG16 [1] phi from main::@5 to main::@1
-main__B1_from_B5:
+b1_from_b5:
 //SEG17 [1] phi (byte) main::s#3 = (byte) main::s#2 -- register_copy 
 //SEG18 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 //SEG19 main::@4
-main__B4:
+b4:
 //SEG20 [7] (byte) main::s#1 ← ++ (byte) main::s#3 [ main::i#1 main::s#1 ] -- yby=_inc_yby 
   iny
 //SEG21 [1] phi from main::@4 to main::@1
-main__B1_from_B4:
+b1_from_b4:
 //SEG22 [1] phi (byte) main::s#3 = (byte) main::s#1 -- register_copy 
 //SEG23 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 

src/main/java/dk/camelot64/kickc/test/ref/loopsplit.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (void()) main()
 (label) main::@1
 (label) main::@2

src/main/java/dk/camelot64/kickc/test/ref/minus.asm

@@ -1,13 +1,13 @@
-BBEGIN:
-B1_from_BBEGIN:
+bbegin:
+b1_from_bbegin:
   ldx #$5
-B1_from_B1:
-B1:
+b1_from_b1:
+b1:
   txa
   clc
   adc #$4
   sta $1100,x
   inx
   cpx #$a
-  bcc B1_from_B1
-BEND:
+  bcc b1_from_b1
+bend:

src/main/java/dk/camelot64/kickc/test/ref/minus.cfg

@@ -1,10 +1,10 @@
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @1 @BEGIN
-  [0] (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) 5 ) [ i#2 ]
+@1: from @1 @begin
+  [0] (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) 5 ) [ i#2 ]
   [1] (byte~) $1 ← (byte) i#2 + (byte) 4 [ i#2 $1 ]
   [2] *((word) 4352 + (byte) i#2) ← (byte~) $1 [ i#2 ]
   [3] (byte) i#1 ← (byte) i#2 + (byte) 1 [ i#1 ]
   [4] if((byte) i#1<(byte) 10) goto @1 [ i#1 ]
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1

src/main/java/dk/camelot64/kickc/test/ref/minus.log

@@ -27,11 +27,11 @@ SYMBOLS
 (byte[16]) p
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte[16]) p ← (word) 4352
   (byte) i ← (byte) 5
   to:@1
-@1: from @1 @BEGIN
+@1: from @1 @begin
   (byte~) $0 ← (byte) 2 + (byte) i
   (byte~) $1 ← (byte~) $0 + (byte) 2
   *((byte[16]) p + (byte) i) ← (byte~) $1
@@ -41,16 +41,16 @@ INITIAL CONTROL FLOW GRAPH
   if((boolean~) $3) goto @1
   to:@2
 @2: from @1
-  to:@END
-@END: from @2
+  to:@end
+@end: from @2
 
 Removing empty block @2
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte[16]) p ← (word) 4352
   (byte) i ← (byte) 5
   to:@1
-@1: from @1 @BEGIN
+@1: from @1 @begin
   (byte~) $0 ← (byte) 2 + (byte) i
   (byte~) $1 ← (byte~) $0 + (byte) 2
   *((byte[16]) p + (byte) i) ← (byte~) $1
@@ -58,17 +58,17 @@ CONTROL FLOW GRAPH
   (byte) i ← (byte~) $2
   (boolean~) $3 ← (byte) i < (byte) 10
   if((boolean~) $3) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   (byte[16]) p ← (word) 4352
   (byte) i ← (byte) 5
   to:@1
-@1: from @1 @BEGIN
+@1: from @1 @begin
   (byte~) $0 ← (byte) 2 + (byte) i
   (byte~) $1 ← (byte~) $0 + (byte) 2
   *((byte[16]) p + (byte) i) ← (byte~) $1
@@ -76,18 +76,18 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
   (byte) i ← (byte~) $2
   (boolean~) $3 ← (byte) i < (byte) 10
   if((boolean~) $3) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   (byte[16]) p#0 ← (word) 4352
   (byte) i#0 ← (byte) 5
   to:@1
-@1: from @1 @BEGIN
-  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @BEGIN/(byte[16]) p#0 )
-  (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) i#0 )
+@1: from @1 @begin
+  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @begin/(byte[16]) p#0 )
+  (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) i#0 )
   (byte~) $0 ← (byte) 2 + (byte) i#2
   (byte~) $1 ← (byte~) $0 + (byte) 2
   *((byte[16]) p#1 + (byte) i#2) ← (byte~) $1
@@ -95,17 +95,17 @@ CONTROL FLOW GRAPH SSA
   (byte) i#1 ← (byte~) $2
   (boolean~) $3 ← (byte) i#1 < (byte) 10
   if((boolean~) $3) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   (byte[16]) p#0 ← (word) 4352
   (byte) i#0 ← (byte) 5
   to:@1
-@1: from @1 @BEGIN
-  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @BEGIN/(byte[16]) p#0 )
-  (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) i#0 )
+@1: from @1 @begin
+  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @begin/(byte[16]) p#0 )
+  (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) i#0 )
   (byte~) $0 ← (byte) 2 + (byte) i#2
   (byte~) $1 ← (byte~) $0 + (byte) 2
   *((byte[16]) p#1 + (byte) i#2) ← (byte~) $1
@@ -113,18 +113,18 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
   (byte) i#1 ← (byte~) $2
   (boolean~) $3 ← (byte) i#1 < (byte) 10
   if((boolean~) $3) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 Constant (byte[16]) p#0 (word) 4352
 Constant (byte) i#0 (byte) 5
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @1 @BEGIN
-  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @BEGIN/(word) 4352 )
-  (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) 5 )
+@1: from @1 @begin
+  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @begin/(word) 4352 )
+  (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) 5 )
   (byte~) $0 ← (byte) 2 + (byte) i#2
   (byte~) $1 ← (byte~) $0 + (byte) 2
   *((byte[16]) p#1 + (byte) i#2) ← (byte~) $1
@@ -132,19 +132,19 @@ CONTROL FLOW GRAPH
   (byte) i#1 ← (byte~) $2
   (boolean~) $3 ← (byte) i#1 < (byte) 10
   if((boolean~) $3) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 Multiple usages for variable. Not optimizing sub-constant (byte) i#2
 Consolidated constant in assignment $1
 Multiple usages for variable. Not optimizing sub-constant (byte) i#2
 Succesful SSA optimization Pass2ConstantAdditionElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @1 @BEGIN
-  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @BEGIN/(word) 4352 )
-  (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) 5 )
+@1: from @1 @begin
+  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @begin/(word) 4352 )
+  (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) 5 )
   (byte~) $0 ← (byte) i#2
   (byte~) $1 ← (byte~) $0 + (byte) 4
   *((byte[16]) p#1 + (byte) i#2) ← (byte~) $1
@@ -152,70 +152,70 @@ CONTROL FLOW GRAPH
   (byte) i#1 ← (byte~) $2
   (boolean~) $3 ← (byte) i#1 < (byte) 10
   if((boolean~) $3) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 Alias (byte) i#2 = (byte~) $0 
 Alias (byte) i#1 = (byte~) $2 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @1 @BEGIN
-  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @BEGIN/(word) 4352 )
-  (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) 5 )
+@1: from @1 @begin
+  (byte[16]) p#1 ← phi( @1/(byte[16]) p#1 @begin/(word) 4352 )
+  (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) 5 )
   (byte~) $1 ← (byte) i#2 + (byte) 4
   *((byte[16]) p#1 + (byte) i#2) ← (byte~) $1
   (byte) i#1 ← (byte) i#2 + (byte) 1
   (boolean~) $3 ← (byte) i#1 < (byte) 10
   if((boolean~) $3) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 Self Phi Eliminated (byte[16]) p#1
 Succesful SSA optimization Pass2SelfPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @1 @BEGIN
-  (byte[16]) p#1 ← phi( @BEGIN/(word) 4352 )
-  (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) 5 )
+@1: from @1 @begin
+  (byte[16]) p#1 ← phi( @begin/(word) 4352 )
+  (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) 5 )
   (byte~) $1 ← (byte) i#2 + (byte) 4
   *((byte[16]) p#1 + (byte) i#2) ← (byte~) $1
   (byte) i#1 ← (byte) i#2 + (byte) 1
   (boolean~) $3 ← (byte) i#1 < (byte) 10
   if((boolean~) $3) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 Simple Condition (boolean~) $3 if((byte) i#1<(byte) 10) goto @1
 Succesful SSA optimization Pass2ConditionalJumpSimplification
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @1 @BEGIN
-  (byte[16]) p#1 ← phi( @BEGIN/(word) 4352 )
-  (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) 5 )
+@1: from @1 @begin
+  (byte[16]) p#1 ← phi( @begin/(word) 4352 )
+  (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) 5 )
   (byte~) $1 ← (byte) i#2 + (byte) 4
   *((byte[16]) p#1 + (byte) i#2) ← (byte~) $1
   (byte) i#1 ← (byte) i#2 + (byte) 1
   if((byte) i#1<(byte) 10) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 Constant (byte[16]) p#1 (word) 4352
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @1 @BEGIN
-  (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) 5 )
+@1: from @1 @begin
+  (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) 5 )
   (byte~) $1 ← (byte) i#2 + (byte) 4
   *((word) 4352 + (byte) i#2) ← (byte~) $1
   (byte) i#1 ← (byte) i#2 + (byte) 1
   if((byte) i#1<(byte) 10) goto @1
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 Multiple usages for variable. Not optimizing sub-constant (byte) i#2
 Multiple usages for variable. Not optimizing sub-constant (byte) i#2
@@ -223,36 +223,36 @@ Multiple usages for variable. Not optimizing sub-constant (byte) i#2
 Multiple usages for variable. Not optimizing sub-constant (byte) i#2
 Multiple usages for variable. Not optimizing sub-constant (byte) i#2
 Multiple usages for variable. Not optimizing sub-constant (byte) i#2
-Block Sequence Planned @BEGIN @1 @END 
+Block Sequence Planned @begin @1 @end 
 Added new block during phi lifting @3(between @1 and @1)
-Block Sequence Planned @BEGIN @1 @END @3 
+Block Sequence Planned @begin @1 @end @3 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  (byte) i#2 ← phi( @3/(byte~) i#3 @BEGIN/(byte) 5 )
+@1: from @3 @begin
+  (byte) i#2 ← phi( @3/(byte~) i#3 @begin/(byte) 5 )
   (byte~) $1 ← (byte) i#2 + (byte) 4
   *((word) 4352 + (byte) i#2) ← (byte~) $1
   (byte) i#1 ← (byte) i#2 + (byte) 1
   if((byte) i#1<(byte) 10) goto @3
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 @3: from @1
   (byte~) i#3 ← (byte) i#1
   to:@1
 
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @3 @BEGIN
-  [0] (byte) i#2 ← phi( @3/(byte~) i#3 @BEGIN/(byte) 5 ) [ i#2 ]
+@1: from @3 @begin
+  [0] (byte) i#2 ← phi( @3/(byte~) i#3 @begin/(byte) 5 ) [ i#2 ]
   [1] (byte~) $1 ← (byte) i#2 + (byte) 4 [ i#2 $1 ]
   [2] *((word) 4352 + (byte) i#2) ← (byte~) $1 [ i#2 ]
   [3] (byte) i#1 ← (byte) i#2 + (byte) 1 [ i#1 ]
   [4] if((byte) i#1<(byte) 10) goto @3 [ i#1 ]
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 @3: from @1
   [5] (byte~) i#3 ← (byte) i#1 [ i#3 ]
   to:@1
@@ -261,26 +261,26 @@ Created 1 initial phi equivalence classes
 Coalesced [5] i#3 ← i#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) @3
-Block Sequence Planned @BEGIN @1 @END 
+Block Sequence Planned @begin @1 @end 
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   to:@1
-@1: from @1 @BEGIN
-  [0] (byte) i#2 ← phi( @1/(byte) i#1 @BEGIN/(byte) 5 ) [ i#2 ]
+@1: from @1 @begin
+  [0] (byte) i#2 ← phi( @1/(byte) i#1 @begin/(byte) 5 ) [ i#2 ]
   [1] (byte~) $1 ← (byte) i#2 + (byte) 4 [ i#2 $1 ]
   [2] *((word) 4352 + (byte) i#2) ← (byte~) $1 [ i#2 ]
   [3] (byte) i#1 ← (byte) i#2 + (byte) 1 [ i#1 ]
   [4] if((byte) i#1<(byte) 10) goto @1 [ i#1 ]
-  to:@END
-@END: from @1
+  to:@end
+@end: from @1
 
 CALL GRAPH
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@1 dominated by  @1 @BEGIN 
-@END dominated by  @1 @BEGIN @END 
+@begin dominated by  @begin 
+@1 dominated by  @1 @begin 
+@end dominated by  @1 @end @begin 
 
 Found back edge: Loop head: @1 tails: @1 blocks: null
 Populated: Loop head: @1 tails: @1 blocks: @1 
@@ -309,20 +309,20 @@ Complete equivalence classes
 Allocated zp byte:2 to zp byte:2 [ i#2 i#1 ]
 Allocated zp byte:3 to zp byte:3 [ $1 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) i#2 = (byte) 5 -- zpby1=coby1 
   lda #$5
   sta $2
-  jmp B1
+  jmp b1
 //SEG3 [0] phi from @1 to @1
-B1_from_B1:
+b1_from_b1:
 //SEG4 [0] phi (byte) i#2 = (byte) i#1 -- register_copy 
-  jmp B1
+  jmp b1
 //SEG5 @1
-B1:
+b1:
 //SEG6 [1] (byte~) $1 ← (byte) i#2 + (byte) 4 [ i#2 $1 ] -- zpby1=zpby2_plus_coby1 
   lda $2
   clc
@@ -337,10 +337,10 @@ B1:
 //SEG9 [4] if((byte) i#1<(byte) 10) goto @1 [ i#1 ] -- zpby1_lt_coby1_then_la1 
   lda $2
   cmp #$a
-  bcc B1_from_B1
-  jmp BEND
-//SEG10 @END
-BEND:
+  bcc b1_from_b1
+  jmp bend
+//SEG10 @end
+bend:
 
 Statement [1] (byte~) $1 ← (byte) i#2 + (byte) 4 [ i#2 $1 ] always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp byte:2 [ i#2 i#1 ]
@@ -353,22 +353,22 @@ REGISTER UPLIFT SCOPES
 Uplift Scope [] 31.17: zp byte:2 [ i#2 i#1 ] 22: zp byte:3 [ $1 ] 
 
 Uplifting [] best 285 combination reg byte x [ i#2 i#1 ] reg byte a [ $1 ] 
-Removing instruction jmp B1
-Removing instruction jmp BEND
+Removing instruction jmp b1
+Removing instruction jmp bend
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) i#2 = (byte) 5 -- xby=coby1 
   ldx #$5
-  jmp B1
+  jmp b1
 //SEG3 [0] phi from @1 to @1
-B1_from_B1:
+b1_from_b1:
 //SEG4 [0] phi (byte) i#2 = (byte) i#1 -- register_copy 
 //SEG5 @1
-B1:
+b1:
 //SEG6 [1] (byte~) $1 ← (byte) i#2 + (byte) 4 [ i#2 $1 ] -- aby=xby_plus_coby1 
   txa
   clc
@@ -379,24 +379,24 @@ B1:
   inx
 //SEG9 [4] if((byte) i#1<(byte) 10) goto @1 [ i#1 ] -- xby_lt_coby1_then_la1 
   cpx #$a
-  bcc B1_from_B1
-//SEG10 @END
-BEND:
+  bcc b1_from_b1
+//SEG10 @end
+bend:
 
-Removing instruction jmp B1
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) i#2 = (byte) 5 -- xby=coby1 
   ldx #$5
 //SEG3 [0] phi from @1 to @1
-B1_from_B1:
+b1_from_b1:
 //SEG4 [0] phi (byte) i#2 = (byte) i#1 -- register_copy 
 //SEG5 @1
-B1:
+b1:
 //SEG6 [1] (byte~) $1 ← (byte) i#2 + (byte) 4 [ i#2 $1 ] -- aby=xby_plus_coby1 
   txa
   clc
@@ -407,15 +407,15 @@ B1:
   inx
 //SEG9 [4] if((byte) i#1<(byte) 10) goto @1 [ i#1 ] -- xby_lt_coby1_then_la1 
   cpx #$a
-  bcc B1_from_B1
-//SEG10 @END
-BEND:
+  bcc b1_from_b1
+//SEG10 @end
+bend:
 
 FINAL SYMBOL TABLE
 (byte~) $1 reg byte a 22.0
 (label) @1
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte) i
 (byte) i#1 reg byte x 16.5
 (byte) i#2 reg byte x 14.666666666666666
@@ -425,17 +425,17 @@ reg byte x [ i#2 i#1 ]
 reg byte a [ $1 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
-//SEG1 [0] phi from @BEGIN to @1
-B1_from_BBEGIN:
+//SEG0 @begin
+bbegin:
+//SEG1 [0] phi from @begin to @1
+b1_from_bbegin:
 //SEG2 [0] phi (byte) i#2 = (byte) 5 -- xby=coby1 
   ldx #$5
 //SEG3 [0] phi from @1 to @1
-B1_from_B1:
+b1_from_b1:
 //SEG4 [0] phi (byte) i#2 = (byte) i#1 -- register_copy 
 //SEG5 @1
-B1:
+b1:
 //SEG6 [1] (byte~) $1 ← (byte) i#2 + (byte) 4 [ i#2 $1 ] -- aby=xby_plus_coby1 
   txa
   clc
@@ -446,7 +446,7 @@ B1:
   inx
 //SEG9 [4] if((byte) i#1<(byte) 10) goto @1 [ i#1 ] -- xby_lt_coby1_then_la1 
   cpx #$a
-  bcc B1_from_B1
-//SEG10 @END
-BEND:
+  bcc b1_from_b1
+//SEG10 @end
+bend:
 

src/main/java/dk/camelot64/kickc/test/ref/minus.sym

@@ -1,7 +1,7 @@
 (byte~) $1 reg byte a 22.0
 (label) @1
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte) i
 (byte) i#1 reg byte x 16.5
 (byte) i#2 reg byte x 14.666666666666666

src/main/java/dk/camelot64/kickc/test/ref/modglobal.asm

@@ -1,23 +1,25 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-inccnt_from_main:
-  ldy #$0
-  ldx #$0
-  jsr inccnt
-main__B1:
-  sta $400
-  inx
-inccnt_from_B1:
-  jsr inccnt
-main__B2:
-  sta $401
-main__Breturn:
-  rts
-inccnt:
-  inx
-  iny
-  txa
-inccnt__Breturn:
-  rts
+bend:
+main: {
+  inccnt_from_main:
+    ldy #$0
+    ldx #$0
+    jsr inccnt
+  b1:
+    sta $400
+    inx
+  inccnt_from_b1:
+    jsr inccnt
+  b2:
+    sta $401
+  breturn:
+    rts
+}
+inccnt: {
+    inx
+    iny
+    txa
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/modglobal.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
   to:main::@1
 main::@1: from main
@@ -17,7 +17,7 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   [8] return  [ ]
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   [9] (byte) cnt2#11 ← phi( main/(byte) 0 main::@1/(byte) cnt2#1 ) [ cnt#12 cnt2#11 ]
   [9] (byte) cnt#12 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 ) [ cnt#12 cnt2#11 ]
@@ -27,4 +27,4 @@ inccnt: from main main::@1
   to:inccnt::@return
 inccnt::@return: from inccnt
   [13] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/modglobal.log

@@ -60,7 +60,7 @@ SYMBOLS
 (label) main::@return
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) cnt ← (byte) 0
   (byte) cnt2 ← (byte) 0
   (byte[256]) SCREEN ← (word) 1024
@@ -75,8 +75,8 @@ main: from
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@1: from @BEGIN
+  to:@return
+@1: from @begin
   to:@2
 inccnt: from
   (byte) cnt ← ++ (byte) cnt
@@ -86,23 +86,23 @@ inccnt: from
 inccnt::@return: from inccnt inccnt::@1
   (byte) inccnt::return ← (byte) inccnt::return
   return (byte) inccnt::return
-  to:@RETURN
+  to:@return
 inccnt::@1: from
   to:inccnt::@return
 @2: from @1
-  to:@END
-@END: from @2
+  to:@end
+@end: from @2
 
 Removing empty block @1
 Removing empty block inccnt::@1
 Removing empty block @2
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) cnt ← (byte) 0
   (byte) cnt2 ← (byte) 0
   (byte[256]) SCREEN ← (word) 1024
   (void~) $0 ← call main 
-  to:@END
+  to:@end
 main: from
   (byte~) main::$0 ← call inccnt 
   *((byte[256]) SCREEN + (byte) 0) ← (byte~) main::$0
@@ -112,7 +112,7 @@ main: from
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
+  to:@return
 inccnt: from
   (byte) cnt ← ++ (byte) cnt
   (byte) cnt2 ← ++ (byte) cnt2
@@ -121,8 +121,8 @@ inccnt: from
 inccnt::@return: from inccnt
   (byte) inccnt::return ← (byte) inccnt::return
   return (byte) inccnt::return
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 main modifies cnt
@@ -131,17 +131,17 @@ inccnt modifies cnt
 inccnt modifies cnt2
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   (byte) cnt ← (byte) 0
   (byte) cnt2 ← (byte) 0
   (byte[256]) SCREEN ← (word) 1024
   call main param-assignment
   to:@3
-@3: from @BEGIN
+@3: from @begin
   (byte) cnt ← (byte) cnt
   (byte) cnt2 ← (byte) cnt2
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   (byte) inccnt::return ← call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -162,7 +162,7 @@ main::@return: from main::@2
   (byte) cnt ← (byte) cnt
   (byte) cnt2 ← (byte) cnt2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt ← ++ (byte) cnt
   (byte) cnt2 ← ++ (byte) cnt2
@@ -173,28 +173,28 @@ inccnt::@return: from inccnt
   (byte) cnt ← (byte) cnt
   (byte) cnt2 ← (byte) cnt2
   return (byte) inccnt::return
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Completing Phi functions...
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   (byte) cnt#0 ← (byte) 0
   (byte) cnt2#0 ← (byte) 0
   (byte[256]) SCREEN#0 ← (word) 1024
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  (byte) cnt2#7 ← phi( @BEGIN/(byte) cnt2#0 )
-  (byte) cnt#8 ← phi( @BEGIN/(byte) cnt#0 )
+@3: from @begin
+  (byte) cnt2#7 ← phi( @begin/(byte) cnt2#0 )
+  (byte) cnt#8 ← phi( @begin/(byte) cnt#0 )
   (byte) cnt#1 ← (byte) cnt#8
   (byte) cnt2#1 ← (byte) cnt2#7
-  to:@END
-main: from @BEGIN
-  (byte[256]) SCREEN#3 ← phi( @BEGIN/(byte[256]) SCREEN#0 )
-  (byte) cnt2#13 ← phi( @BEGIN/(byte) cnt2#0 )
-  (byte) cnt#14 ← phi( @BEGIN/(byte) cnt#0 )
+  to:@end
+main: from @begin
+  (byte[256]) SCREEN#3 ← phi( @begin/(byte[256]) SCREEN#0 )
+  (byte) cnt2#13 ← phi( @begin/(byte) cnt2#0 )
+  (byte) cnt#14 ← phi( @begin/(byte) cnt#0 )
   (byte) inccnt::return#0 ← call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -225,7 +225,7 @@ main::@return: from main::@2
   (byte) cnt#5 ← (byte) cnt#11
   (byte) cnt2#4 ← (byte) cnt2#10
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt2#11 ← phi( main/(byte) cnt2#13 main::@1/(byte) cnt2#2 )
   (byte) cnt#12 ← phi( main/(byte) cnt#14 main::@1/(byte) cnt#3 )
@@ -241,26 +241,26 @@ inccnt::@return: from inccnt
   (byte) cnt#7 ← (byte) cnt#13
   (byte) cnt2#6 ← (byte) cnt2#12
   return (byte) inccnt::return#3
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   (byte) cnt#0 ← (byte) 0
   (byte) cnt2#0 ← (byte) 0
   (byte[256]) SCREEN#0 ← (word) 1024
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  (byte) cnt2#7 ← phi( @BEGIN/(byte) cnt2#4 )
-  (byte) cnt#8 ← phi( @BEGIN/(byte) cnt#5 )
+@3: from @begin
+  (byte) cnt2#7 ← phi( @begin/(byte) cnt2#4 )
+  (byte) cnt#8 ← phi( @begin/(byte) cnt#5 )
   (byte) cnt#1 ← (byte) cnt#8
   (byte) cnt2#1 ← (byte) cnt2#7
-  to:@END
-main: from @BEGIN
-  (byte[256]) SCREEN#3 ← phi( @BEGIN/(byte[256]) SCREEN#0 )
-  (byte) cnt2#13 ← phi( @BEGIN/(byte) cnt2#0 )
-  (byte) cnt#14 ← phi( @BEGIN/(byte) cnt#0 )
+  to:@end
+main: from @begin
+  (byte[256]) SCREEN#3 ← phi( @begin/(byte[256]) SCREEN#0 )
+  (byte) cnt2#13 ← phi( @begin/(byte) cnt2#0 )
+  (byte) cnt#14 ← phi( @begin/(byte) cnt#0 )
   call inccnt param-assignment
   (byte) inccnt::return#0 ← (byte) inccnt::return#3
   to:main::@1
@@ -293,7 +293,7 @@ main::@return: from main::@2
   (byte) cnt#5 ← (byte) cnt#11
   (byte) cnt2#4 ← (byte) cnt2#10
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt2#11 ← phi( main/(byte) cnt2#13 main::@1/(byte) cnt2#2 )
   (byte) cnt#12 ← phi( main/(byte) cnt#14 main::@1/(byte) cnt#3 )
@@ -309,27 +309,27 @@ inccnt::@return: from inccnt
   (byte) cnt#7 ← (byte) cnt#13
   (byte) cnt2#6 ← (byte) cnt2#12
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Constant (byte) cnt#0 (byte) 0
 Constant (byte) cnt2#0 (byte) 0
 Constant (byte[256]) SCREEN#0 (word) 1024
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  (byte) cnt2#7 ← phi( @BEGIN/(byte) cnt2#4 )
-  (byte) cnt#8 ← phi( @BEGIN/(byte) cnt#5 )
+@3: from @begin
+  (byte) cnt2#7 ← phi( @begin/(byte) cnt2#4 )
+  (byte) cnt#8 ← phi( @begin/(byte) cnt#5 )
   (byte) cnt#1 ← (byte) cnt#8
   (byte) cnt2#1 ← (byte) cnt2#7
-  to:@END
-main: from @BEGIN
-  (byte[256]) SCREEN#3 ← phi( @BEGIN/(word) 1024 )
-  (byte) cnt2#13 ← phi( @BEGIN/(byte) 0 )
-  (byte) cnt#14 ← phi( @BEGIN/(byte) 0 )
+  to:@end
+main: from @begin
+  (byte[256]) SCREEN#3 ← phi( @begin/(word) 1024 )
+  (byte) cnt2#13 ← phi( @begin/(byte) 0 )
+  (byte) cnt#14 ← phi( @begin/(byte) 0 )
   call inccnt param-assignment
   (byte) inccnt::return#0 ← (byte) inccnt::return#3
   to:main::@1
@@ -362,7 +362,7 @@ main::@return: from main::@2
   (byte) cnt#5 ← (byte) cnt#11
   (byte) cnt2#4 ← (byte) cnt2#10
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt2#11 ← phi( main/(byte) cnt2#13 main::@1/(byte) cnt2#2 )
   (byte) cnt#12 ← phi( main/(byte) cnt#14 main::@1/(byte) cnt#3 )
@@ -378,8 +378,8 @@ inccnt::@return: from inccnt
   (byte) cnt#7 ← (byte) cnt#13
   (byte) cnt2#6 ← (byte) cnt2#12
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Not aliassing across scopes: main::$0 inccnt::return#4
 Not aliassing across scopes: main::$1 inccnt::return#5
@@ -390,15 +390,15 @@ Alias (byte) inccnt::return#0 = (byte) inccnt::return#3 (byte) inccnt::return#4
 Alias (byte[256]) SCREEN#1 = (byte[256]) SCREEN#3 (byte[256]) SCREEN#2 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  to:@END
-main: from @BEGIN
-  (byte[256]) SCREEN#1 ← phi( @BEGIN/(word) 1024 )
-  (byte) cnt2#13 ← phi( @BEGIN/(byte) 0 )
-  (byte) cnt#14 ← phi( @BEGIN/(byte) 0 )
+@3: from @begin
+  to:@end
+main: from @begin
+  (byte[256]) SCREEN#1 ← phi( @begin/(word) 1024 )
+  (byte) cnt2#13 ← phi( @begin/(byte) 0 )
+  (byte) cnt#14 ← phi( @begin/(byte) 0 )
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -413,7 +413,7 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt2#11 ← phi( main/(byte) cnt2#13 main::@1/(byte) cnt2#1 )
   (byte) cnt#12 ← phi( main/(byte) cnt#14 main::@1/(byte) cnt#3 )
@@ -423,20 +423,20 @@ inccnt: from main main::@1
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Redundant Phi (byte) cnt#14 (byte) 0
 Redundant Phi (byte) cnt2#13 (byte) 0
 Redundant Phi (byte[256]) SCREEN#1 (word) 1024
 Succesful SSA optimization Pass2RedundantPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  to:@END
-main: from @BEGIN
+@3: from @begin
+  to:@end
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -451,7 +451,7 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt2#11 ← phi( main/(byte) 0 main::@1/(byte) cnt2#1 )
   (byte) cnt#12 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 )
@@ -461,16 +461,16 @@ inccnt: from main main::@1
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Culled Empty Block (label) @3
 Succesful SSA optimization Pass2CullEmptyBlocks
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -485,7 +485,7 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt2#11 ← phi( main/(byte) 0 main::@1/(byte) cnt2#1 )
   (byte) cnt#12 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 )
@@ -495,17 +495,17 @@ inccnt: from main main::@1
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Consolidated assigned array index constant in assignment *(1024)
 Consolidated assigned array index constant in assignment *(1025)
 Succesful SSA optimization Pass2ConstantAdditionElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -520,7 +520,7 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt2#11 ← phi( main/(byte) 0 main::@1/(byte) cnt2#1 )
   (byte) cnt#12 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 )
@@ -530,8 +530,8 @@ inccnt: from main main::@1
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Not aliassing across scopes: main::$0 inccnt::return#0
 Not aliassing across scopes: main::$1 inccnt::return#0
@@ -539,14 +539,14 @@ Not aliassing across scopes: inccnt::return#0 cnt#1
 Not aliassing across scopes: main::$0 inccnt::return#0
 Not aliassing across scopes: main::$1 inccnt::return#0
 Not aliassing across scopes: inccnt::return#0 cnt#1
-Block Sequence Planned @BEGIN @END main main::@1 main::@2 main::@return inccnt inccnt::@return 
-Block Sequence Planned @BEGIN @END main main::@1 main::@2 main::@return inccnt inccnt::@return 
+Block Sequence Planned @begin @end main main::@1 main::@2 main::@return inccnt inccnt::@return 
+Block Sequence Planned @begin @end main main::@1 main::@2 main::@return inccnt inccnt::@return 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -563,7 +563,7 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt2#11 ← phi( main/(byte) 0 main::@1/(byte~) cnt2#14 )
   (byte) cnt#12 ← phi( main/(byte) 0 main::@1/(byte~) cnt#15 )
@@ -573,7 +573,7 @@ inccnt: from main main::@1
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
+  to:@return
 
 Propagating live ranges...
 Propagating live ranges...
@@ -583,11 +583,11 @@ Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
   to:main::@1
 main::@1: from main
@@ -604,7 +604,7 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   [10] return  [ ]
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   [11] (byte) cnt2#11 ← phi( main/(byte) 0 main::@1/(byte~) cnt2#14 ) [ cnt#12 cnt2#11 ]
   [11] (byte) cnt#12 ← phi( main/(byte) 0 main::@1/(byte~) cnt#15 ) [ cnt#12 cnt2#11 ]
@@ -614,13 +614,13 @@ inccnt: from main main::@1
   to:inccnt::@return
 inccnt::@return: from inccnt
   [15] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
-  to:@RETURN
+  to:@return
 
 Created 2 initial phi equivalence classes
 Coalesced [5] cnt#15 ← cnt#3
 Coalesced [6] cnt2#14 ← cnt2#1
 Coalesced down to 2 phi equivalence classes
-Block Sequence Planned @BEGIN @END main main::@1 main::@2 main::@return inccnt inccnt::@return 
+Block Sequence Planned @begin @end main main::@1 main::@2 main::@return inccnt inccnt::@return 
 Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
@@ -628,11 +628,11 @@ Propagating live ranges...
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
   to:main::@1
 main::@1: from main
@@ -647,7 +647,7 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   [8] return  [ ]
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   [9] (byte) cnt2#11 ← phi( main/(byte) 0 main::@1/(byte) cnt2#1 ) [ cnt#12 cnt2#11 ]
   [9] (byte) cnt#12 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 ) [ cnt#12 cnt2#11 ]
@@ -657,21 +657,21 @@ inccnt: from main main::@1
   to:inccnt::@return
 inccnt::@return: from inccnt
   [13] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
-  to:@RETURN
+  to:@return
 
 CALL GRAPH
 Calls in [] to 0:main 
 Calls in [main] to 1:inccnt 5:inccnt 
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@END dominated by  @BEGIN @END 
-main dominated by  @BEGIN main 
-main::@1 dominated by  @BEGIN main::@1 main 
-main::@2 dominated by  @BEGIN main::@2 main::@1 main 
-main::@return dominated by  @BEGIN main::@return main::@2 main::@1 main 
-inccnt dominated by  @BEGIN inccnt main 
-inccnt::@return dominated by  inccnt::@return @BEGIN inccnt main 
+@begin dominated by  @begin 
+@end dominated by  @end @begin 
+main dominated by  @begin main 
+main::@1 dominated by  @begin main::@1 main 
+main::@2 dominated by  @begin main::@2 main::@1 main 
+main::@return dominated by  main::@return @begin main::@2 main::@1 main 
+inccnt dominated by  inccnt @begin main 
+inccnt::@return dominated by  inccnt::@return inccnt @begin main 
 
 NATURAL LOOPS
 
@@ -718,74 +718,76 @@ Allocated zp byte:5 to zp byte:5 [ main::$1 ]
 Allocated zp byte:6 to zp byte:6 [ cnt#1 ]
 Allocated zp byte:7 to zp byte:7 [ inccnt::return#0 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-  jmp BEND
-//SEG2 @END
-BEND:
+  jmp bend
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
-//SEG5 [9] phi from main to inccnt
-inccnt_from_main:
-//SEG6 [9] phi (byte) cnt2#11 = (byte) 0 -- zpby1=coby1 
-  lda #$0
-  sta $3
-//SEG7 [9] phi (byte) cnt#12 = (byte) 0 -- zpby1=coby1 
-  lda #$0
-  sta $2
-  jsr inccnt
-  jmp main__B1
-//SEG8 main::@1
-main__B1:
-//SEG9 [2] (byte~) main::$0 ← (byte) inccnt::return#0 [ main::$0 cnt#1 cnt2#1 ] -- zpby1=zpby2 
-  lda $7
-  sta $4
-//SEG10 [3] *((word) 1024) ← (byte~) main::$0 [ cnt#1 cnt2#1 ] -- _star_cowo1=zpby1 
-  lda $4
-  sta $400
-//SEG11 [4] (byte) cnt#3 ← ++ (byte) cnt#1 [ cnt#3 cnt2#1 ] -- zpby1=_inc_zpby2 
-  lda $6
-  sta $2
-  inc $2
-//SEG12 [5] call inccnt param-assignment [ inccnt::return#0 ]
-//SEG13 [9] phi from main::@1 to inccnt
-inccnt_from_B1:
-//SEG14 [9] phi (byte) cnt2#11 = (byte) cnt2#1 -- register_copy 
-//SEG15 [9] phi (byte) cnt#12 = (byte) cnt#3 -- register_copy 
-  jsr inccnt
-  jmp main__B2
-//SEG16 main::@2
-main__B2:
-//SEG17 [6] (byte~) main::$1 ← (byte) inccnt::return#0 [ main::$1 ] -- zpby1=zpby2 
-  lda $7
-  sta $5
-//SEG18 [7] *((word) 1025) ← (byte~) main::$1 [ ] -- _star_cowo1=zpby1 
-  lda $5
-  sta $401
-  jmp main__Breturn
-//SEG19 main::@return
-main__Breturn:
-//SEG20 [8] return  [ ]
-  rts
+main: {
+  //SEG4 [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
+  //SEG5 [9] phi from main to inccnt
+  inccnt_from_main:
+  //SEG6 [9] phi (byte) cnt2#11 = (byte) 0 -- zpby1=coby1 
+    lda #$0
+    sta $3
+  //SEG7 [9] phi (byte) cnt#12 = (byte) 0 -- zpby1=coby1 
+    lda #$0
+    sta $2
+    jsr inccnt
+    jmp b1
+  //SEG8 main::@1
+  b1:
+  //SEG9 [2] (byte~) main::$0 ← (byte) inccnt::return#0 [ main::$0 cnt#1 cnt2#1 ] -- zpby1=zpby2 
+    lda $7
+    sta $4
+  //SEG10 [3] *((word) 1024) ← (byte~) main::$0 [ cnt#1 cnt2#1 ] -- _star_cowo1=zpby1 
+    lda $4
+    sta $400
+  //SEG11 [4] (byte) cnt#3 ← ++ (byte) cnt#1 [ cnt#3 cnt2#1 ] -- zpby1=_inc_zpby2 
+    lda $6
+    sta $2
+    inc $2
+  //SEG12 [5] call inccnt param-assignment [ inccnt::return#0 ]
+  //SEG13 [9] phi from main::@1 to inccnt
+  inccnt_from_b1:
+  //SEG14 [9] phi (byte) cnt2#11 = (byte) cnt2#1 -- register_copy 
+  //SEG15 [9] phi (byte) cnt#12 = (byte) cnt#3 -- register_copy 
+    jsr inccnt
+    jmp b2
+  //SEG16 main::@2
+  b2:
+  //SEG17 [6] (byte~) main::$1 ← (byte) inccnt::return#0 [ main::$1 ] -- zpby1=zpby2 
+    lda $7
+    sta $5
+  //SEG18 [7] *((word) 1025) ← (byte~) main::$1 [ ] -- _star_cowo1=zpby1 
+    lda $5
+    sta $401
+    jmp breturn
+  //SEG19 main::@return
+  breturn:
+  //SEG20 [8] return  [ ]
+    rts
+}
 //SEG21 inccnt
-inccnt:
-//SEG22 [10] (byte) cnt#1 ← ++ (byte) cnt#12 [ cnt#1 cnt2#11 ] -- zpby1=_inc_zpby2 
-  lda $2
-  sta $6
-  inc $6
-//SEG23 [11] (byte) cnt2#1 ← ++ (byte) cnt2#11 [ cnt#1 cnt2#1 ] -- zpby1=_inc_zpby1 
-  inc $3
-//SEG24 [12] (byte) inccnt::return#0 ← (byte) cnt#1 [ inccnt::return#0 cnt#1 cnt2#1 ] -- zpby1=zpby2 
-  lda $6
-  sta $7
-  jmp inccnt__Breturn
-//SEG25 inccnt::@return
-inccnt__Breturn:
-//SEG26 [13] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
-  rts
+inccnt: {
+  //SEG22 [10] (byte) cnt#1 ← ++ (byte) cnt#12 [ cnt#1 cnt2#11 ] -- zpby1=_inc_zpby2 
+    lda $2
+    sta $6
+    inc $6
+  //SEG23 [11] (byte) cnt2#1 ← ++ (byte) cnt2#11 [ cnt#1 cnt2#1 ] -- zpby1=_inc_zpby1 
+    inc $3
+  //SEG24 [12] (byte) inccnt::return#0 ← (byte) cnt#1 [ inccnt::return#0 cnt#1 cnt2#1 ] -- zpby1=zpby2 
+    lda $6
+    sta $7
+    jmp breturn
+  //SEG25 inccnt::@return
+  breturn:
+  //SEG26 [13] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
+    rts
+}
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Potential registers zp byte:2 [ cnt#12 cnt#3 ] : zp byte:2 , reg byte a , reg byte x , reg byte y , 
@@ -803,69 +805,71 @@ Uplift Scope [inccnt] 1.5: zp byte:7 [ inccnt::return#0 ]
 Uplifting [] best 84 combination reg byte x [ cnt#12 cnt#3 ] reg byte y [ cnt2#11 cnt2#1 ] reg byte x [ cnt#1 ] 
 Uplifting [main] best 72 combination reg byte a [ main::$0 ] reg byte a [ main::$1 ] 
 Uplifting [inccnt] best 65 combination reg byte a [ inccnt::return#0 ] 
-Removing instruction jmp BEND
-Removing instruction jmp main__B1
-Removing instruction jmp main__B2
-Removing instruction jmp main__Breturn
-Removing instruction jmp inccnt__Breturn
+Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
-//SEG5 [9] phi from main to inccnt
-inccnt_from_main:
-//SEG6 [9] phi (byte) cnt2#11 = (byte) 0 -- yby=coby1 
-  ldy #$0
-//SEG7 [9] phi (byte) cnt#12 = (byte) 0 -- xby=coby1 
-  ldx #$0
-  jsr inccnt
-//SEG8 main::@1
-main__B1:
-//SEG9 [2] (byte~) main::$0 ← (byte) inccnt::return#0 [ main::$0 cnt#1 cnt2#1 ]
-  // (byte~) main::$0 = (byte) inccnt::return#0  // register copy reg byte a
-//SEG10 [3] *((word) 1024) ← (byte~) main::$0 [ cnt#1 cnt2#1 ] -- _star_cowo1=aby 
-  sta $400
-//SEG11 [4] (byte) cnt#3 ← ++ (byte) cnt#1 [ cnt#3 cnt2#1 ] -- xby=_inc_xby 
-  inx
-//SEG12 [5] call inccnt param-assignment [ inccnt::return#0 ]
-//SEG13 [9] phi from main::@1 to inccnt
-inccnt_from_B1:
-//SEG14 [9] phi (byte) cnt2#11 = (byte) cnt2#1 -- register_copy 
-//SEG15 [9] phi (byte) cnt#12 = (byte) cnt#3 -- register_copy 
-  jsr inccnt
-//SEG16 main::@2
-main__B2:
-//SEG17 [6] (byte~) main::$1 ← (byte) inccnt::return#0 [ main::$1 ]
-  // (byte~) main::$1 = (byte) inccnt::return#0  // register copy reg byte a
-//SEG18 [7] *((word) 1025) ← (byte~) main::$1 [ ] -- _star_cowo1=aby 
-  sta $401
-//SEG19 main::@return
-main__Breturn:
-//SEG20 [8] return  [ ]
-  rts
+main: {
+  //SEG4 [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
+  //SEG5 [9] phi from main to inccnt
+  inccnt_from_main:
+  //SEG6 [9] phi (byte) cnt2#11 = (byte) 0 -- yby=coby1 
+    ldy #$0
+  //SEG7 [9] phi (byte) cnt#12 = (byte) 0 -- xby=coby1 
+    ldx #$0
+    jsr inccnt
+  //SEG8 main::@1
+  b1:
+  //SEG9 [2] (byte~) main::$0 ← (byte) inccnt::return#0 [ main::$0 cnt#1 cnt2#1 ]
+    // (byte~) main::$0 = (byte) inccnt::return#0  // register copy reg byte a
+  //SEG10 [3] *((word) 1024) ← (byte~) main::$0 [ cnt#1 cnt2#1 ] -- _star_cowo1=aby 
+    sta $400
+  //SEG11 [4] (byte) cnt#3 ← ++ (byte) cnt#1 [ cnt#3 cnt2#1 ] -- xby=_inc_xby 
+    inx
+  //SEG12 [5] call inccnt param-assignment [ inccnt::return#0 ]
+  //SEG13 [9] phi from main::@1 to inccnt
+  inccnt_from_b1:
+  //SEG14 [9] phi (byte) cnt2#11 = (byte) cnt2#1 -- register_copy 
+  //SEG15 [9] phi (byte) cnt#12 = (byte) cnt#3 -- register_copy 
+    jsr inccnt
+  //SEG16 main::@2
+  b2:
+  //SEG17 [6] (byte~) main::$1 ← (byte) inccnt::return#0 [ main::$1 ]
+    // (byte~) main::$1 = (byte) inccnt::return#0  // register copy reg byte a
+  //SEG18 [7] *((word) 1025) ← (byte~) main::$1 [ ] -- _star_cowo1=aby 
+    sta $401
+  //SEG19 main::@return
+  breturn:
+  //SEG20 [8] return  [ ]
+    rts
+}
 //SEG21 inccnt
-inccnt:
-//SEG22 [10] (byte) cnt#1 ← ++ (byte) cnt#12 [ cnt#1 cnt2#11 ] -- xby=_inc_xby 
-  inx
-//SEG23 [11] (byte) cnt2#1 ← ++ (byte) cnt2#11 [ cnt#1 cnt2#1 ] -- yby=_inc_yby 
-  iny
-//SEG24 [12] (byte) inccnt::return#0 ← (byte) cnt#1 [ inccnt::return#0 cnt#1 cnt2#1 ] -- aby=xby 
-  txa
-//SEG25 inccnt::@return
-inccnt__Breturn:
-//SEG26 [13] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
-  rts
+inccnt: {
+  //SEG22 [10] (byte) cnt#1 ← ++ (byte) cnt#12 [ cnt#1 cnt2#11 ] -- xby=_inc_xby 
+    inx
+  //SEG23 [11] (byte) cnt2#1 ← ++ (byte) cnt2#11 [ cnt#1 cnt2#1 ] -- yby=_inc_yby 
+    iny
+  //SEG24 [12] (byte) inccnt::return#0 ← (byte) cnt#1 [ inccnt::return#0 cnt#1 cnt2#1 ] -- aby=xby 
+    txa
+  //SEG25 inccnt::@return
+  breturn:
+  //SEG26 [13] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
+    rts
+}
 
 FINAL SYMBOL TABLE
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte[256]) SCREEN
 (byte) cnt
 (byte) cnt#1 reg byte x 0.8571428571428571
@@ -893,56 +897,58 @@ reg byte x [ cnt#1 ]
 reg byte a [ inccnt::return#0 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
-//SEG5 [9] phi from main to inccnt
-inccnt_from_main:
-//SEG6 [9] phi (byte) cnt2#11 = (byte) 0 -- yby=coby1 
-  ldy #$0
-//SEG7 [9] phi (byte) cnt#12 = (byte) 0 -- xby=coby1 
-  ldx #$0
-  jsr inccnt
-//SEG8 main::@1
-main__B1:
-//SEG9 [2] (byte~) main::$0 ← (byte) inccnt::return#0 [ main::$0 cnt#1 cnt2#1 ]
-  // (byte~) main::$0 = (byte) inccnt::return#0  // register copy reg byte a
-//SEG10 [3] *((word) 1024) ← (byte~) main::$0 [ cnt#1 cnt2#1 ] -- _star_cowo1=aby 
-  sta $400
-//SEG11 [4] (byte) cnt#3 ← ++ (byte) cnt#1 [ cnt#3 cnt2#1 ] -- xby=_inc_xby 
-  inx
-//SEG12 [5] call inccnt param-assignment [ inccnt::return#0 ]
-//SEG13 [9] phi from main::@1 to inccnt
-inccnt_from_B1:
-//SEG14 [9] phi (byte) cnt2#11 = (byte) cnt2#1 -- register_copy 
-//SEG15 [9] phi (byte) cnt#12 = (byte) cnt#3 -- register_copy 
-  jsr inccnt
-//SEG16 main::@2
-main__B2:
-//SEG17 [6] (byte~) main::$1 ← (byte) inccnt::return#0 [ main::$1 ]
-  // (byte~) main::$1 = (byte) inccnt::return#0  // register copy reg byte a
-//SEG18 [7] *((word) 1025) ← (byte~) main::$1 [ ] -- _star_cowo1=aby 
-  sta $401
-//SEG19 main::@return
-main__Breturn:
-//SEG20 [8] return  [ ]
-  rts
+main: {
+  //SEG4 [1] call inccnt param-assignment [ inccnt::return#0 cnt#1 cnt2#1 ]
+  //SEG5 [9] phi from main to inccnt
+  inccnt_from_main:
+  //SEG6 [9] phi (byte) cnt2#11 = (byte) 0 -- yby=coby1 
+    ldy #$0
+  //SEG7 [9] phi (byte) cnt#12 = (byte) 0 -- xby=coby1 
+    ldx #$0
+    jsr inccnt
+  //SEG8 main::@1
+  b1:
+  //SEG9 [2] (byte~) main::$0 ← (byte) inccnt::return#0 [ main::$0 cnt#1 cnt2#1 ]
+    // (byte~) main::$0 = (byte) inccnt::return#0  // register copy reg byte a
+  //SEG10 [3] *((word) 1024) ← (byte~) main::$0 [ cnt#1 cnt2#1 ] -- _star_cowo1=aby 
+    sta $400
+  //SEG11 [4] (byte) cnt#3 ← ++ (byte) cnt#1 [ cnt#3 cnt2#1 ] -- xby=_inc_xby 
+    inx
+  //SEG12 [5] call inccnt param-assignment [ inccnt::return#0 ]
+  //SEG13 [9] phi from main::@1 to inccnt
+  inccnt_from_b1:
+  //SEG14 [9] phi (byte) cnt2#11 = (byte) cnt2#1 -- register_copy 
+  //SEG15 [9] phi (byte) cnt#12 = (byte) cnt#3 -- register_copy 
+    jsr inccnt
+  //SEG16 main::@2
+  b2:
+  //SEG17 [6] (byte~) main::$1 ← (byte) inccnt::return#0 [ main::$1 ]
+    // (byte~) main::$1 = (byte) inccnt::return#0  // register copy reg byte a
+  //SEG18 [7] *((word) 1025) ← (byte~) main::$1 [ ] -- _star_cowo1=aby 
+    sta $401
+  //SEG19 main::@return
+  breturn:
+  //SEG20 [8] return  [ ]
+    rts
+}
 //SEG21 inccnt
-inccnt:
-//SEG22 [10] (byte) cnt#1 ← ++ (byte) cnt#12 [ cnt#1 cnt2#11 ] -- xby=_inc_xby 
-  inx
-//SEG23 [11] (byte) cnt2#1 ← ++ (byte) cnt2#11 [ cnt#1 cnt2#1 ] -- yby=_inc_yby 
-  iny
-//SEG24 [12] (byte) inccnt::return#0 ← (byte) cnt#1 [ inccnt::return#0 cnt#1 cnt2#1 ] -- aby=xby 
-  txa
-//SEG25 inccnt::@return
-inccnt__Breturn:
-//SEG26 [13] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
-  rts
+inccnt: {
+  //SEG22 [10] (byte) cnt#1 ← ++ (byte) cnt#12 [ cnt#1 cnt2#11 ] -- xby=_inc_xby 
+    inx
+  //SEG23 [11] (byte) cnt2#1 ← ++ (byte) cnt2#11 [ cnt#1 cnt2#1 ] -- yby=_inc_yby 
+    iny
+  //SEG24 [12] (byte) inccnt::return#0 ← (byte) cnt#1 [ inccnt::return#0 cnt#1 cnt2#1 ] -- aby=xby 
+    txa
+  //SEG25 inccnt::@return
+  breturn:
+  //SEG26 [13] return  [ inccnt::return#0 cnt#1 cnt2#1 ]
+    rts
+}
 

src/main/java/dk/camelot64/kickc/test/ref/modglobal.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte[256]) SCREEN
 (byte) cnt
 (byte) cnt#1 reg byte x 0.8571428571428571

src/main/java/dk/camelot64/kickc/test/ref/modglobalmin.asm

@@ -1,21 +1,23 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-inccnt_from_main:
-  ldx #$0
-  jsr inccnt
-main__B1:
-  stx $400
-  inx
-inccnt_from_B1:
-  jsr inccnt
-main__B2:
-  inx
-  stx $401
-main__Breturn:
-  rts
-inccnt:
-  inx
-inccnt__Breturn:
-  rts
+bend:
+main: {
+  inccnt_from_main:
+    ldx #$0
+    jsr inccnt
+  b1:
+    stx $400
+    inx
+  inccnt_from_b1:
+    jsr inccnt
+  b2:
+    inx
+    stx $401
+  breturn:
+    rts
+}
+inccnt: {
+    inx
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/modglobalmin.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call inccnt param-assignment [ cnt#10 ]
   to:main::@1
 main::@1: from main
@@ -16,11 +16,11 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   [7] return  [ ]
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   [8] (byte) cnt#13 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 ) [ cnt#13 ]
   [9] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ]
   to:inccnt::@return
 inccnt::@return: from inccnt
   [10] return  [ cnt#10 ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/modglobalmin.log

@@ -52,7 +52,7 @@ SYMBOLS
 (label) main::@return
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) cnt ← (byte) 0
   (byte[256]) SCREEN ← (word) 1024
   (void~) $0 ← call main 
@@ -67,27 +67,27 @@ main: from
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@1: from @BEGIN
+  to:@return
+@1: from @begin
   to:@2
 inccnt: from
   (byte) cnt ← ++ (byte) cnt
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
+  to:@return
 @2: from @1
-  to:@END
-@END: from @2
+  to:@end
+@end: from @2
 
 Removing empty block @1
 Removing empty block @2
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte) cnt ← (byte) 0
   (byte[256]) SCREEN ← (word) 1024
   (void~) $0 ← call main 
-  to:@END
+  to:@end
 main: from
   (void~) main::$0 ← call inccnt 
   *((byte[256]) SCREEN + (byte) 0) ← (byte) cnt
@@ -98,29 +98,29 @@ main: from
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
+  to:@return
 inccnt: from
   (byte) cnt ← ++ (byte) cnt
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 main modifies cnt
 inccnt modifies cnt
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   (byte) cnt ← (byte) 0
   (byte[256]) SCREEN ← (word) 1024
   call main param-assignment
   to:@3
-@3: from @BEGIN
+@3: from @begin
   (byte) cnt ← (byte) cnt
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -137,31 +137,31 @@ main::@2: from main::@1
 main::@return: from main::@2
   (byte) cnt ← (byte) cnt
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt ← ++ (byte) cnt
   to:inccnt::@return
 inccnt::@return: from inccnt
   (byte) cnt ← (byte) cnt
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Completing Phi functions...
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   (byte) cnt#0 ← (byte) 0
   (byte[256]) SCREEN#0 ← (word) 1024
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  (byte) cnt#9 ← phi( @BEGIN/(byte) cnt#0 )
+@3: from @begin
+  (byte) cnt#9 ← phi( @begin/(byte) cnt#0 )
   (byte) cnt#1 ← (byte) cnt#9
-  to:@END
-main: from @BEGIN
-  (byte[256]) SCREEN#3 ← phi( @BEGIN/(byte[256]) SCREEN#0 )
-  (byte) cnt#15 ← phi( @BEGIN/(byte) cnt#0 )
+  to:@end
+main: from @begin
+  (byte[256]) SCREEN#3 ← phi( @begin/(byte[256]) SCREEN#0 )
+  (byte) cnt#15 ← phi( @begin/(byte) cnt#0 )
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -183,7 +183,7 @@ main::@return: from main::@2
   (byte) cnt#12 ← phi( main::@2/(byte) cnt#5 )
   (byte) cnt#6 ← (byte) cnt#12
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt#13 ← phi( main/(byte) cnt#15 main::@1/(byte) cnt#3 )
   (byte) cnt#7 ← ++ (byte) cnt#13
@@ -192,22 +192,22 @@ inccnt::@return: from inccnt
   (byte) cnt#14 ← phi( inccnt/(byte) cnt#7 )
   (byte) cnt#8 ← (byte) cnt#14
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   (byte) cnt#0 ← (byte) 0
   (byte[256]) SCREEN#0 ← (word) 1024
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  (byte) cnt#9 ← phi( @BEGIN/(byte) cnt#6 )
+@3: from @begin
+  (byte) cnt#9 ← phi( @begin/(byte) cnt#6 )
   (byte) cnt#1 ← (byte) cnt#9
-  to:@END
-main: from @BEGIN
-  (byte[256]) SCREEN#3 ← phi( @BEGIN/(byte[256]) SCREEN#0 )
-  (byte) cnt#15 ← phi( @BEGIN/(byte) cnt#0 )
+  to:@end
+main: from @begin
+  (byte[256]) SCREEN#3 ← phi( @begin/(byte[256]) SCREEN#0 )
+  (byte) cnt#15 ← phi( @begin/(byte) cnt#0 )
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -229,7 +229,7 @@ main::@return: from main::@2
   (byte) cnt#12 ← phi( main::@2/(byte) cnt#5 )
   (byte) cnt#6 ← (byte) cnt#12
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt#13 ← phi( main/(byte) cnt#15 main::@1/(byte) cnt#3 )
   (byte) cnt#7 ← ++ (byte) cnt#13
@@ -238,23 +238,23 @@ inccnt::@return: from inccnt
   (byte) cnt#14 ← phi( inccnt/(byte) cnt#7 )
   (byte) cnt#8 ← (byte) cnt#14
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Constant (byte) cnt#0 (byte) 0
 Constant (byte[256]) SCREEN#0 (word) 1024
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  (byte) cnt#9 ← phi( @BEGIN/(byte) cnt#6 )
+@3: from @begin
+  (byte) cnt#9 ← phi( @begin/(byte) cnt#6 )
   (byte) cnt#1 ← (byte) cnt#9
-  to:@END
-main: from @BEGIN
-  (byte[256]) SCREEN#3 ← phi( @BEGIN/(word) 1024 )
-  (byte) cnt#15 ← phi( @BEGIN/(byte) 0 )
+  to:@end
+main: from @begin
+  (byte[256]) SCREEN#3 ← phi( @begin/(word) 1024 )
+  (byte) cnt#15 ← phi( @begin/(byte) 0 )
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -276,7 +276,7 @@ main::@return: from main::@2
   (byte) cnt#12 ← phi( main::@2/(byte) cnt#5 )
   (byte) cnt#6 ← (byte) cnt#12
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt#13 ← phi( main/(byte) cnt#15 main::@1/(byte) cnt#3 )
   (byte) cnt#7 ← ++ (byte) cnt#13
@@ -285,22 +285,22 @@ inccnt::@return: from inccnt
   (byte) cnt#14 ← phi( inccnt/(byte) cnt#7 )
   (byte) cnt#8 ← (byte) cnt#14
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Alias (byte) cnt#1 = (byte) cnt#9 (byte) cnt#6 (byte) cnt#12 (byte) cnt#5 
 Alias (byte) cnt#10 = (byte) cnt#8 (byte) cnt#2 (byte) cnt#11 (byte) cnt#4 (byte) cnt#14 (byte) cnt#7 
 Alias (byte[256]) SCREEN#1 = (byte[256]) SCREEN#3 (byte[256]) SCREEN#2 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  to:@END
-main: from @BEGIN
-  (byte[256]) SCREEN#1 ← phi( @BEGIN/(word) 1024 )
-  (byte) cnt#15 ← phi( @BEGIN/(byte) 0 )
+@3: from @begin
+  to:@end
+main: from @begin
+  (byte[256]) SCREEN#1 ← phi( @begin/(word) 1024 )
+  (byte) cnt#15 ← phi( @begin/(byte) 0 )
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -314,26 +314,26 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt#13 ← phi( main/(byte) cnt#15 main::@1/(byte) cnt#3 )
   (byte) cnt#10 ← ++ (byte) cnt#13
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Redundant Phi (byte) cnt#15 (byte) 0
 Redundant Phi (byte[256]) SCREEN#1 (word) 1024
 Succesful SSA optimization Pass2RedundantPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@3
-@3: from @BEGIN
-  to:@END
-main: from @BEGIN
+@3: from @begin
+  to:@end
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -347,23 +347,23 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt#13 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 )
   (byte) cnt#10 ← ++ (byte) cnt#13
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @3
+  to:@return
+@end: from @3
 
 Culled Empty Block (label) @3
 Succesful SSA optimization Pass2CullEmptyBlocks
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -377,24 +377,24 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt#13 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 )
   (byte) cnt#10 ← ++ (byte) cnt#13
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Consolidated assigned array index constant in assignment *(1024)
 Consolidated assigned array index constant in assignment *(1025)
 Succesful SSA optimization Pass2ConstantAdditionElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -408,24 +408,24 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt#13 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 )
   (byte) cnt#10 ← ++ (byte) cnt#13
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
-Block Sequence Planned @BEGIN @END main main::@1 main::@2 main::@return inccnt inccnt::@return 
-Block Sequence Planned @BEGIN @END main main::@1 main::@2 main::@return inccnt inccnt::@return 
+Block Sequence Planned @begin @end main main::@1 main::@2 main::@return inccnt inccnt::@return 
+Block Sequence Planned @begin @end main main::@1 main::@2 main::@return inccnt inccnt::@return 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   call inccnt param-assignment
   to:main::@1
 main::@1: from main
@@ -440,23 +440,23 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   return 
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   (byte) cnt#13 ← phi( main/(byte) 0 main::@1/(byte~) cnt#16 )
   (byte) cnt#10 ← ++ (byte) cnt#13
   to:inccnt::@return
 inccnt::@return: from inccnt
   return 
-  to:@RETURN
+  to:@return
 
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call inccnt param-assignment [ cnt#10 ]
   to:main::@1
 main::@1: from main
@@ -471,27 +471,27 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   [8] return  [ ]
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   [9] (byte) cnt#13 ← phi( main/(byte) 0 main::@1/(byte~) cnt#16 ) [ cnt#13 ]
   [10] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ]
   to:inccnt::@return
 inccnt::@return: from inccnt
   [11] return  [ cnt#10 ]
-  to:@RETURN
+  to:@return
 
 Created 1 initial phi equivalence classes
 Coalesced [4] cnt#16 ← cnt#3
 Coalesced down to 1 phi equivalence classes
-Block Sequence Planned @BEGIN @END main main::@1 main::@2 main::@return inccnt inccnt::@return 
+Block Sequence Planned @begin @end main main::@1 main::@2 main::@return inccnt inccnt::@return 
 Propagating live ranges...
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call inccnt param-assignment [ cnt#10 ]
   to:main::@1
 main::@1: from main
@@ -505,28 +505,28 @@ main::@2: from main::@1
   to:main::@return
 main::@return: from main::@2
   [7] return  [ ]
-  to:@RETURN
+  to:@return
 inccnt: from main main::@1
   [8] (byte) cnt#13 ← phi( main/(byte) 0 main::@1/(byte) cnt#3 ) [ cnt#13 ]
   [9] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ]
   to:inccnt::@return
 inccnt::@return: from inccnt
   [10] return  [ cnt#10 ]
-  to:@RETURN
+  to:@return
 
 CALL GRAPH
 Calls in [] to 0:main 
 Calls in [main] to 1:inccnt 4:inccnt 
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@END dominated by  @BEGIN @END 
-main dominated by  @BEGIN main 
-main::@1 dominated by  @BEGIN main::@1 main 
-main::@2 dominated by  @BEGIN main::@2 main::@1 main 
-main::@return dominated by  @BEGIN main::@return main::@2 main::@1 main 
-inccnt dominated by  @BEGIN inccnt main 
-inccnt::@return dominated by  inccnt::@return @BEGIN inccnt main 
+@begin dominated by  @begin 
+@end dominated by  @end @begin 
+main dominated by  @begin main 
+main::@1 dominated by  @begin main::@1 main 
+main::@2 dominated by  @begin main::@2 main::@1 main 
+main::@return dominated by  main::@return @begin main::@2 main::@1 main 
+inccnt dominated by  inccnt @begin main 
+inccnt::@return dominated by  inccnt::@return inccnt @begin main 
 
 NATURAL LOOPS
 
@@ -558,63 +558,65 @@ Allocated zp byte:2 to zp byte:2 [ cnt#13 cnt#3 ]
 Allocated zp byte:3 to zp byte:3 [ cnt#1 ]
 Allocated zp byte:4 to zp byte:4 [ cnt#10 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-  jmp BEND
-//SEG2 @END
-BEND:
+  jmp bend
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] call inccnt param-assignment [ cnt#10 ]
-//SEG5 [8] phi from main to inccnt
-inccnt_from_main:
-//SEG6 [8] phi (byte) cnt#13 = (byte) 0 -- zpby1=coby1 
-  lda #$0
-  sta $2
-  jsr inccnt
-  jmp main__B1
-//SEG7 main::@1
-main__B1:
-//SEG8 [2] *((word) 1024) ← (byte) cnt#10 [ cnt#10 ] -- _star_cowo1=zpby1 
-  lda $4
-  sta $400
-//SEG9 [3] (byte) cnt#3 ← ++ (byte) cnt#10 [ cnt#3 ] -- zpby1=_inc_zpby2 
-  lda $4
-  sta $2
-  inc $2
-//SEG10 [4] call inccnt param-assignment [ cnt#10 ]
-//SEG11 [8] phi from main::@1 to inccnt
-inccnt_from_B1:
-//SEG12 [8] phi (byte) cnt#13 = (byte) cnt#3 -- register_copy 
-  jsr inccnt
-  jmp main__B2
-//SEG13 main::@2
-main__B2:
-//SEG14 [5] (byte) cnt#1 ← ++ (byte) cnt#10 [ cnt#1 ] -- zpby1=_inc_zpby2 
-  lda $4
-  sta $3
-  inc $3
-//SEG15 [6] *((word) 1025) ← (byte) cnt#1 [ ] -- _star_cowo1=zpby1 
-  lda $3
-  sta $401
-  jmp main__Breturn
-//SEG16 main::@return
-main__Breturn:
-//SEG17 [7] return  [ ]
-  rts
+main: {
+  //SEG4 [1] call inccnt param-assignment [ cnt#10 ]
+  //SEG5 [8] phi from main to inccnt
+  inccnt_from_main:
+  //SEG6 [8] phi (byte) cnt#13 = (byte) 0 -- zpby1=coby1 
+    lda #$0
+    sta $2
+    jsr inccnt
+    jmp b1
+  //SEG7 main::@1
+  b1:
+  //SEG8 [2] *((word) 1024) ← (byte) cnt#10 [ cnt#10 ] -- _star_cowo1=zpby1 
+    lda $4
+    sta $400
+  //SEG9 [3] (byte) cnt#3 ← ++ (byte) cnt#10 [ cnt#3 ] -- zpby1=_inc_zpby2 
+    lda $4
+    sta $2
+    inc $2
+  //SEG10 [4] call inccnt param-assignment [ cnt#10 ]
+  //SEG11 [8] phi from main::@1 to inccnt
+  inccnt_from_b1:
+  //SEG12 [8] phi (byte) cnt#13 = (byte) cnt#3 -- register_copy 
+    jsr inccnt
+    jmp b2
+  //SEG13 main::@2
+  b2:
+  //SEG14 [5] (byte) cnt#1 ← ++ (byte) cnt#10 [ cnt#1 ] -- zpby1=_inc_zpby2 
+    lda $4
+    sta $3
+    inc $3
+  //SEG15 [6] *((word) 1025) ← (byte) cnt#1 [ ] -- _star_cowo1=zpby1 
+    lda $3
+    sta $401
+    jmp breturn
+  //SEG16 main::@return
+  breturn:
+  //SEG17 [7] return  [ ]
+    rts
+}
 //SEG18 inccnt
-inccnt:
-//SEG19 [9] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ] -- zpby1=_inc_zpby2 
-  lda $2
-  sta $4
-  inc $4
-  jmp inccnt__Breturn
-//SEG20 inccnt::@return
-inccnt__Breturn:
-//SEG21 [10] return  [ cnt#10 ]
-  rts
+inccnt: {
+  //SEG19 [9] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ] -- zpby1=_inc_zpby2 
+    lda $2
+    sta $4
+    inc $4
+    jmp breturn
+  //SEG20 inccnt::@return
+  breturn:
+  //SEG21 [10] return  [ cnt#10 ]
+    rts
+}
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Potential registers zp byte:2 [ cnt#13 cnt#3 ] : zp byte:2 , reg byte a , reg byte x , reg byte y , 
@@ -629,60 +631,62 @@ Uplift Scope [inccnt]
 Uplifting [] best 61 combination reg byte x [ cnt#13 cnt#3 ] reg byte x [ cnt#1 ] reg byte x [ cnt#10 ] 
 Uplifting [main] best 61 combination 
 Uplifting [inccnt] best 61 combination 
-Removing instruction jmp BEND
-Removing instruction jmp main__B1
-Removing instruction jmp main__B2
-Removing instruction jmp main__Breturn
-Removing instruction jmp inccnt__Breturn
+Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] call inccnt param-assignment [ cnt#10 ]
-//SEG5 [8] phi from main to inccnt
-inccnt_from_main:
-//SEG6 [8] phi (byte) cnt#13 = (byte) 0 -- xby=coby1 
-  ldx #$0
-  jsr inccnt
-//SEG7 main::@1
-main__B1:
-//SEG8 [2] *((word) 1024) ← (byte) cnt#10 [ cnt#10 ] -- _star_cowo1=xby 
-  stx $400
-//SEG9 [3] (byte) cnt#3 ← ++ (byte) cnt#10 [ cnt#3 ] -- xby=_inc_xby 
-  inx
-//SEG10 [4] call inccnt param-assignment [ cnt#10 ]
-//SEG11 [8] phi from main::@1 to inccnt
-inccnt_from_B1:
-//SEG12 [8] phi (byte) cnt#13 = (byte) cnt#3 -- register_copy 
-  jsr inccnt
-//SEG13 main::@2
-main__B2:
-//SEG14 [5] (byte) cnt#1 ← ++ (byte) cnt#10 [ cnt#1 ] -- xby=_inc_xby 
-  inx
-//SEG15 [6] *((word) 1025) ← (byte) cnt#1 [ ] -- _star_cowo1=xby 
-  stx $401
-//SEG16 main::@return
-main__Breturn:
-//SEG17 [7] return  [ ]
-  rts
+main: {
+  //SEG4 [1] call inccnt param-assignment [ cnt#10 ]
+  //SEG5 [8] phi from main to inccnt
+  inccnt_from_main:
+  //SEG6 [8] phi (byte) cnt#13 = (byte) 0 -- xby=coby1 
+    ldx #$0
+    jsr inccnt
+  //SEG7 main::@1
+  b1:
+  //SEG8 [2] *((word) 1024) ← (byte) cnt#10 [ cnt#10 ] -- _star_cowo1=xby 
+    stx $400
+  //SEG9 [3] (byte) cnt#3 ← ++ (byte) cnt#10 [ cnt#3 ] -- xby=_inc_xby 
+    inx
+  //SEG10 [4] call inccnt param-assignment [ cnt#10 ]
+  //SEG11 [8] phi from main::@1 to inccnt
+  inccnt_from_b1:
+  //SEG12 [8] phi (byte) cnt#13 = (byte) cnt#3 -- register_copy 
+    jsr inccnt
+  //SEG13 main::@2
+  b2:
+  //SEG14 [5] (byte) cnt#1 ← ++ (byte) cnt#10 [ cnt#1 ] -- xby=_inc_xby 
+    inx
+  //SEG15 [6] *((word) 1025) ← (byte) cnt#1 [ ] -- _star_cowo1=xby 
+    stx $401
+  //SEG16 main::@return
+  breturn:
+  //SEG17 [7] return  [ ]
+    rts
+}
 //SEG18 inccnt
-inccnt:
-//SEG19 [9] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ] -- xby=_inc_xby 
-  inx
-//SEG20 inccnt::@return
-inccnt__Breturn:
-//SEG21 [10] return  [ cnt#10 ]
-  rts
+inccnt: {
+  //SEG19 [9] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ] -- xby=_inc_xby 
+    inx
+  //SEG20 inccnt::@return
+  breturn:
+  //SEG21 [10] return  [ cnt#10 ]
+    rts
+}
 
 FINAL SYMBOL TABLE
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte[256]) SCREEN
 (byte) cnt
 (byte) cnt#1 reg byte x 4.0
@@ -701,47 +705,49 @@ reg byte x [ cnt#1 ]
 reg byte x [ cnt#10 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] call inccnt param-assignment [ cnt#10 ]
-//SEG5 [8] phi from main to inccnt
-inccnt_from_main:
-//SEG6 [8] phi (byte) cnt#13 = (byte) 0 -- xby=coby1 
-  ldx #$0
-  jsr inccnt
-//SEG7 main::@1
-main__B1:
-//SEG8 [2] *((word) 1024) ← (byte) cnt#10 [ cnt#10 ] -- _star_cowo1=xby 
-  stx $400
-//SEG9 [3] (byte) cnt#3 ← ++ (byte) cnt#10 [ cnt#3 ] -- xby=_inc_xby 
-  inx
-//SEG10 [4] call inccnt param-assignment [ cnt#10 ]
-//SEG11 [8] phi from main::@1 to inccnt
-inccnt_from_B1:
-//SEG12 [8] phi (byte) cnt#13 = (byte) cnt#3 -- register_copy 
-  jsr inccnt
-//SEG13 main::@2
-main__B2:
-//SEG14 [5] (byte) cnt#1 ← ++ (byte) cnt#10 [ cnt#1 ] -- xby=_inc_xby 
-  inx
-//SEG15 [6] *((word) 1025) ← (byte) cnt#1 [ ] -- _star_cowo1=xby 
-  stx $401
-//SEG16 main::@return
-main__Breturn:
-//SEG17 [7] return  [ ]
-  rts
+main: {
+  //SEG4 [1] call inccnt param-assignment [ cnt#10 ]
+  //SEG5 [8] phi from main to inccnt
+  inccnt_from_main:
+  //SEG6 [8] phi (byte) cnt#13 = (byte) 0 -- xby=coby1 
+    ldx #$0
+    jsr inccnt
+  //SEG7 main::@1
+  b1:
+  //SEG8 [2] *((word) 1024) ← (byte) cnt#10 [ cnt#10 ] -- _star_cowo1=xby 
+    stx $400
+  //SEG9 [3] (byte) cnt#3 ← ++ (byte) cnt#10 [ cnt#3 ] -- xby=_inc_xby 
+    inx
+  //SEG10 [4] call inccnt param-assignment [ cnt#10 ]
+  //SEG11 [8] phi from main::@1 to inccnt
+  inccnt_from_b1:
+  //SEG12 [8] phi (byte) cnt#13 = (byte) cnt#3 -- register_copy 
+    jsr inccnt
+  //SEG13 main::@2
+  b2:
+  //SEG14 [5] (byte) cnt#1 ← ++ (byte) cnt#10 [ cnt#1 ] -- xby=_inc_xby 
+    inx
+  //SEG15 [6] *((word) 1025) ← (byte) cnt#1 [ ] -- _star_cowo1=xby 
+    stx $401
+  //SEG16 main::@return
+  breturn:
+  //SEG17 [7] return  [ ]
+    rts
+}
 //SEG18 inccnt
-inccnt:
-//SEG19 [9] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ] -- xby=_inc_xby 
-  inx
-//SEG20 inccnt::@return
-inccnt__Breturn:
-//SEG21 [10] return  [ cnt#10 ]
-  rts
+inccnt: {
+  //SEG19 [9] (byte) cnt#10 ← ++ (byte) cnt#13 [ cnt#10 ] -- xby=_inc_xby 
+    inx
+  //SEG20 inccnt::@return
+  breturn:
+  //SEG21 [10] return  [ cnt#10 ]
+    rts
+}
 

src/main/java/dk/camelot64/kickc/test/ref/modglobalmin.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte[256]) SCREEN
 (byte) cnt
 (byte) cnt#1 reg byte x 4.0

src/main/java/dk/camelot64/kickc/test/ref/ptrtest.asm

@@ -1,29 +1,31 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-  jsr lvalue
-main__B1:
-  jsr rvalue
-main__B2:
-  jsr rvaluevar
-main__B3:
-  jsr lvaluevar
-main__Breturn:
-  rts
-lvaluevar:
-lvaluevar__B1_from_lvaluevar:
-  lda #<$400
-  sta $2
-  lda #>$400
-  sta $2+$1
-  ldx #$2
-lvaluevar__B1:
-  cpx #$a
-  bcc lvaluevar__B2
-lvaluevar__Breturn:
-  rts
-lvaluevar__B2:
+bend:
+main: {
+    jsr lvalue
+  b1:
+    jsr rvalue
+  b2:
+    jsr rvaluevar
+  b3:
+    jsr lvaluevar
+  breturn:
+    rts
+}
+lvaluevar: {
+  b1_from_lvaluevar:
+    lda #<$400
+    sta $2
+    lda #>$400
+    sta $2+$1
+    ldx #$2
+  b1:
+    cpx #$a
+    bcc b2
+  breturn:
+    rts
+}
+b2:
   ldy #$0
   lda #$4
   sta ($2),y
@@ -32,21 +34,22 @@ lvaluevar__B2:
   inc $2+$1
 !:
   inx
-lvaluevar__B1_from_B2:
-  jmp lvaluevar__B1
-rvaluevar:
-rvaluevar__B1_from_rvaluevar:
-  lda #<$400
-  sta $2
-  lda #>$400
-  sta $2+$1
-  ldx #$2
-rvaluevar__B1:
-  cpx #$a
-  bcc rvaluevar__B2
-rvaluevar__Breturn:
-  rts
-rvaluevar__B2:
+b1_from_b2:
+  jmp b1
+rvaluevar: {
+  b1_from_rvaluevar:
+    lda #<$400
+    sta $2
+    lda #>$400
+    sta $2+$1
+    ldx #$2
+  b1:
+    cpx #$a
+    bcc b2
+  breturn:
+    rts
+}
+b2:
   ldy #$0
   lda ($2),y
   inc $2
@@ -54,38 +57,40 @@ rvaluevar__B2:
   inc $2+$1
 !:
   inx
-rvaluevar__B1_from_B2:
-  jmp rvaluevar__B1
-rvalue:
-  lda $400
-  lda $401
-rvalue__B1_from_rvalue:
-  ldx #$2
-rvalue__B1:
-  cpx #$a
-  bcc rvalue__B2
-rvalue__Breturn:
-  rts
-rvalue__B2:
+b1_from_b2:
+  jmp b1
+rvalue: {
+    lda $400
+    lda $401
+  b1_from_rvalue:
+    ldx #$2
+  b1:
+    cpx #$a
+    bcc b2
+  breturn:
+    rts
+}
+b2:
   lda $400,x
   inx
-rvalue__B1_from_B2:
-  jmp rvalue__B1
-lvalue:
-  lda #$1
-  sta $400
-  lda #$2
-  sta $401
-lvalue__B1_from_lvalue:
-  ldx #$2
-lvalue__B1:
-  cpx #$a
-  bcc lvalue__B2
-lvalue__Breturn:
-  rts
-lvalue__B2:
+b1_from_b2:
+  jmp b1
+lvalue: {
+    lda #$1
+    sta $400
+    lda #$2
+    sta $401
+  b1_from_lvalue:
+    ldx #$2
+  b1:
+    cpx #$a
+    bcc b2
+  breturn:
+    rts
+}
+b2:
   lda #$3
   sta $400,x
   inx
-lvalue__B1_from_B2:
-  jmp lvalue__B1
+b1_from_b2:
+  jmp b1

src/main/java/dk/camelot64/kickc/test/ref/ptrtest.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call lvalue param-assignment [ ]
   to:main::@1
 main::@1: from main
@@ -16,7 +16,7 @@ main::@3: from main::@2
   to:main::@return
 main::@return: from main::@3
   [5] return  [ ]
-  to:@RETURN
+  to:@return
 lvaluevar: from main::@3
   to:lvaluevar::@1
 lvaluevar::@1: from lvaluevar lvaluevar::@2
@@ -26,7 +26,7 @@ lvaluevar::@1: from lvaluevar lvaluevar::@2
   to:lvaluevar::@return
 lvaluevar::@return: from lvaluevar::@1
   [8] return  [ ]
-  to:@RETURN
+  to:@return
 lvaluevar::@2: from lvaluevar::@1
   [9] *((byte*) lvaluevar::screen#2) ← (byte) 4 [ lvaluevar::i#2 lvaluevar::screen#2 ]
   [10] (byte*) lvaluevar::screen#1 ← ++ (byte*) lvaluevar::screen#2 [ lvaluevar::screen#1 lvaluevar::i#2 ]
@@ -41,7 +41,7 @@ rvaluevar::@1: from rvaluevar rvaluevar::@2
   to:rvaluevar::@return
 rvaluevar::@return: from rvaluevar::@1
   [14] return  [ ]
-  to:@RETURN
+  to:@return
 rvaluevar::@2: from rvaluevar::@1
   [15] (byte) rvaluevar::b#0 ← * (byte*) rvaluevar::screen#2 [ rvaluevar::i#2 rvaluevar::screen#2 ]
   [16] (byte*) rvaluevar::screen#1 ← ++ (byte*) rvaluevar::screen#2 [ rvaluevar::screen#1 rvaluevar::i#2 ]
@@ -57,7 +57,7 @@ rvalue::@1: from rvalue rvalue::@2
   to:rvalue::@return
 rvalue::@return: from rvalue::@1
   [22] return  [ ]
-  to:@RETURN
+  to:@return
 rvalue::@2: from rvalue::@1
   [23] (byte) rvalue::b#2 ← (word) 1024 *idx (byte) rvalue::i#2 [ rvalue::i#2 ]
   [24] (byte) rvalue::i#1 ← ++ (byte) rvalue::i#2 [ rvalue::i#1 ]
@@ -72,7 +72,7 @@ lvalue::@1: from lvalue lvalue::@2
   to:lvalue::@return
 lvalue::@return: from lvalue::@1
   [29] return  [ ]
-  to:@RETURN
+  to:@return
 lvalue::@2: from lvalue::@1
   [30] *((word) 1024 + (byte) lvalue::i#2) ← (byte) 3 [ lvalue::i#2 ]
   [31] (byte) lvalue::i#1 ← ++ (byte) lvalue::i#2 [ lvalue::i#1 ]

src/main/java/dk/camelot64/kickc/test/ref/ptrtest.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (void()) lvalue()
 (label) lvalue::@1
 (label) lvalue::@2

src/main/java/dk/camelot64/kickc/test/ref/ptrtestmin.asm

@@ -1,16 +1,17 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-main__B1_from_main:
-  ldx #$2
-main__B1:
-  cpx #$a
-  bcc main__B2
-main__Breturn:
-  rts
-main__B2:
+bend:
+main: {
+  b1_from_main:
+    ldx #$2
+  b1:
+    cpx #$a
+    bcc b2
+  breturn:
+    rts
+}
+b2:
   lda $400,x
   inx
-main__B1_from_B2:
-  jmp main__B1
+b1_from_b2:
+  jmp b1

src/main/java/dk/camelot64/kickc/test/ref/ptrtestmin.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   [1] (byte) main::i#2 ← phi( main/(byte) 2 main::@2/(byte) main::i#1 ) [ main::i#2 ]
@@ -10,7 +10,7 @@ main::@1: from main main::@2
   to:main::@return
 main::@return: from main::@1
   [3] return  [ ]
-  to:@RETURN
+  to:@return
 main::@2: from main::@1
   [4] (byte) main::b#0 ← (word) 1024 *idx (byte) main::i#2 [ main::i#2 ]
   [5] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ]

src/main/java/dk/camelot64/kickc/test/ref/ptrtestmin.log

@@ -51,7 +51,7 @@ SYMBOLS
 (byte) main::i
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (void~) $0 ← call main 
   to:@1
 main: from
@@ -77,10 +77,10 @@ main::@6: from
   to:main::@3
 main::@return: from main::@3
   return 
-  to:@RETURN
-@1: from @BEGIN
-  to:@END
-@END: from @1
+  to:@return
+@1: from @begin
+  to:@end
+@end: from @1
 
 Removing empty block main::@4
 Removing empty block main::@3
@@ -88,9 +88,9 @@ Removing empty block main::@5
 Removing empty block main::@6
 Removing empty block @1
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (void~) $0 ← call main 
-  to:@END
+  to:@end
 main: from
   (byte[1024]) main::SCREEN ← (word) 1024
   (byte) main::i ← (byte) 2
@@ -106,18 +106,18 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
+@2: from @begin
+  to:@end
+main: from @begin
   (byte[1024]) main::SCREEN ← (word) 1024
   (byte) main::i ← (byte) 2
   to:main::@1
@@ -132,18 +132,18 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 Completing Phi functions...
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
+@2: from @begin
+  to:@end
+main: from @begin
   (byte[1024]) main::SCREEN#0 ← (word) 1024
   (byte) main::i#0 ← (byte) 2
   to:main::@1
@@ -162,16 +162,16 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
+@2: from @begin
+  to:@end
+main: from @begin
   (byte[1024]) main::SCREEN#0 ← (word) 1024
   (byte) main::i#0 ← (byte) 2
   to:main::@1
@@ -190,16 +190,16 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 Culled Empty Block (label) @2
 Succesful SSA optimization Pass2CullEmptyBlocks
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   (byte[1024]) main::SCREEN#0 ← (word) 1024
   (byte) main::i#0 ← (byte) 2
   to:main::@1
@@ -218,17 +218,17 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Constant (byte[1024]) main::SCREEN#0 (word) 1024
 Constant (byte) main::i#0 (byte) 2
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   (byte[1024]) main::SCREEN#2 ← phi( main/(word) 1024 main::@2/(byte[1024]) main::SCREEN#1 )
@@ -245,18 +245,18 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Alias (byte[1024]) main::SCREEN#1 = (byte[1024]) main::SCREEN#2 
 Alias (byte) main::i#2 = (byte) main::i#3 
 Alias (byte) main::b#0 = (byte~) main::$1 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   (byte[1024]) main::SCREEN#1 ← phi( main/(word) 1024 main::@2/(byte[1024]) main::SCREEN#1 )
@@ -270,16 +270,16 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Self Phi Eliminated (byte[1024]) main::SCREEN#1
 Succesful SSA optimization Pass2SelfPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   (byte[1024]) main::SCREEN#1 ← phi( main/(word) 1024 )
@@ -293,16 +293,16 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Simple Condition (boolean~) main::$0 if((byte) main::i#2<(byte) 10) goto main::@2
 Succesful SSA optimization Pass2ConditionalJumpSimplification
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   (byte[1024]) main::SCREEN#1 ← phi( main/(word) 1024 )
@@ -315,16 +315,16 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Constant (byte[1024]) main::SCREEN#1 (word) 1024
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   (byte) main::i#2 ← phi( main/(byte) 2 main::@2/(byte) main::i#1 )
@@ -336,19 +336,19 @@ main::@2: from main::@1
   to:main::@1
 main::@return: from main::@1
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Multiple usages for variable. Not optimizing sub-constant (byte) main::i#2
 Multiple usages for variable. Not optimizing sub-constant (byte) main::i#2
-Block Sequence Planned @BEGIN @END main main::@1 main::@return main::@2 
-Block Sequence Planned @BEGIN @END main main::@1 main::@return main::@2 
+Block Sequence Planned @begin @end main main::@1 main::@return main::@2 
+Block Sequence Planned @begin @end main main::@1 main::@return main::@2 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   (byte) main::i#2 ← phi( main/(byte) 2 main::@2/(byte~) main::i#4 )
@@ -356,7 +356,7 @@ main::@1: from main main::@2
   to:main::@return
 main::@return: from main::@1
   return 
-  to:@RETURN
+  to:@return
 main::@2: from main::@1
   (byte) main::b#0 ← (word) 1024 *idx (byte) main::i#2
   (byte) main::i#1 ← ++ (byte) main::i#2
@@ -366,11 +366,11 @@ main::@2: from main::@1
 Adding empty live range for unused variable main::b#0
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   [1] (byte) main::i#2 ← phi( main/(byte) 2 main::@2/(byte~) main::i#4 ) [ main::i#2 ]
@@ -378,7 +378,7 @@ main::@1: from main main::@2
   to:main::@return
 main::@return: from main::@1
   [3] return  [ ]
-  to:@RETURN
+  to:@return
 main::@2: from main::@1
   [4] (byte) main::b#0 ← (word) 1024 *idx (byte) main::i#2 [ main::i#2 ]
   [5] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ]
@@ -388,15 +388,15 @@ main::@2: from main::@1
 Created 1 initial phi equivalence classes
 Coalesced [6] main::i#4 ← main::i#1
 Coalesced down to 1 phi equivalence classes
-Block Sequence Planned @BEGIN @END main main::@1 main::@return main::@2 
+Block Sequence Planned @begin @end main main::@1 main::@return main::@2 
 Adding empty live range for unused variable main::b#0
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   to:main::@1
 main::@1: from main main::@2
   [1] (byte) main::i#2 ← phi( main/(byte) 2 main::@2/(byte) main::i#1 ) [ main::i#2 ]
@@ -404,7 +404,7 @@ main::@1: from main main::@2
   to:main::@return
 main::@return: from main::@1
   [3] return  [ ]
-  to:@RETURN
+  to:@return
 main::@2: from main::@1
   [4] (byte) main::b#0 ← (word) 1024 *idx (byte) main::i#2 [ main::i#2 ]
   [5] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ]
@@ -414,12 +414,12 @@ CALL GRAPH
 Calls in [] to 0:main 
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@END dominated by  @BEGIN @END 
-main dominated by  @BEGIN main 
-main::@1 dominated by  @BEGIN main::@1 main 
-main::@return dominated by  @BEGIN main::@return main::@1 main 
-main::@2 dominated by  @BEGIN main::@2 main::@1 main 
+@begin dominated by  @begin 
+@end dominated by  @end @begin 
+main dominated by  @begin main 
+main::@1 dominated by  @begin main::@1 main 
+main::@return dominated by  main::@return @begin main::@1 main 
+main::@2 dominated by  @begin main::@2 main::@1 main 
 
 Found back edge: Loop head: main::@1 tails: main::@2 blocks: null
 Populated: Loop head: main::@1 tails: main::@2 blocks: main::@2 main::@1 
@@ -451,34 +451,35 @@ Complete equivalence classes
 Allocated zp byte:2 to zp byte:2 [ main::i#2 main::i#1 ]
 Allocated zp byte:3 to zp byte:3 [ main::b#0 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-  jmp BEND
-//SEG2 @END
-BEND:
+  jmp bend
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] phi from main to main::@1
-main__B1_from_main:
-//SEG5 [1] phi (byte) main::i#2 = (byte) 2 -- zpby1=coby1 
-  lda #$2
-  sta $2
-  jmp main__B1
-//SEG6 main::@1
-main__B1:
-//SEG7 [2] if((byte) main::i#2<(byte) 10) goto main::@2 [ main::i#2 ] -- zpby1_lt_coby1_then_la1 
-  lda $2
-  cmp #$a
-  bcc main__B2
-  jmp main__Breturn
-//SEG8 main::@return
-main__Breturn:
-//SEG9 [3] return  [ ]
-  rts
+main: {
+  //SEG4 [1] phi from main to main::@1
+  b1_from_main:
+  //SEG5 [1] phi (byte) main::i#2 = (byte) 2 -- zpby1=coby1 
+    lda #$2
+    sta $2
+    jmp b1
+  //SEG6 main::@1
+  b1:
+  //SEG7 [2] if((byte) main::i#2<(byte) 10) goto main::@2 [ main::i#2 ] -- zpby1_lt_coby1_then_la1 
+    lda $2
+    cmp #$a
+    bcc b2
+    jmp breturn
+  //SEG8 main::@return
+  breturn:
+  //SEG9 [3] return  [ ]
+    rts
+}
 //SEG10 main::@2
-main__B2:
+b2:
 //SEG11 [4] (byte) main::b#0 ← (word) 1024 *idx (byte) main::i#2 [ main::i#2 ] -- zpby1=cowo1_staridx_zpby2 
   ldx $2
   lda $400,x
@@ -486,9 +487,9 @@ main__B2:
 //SEG12 [5] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- zpby1=_inc_zpby1 
   inc $2
 //SEG13 [1] phi from main::@2 to main::@1
-main__B1_from_B2:
+b1_from_b2:
 //SEG14 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Potential registers zp byte:2 [ main::i#2 main::i#1 ] : zp byte:2 , reg byte a , reg byte x , reg byte y , 
@@ -500,46 +501,47 @@ Uplift Scope []
 
 Uplifting [main] best 235 combination reg byte a [ main::b#0 ] reg byte x [ main::i#2 main::i#1 ] 
 Uplifting [] best 235 combination 
-Removing instruction jmp BEND
-Removing instruction jmp main__B1
-Removing instruction jmp main__Breturn
+Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] phi from main to main::@1
-main__B1_from_main:
-//SEG5 [1] phi (byte) main::i#2 = (byte) 2 -- xby=coby1 
-  ldx #$2
-//SEG6 main::@1
-main__B1:
-//SEG7 [2] if((byte) main::i#2<(byte) 10) goto main::@2 [ main::i#2 ] -- xby_lt_coby1_then_la1 
-  cpx #$a
-  bcc main__B2
-//SEG8 main::@return
-main__Breturn:
-//SEG9 [3] return  [ ]
-  rts
+main: {
+  //SEG4 [1] phi from main to main::@1
+  b1_from_main:
+  //SEG5 [1] phi (byte) main::i#2 = (byte) 2 -- xby=coby1 
+    ldx #$2
+  //SEG6 main::@1
+  b1:
+  //SEG7 [2] if((byte) main::i#2<(byte) 10) goto main::@2 [ main::i#2 ] -- xby_lt_coby1_then_la1 
+    cpx #$a
+    bcc b2
+  //SEG8 main::@return
+  breturn:
+  //SEG9 [3] return  [ ]
+    rts
+}
 //SEG10 main::@2
-main__B2:
+b2:
 //SEG11 [4] (byte) main::b#0 ← (word) 1024 *idx (byte) main::i#2 [ main::i#2 ] -- aby=cowo1_staridx_xby 
   lda $400,x
 //SEG12 [5] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- xby=_inc_xby 
   inx
 //SEG13 [1] phi from main::@2 to main::@1
-main__B1_from_B2:
+b1_from_b2:
 //SEG14 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 
 FINAL SYMBOL TABLE
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (void()) main()
 (label) main::@1
 (label) main::@2
@@ -555,35 +557,36 @@ reg byte x [ main::i#2 main::i#1 ]
 reg byte a [ main::b#0 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] phi from main to main::@1
-main__B1_from_main:
-//SEG5 [1] phi (byte) main::i#2 = (byte) 2 -- xby=coby1 
-  ldx #$2
-//SEG6 main::@1
-main__B1:
-//SEG7 [2] if((byte) main::i#2<(byte) 10) goto main::@2 [ main::i#2 ] -- xby_lt_coby1_then_la1 
-  cpx #$a
-  bcc main__B2
-//SEG8 main::@return
-main__Breturn:
-//SEG9 [3] return  [ ]
-  rts
+main: {
+  //SEG4 [1] phi from main to main::@1
+  b1_from_main:
+  //SEG5 [1] phi (byte) main::i#2 = (byte) 2 -- xby=coby1 
+    ldx #$2
+  //SEG6 main::@1
+  b1:
+  //SEG7 [2] if((byte) main::i#2<(byte) 10) goto main::@2 [ main::i#2 ] -- xby_lt_coby1_then_la1 
+    cpx #$a
+    bcc b2
+  //SEG8 main::@return
+  breturn:
+  //SEG9 [3] return  [ ]
+    rts
+}
 //SEG10 main::@2
-main__B2:
+b2:
 //SEG11 [4] (byte) main::b#0 ← (word) 1024 *idx (byte) main::i#2 [ main::i#2 ] -- aby=cowo1_staridx_xby 
   lda $400,x
 //SEG12 [5] (byte) main::i#1 ← ++ (byte) main::i#2 [ main::i#1 ] -- xby=_inc_xby 
   inx
 //SEG13 [1] phi from main::@2 to main::@1
-main__B1_from_B2:
+b1_from_b2:
 //SEG14 [1] phi (byte) main::i#2 = (byte) main::i#1 -- register_copy 
-  jmp main__B1
+  jmp b1
 

src/main/java/dk/camelot64/kickc/test/ref/ptrtestmin.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (void()) main()
 (label) main::@1
 (label) main::@2

src/main/java/dk/camelot64/kickc/test/ref/summin.asm

@@ -1,31 +1,32 @@
-BBEGIN:
-sum_from_BBEGIN:
+bbegin:
+sum_from_bbegin:
   lda #$2
   ldy #$1
   jsr sum
-B2:
+b2:
   sta $2
-sum_from_B2:
+sum_from_b2:
   lda #$4
   ldy #$3
   jsr sum
-B3:
+b3:
   tax
-sum_from_B3:
+sum_from_b3:
   lda #$d
   ldy #$9
   jsr sum
-B4:
+b4:
   sta $3
   txa
   clc
   adc $2
   clc
   adc $3
-BEND:
-sum:
-  sty $ff
-  clc
-  adc $ff
-sum__Breturn:
-  rts
+bend:
+sum: {
+    sty $ff
+    clc
+    adc $ff
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/summin.cfg

@@ -1,7 +1,7 @@
-@BEGIN: from
+@begin: from
   [0] call sum param-assignment [ sum::return#0 ]
   to:@2
-@2: from @BEGIN
+@2: from @begin
   [1] (byte) s1#0 ← (byte) sum::return#0 [ s1#0 ]
   [2] call sum param-assignment [ sum::return#0 s1#0 ]
   to:@3
@@ -13,13 +13,13 @@
   [5] (byte) s3#0 ← (byte) sum::return#0 [ s1#0 s2#0 s3#0 ]
   [6] (byte~) $3 ← (byte) s1#0 + (byte) s2#0 [ $3 s3#0 ]
   [7] (byte) s4#0 ← (byte~) $3 + (byte) s3#0 [ ]
-  to:@END
-@END: from @4
-sum: from @2 @3 @BEGIN
-  [8] (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @BEGIN/(byte) 2 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
-  [8] (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @BEGIN/(byte) 1 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
+  to:@end
+@end: from @4
+sum: from @2 @3 @begin
+  [8] (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @begin/(byte) 2 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
+  [8] (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @begin/(byte) 1 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
   [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ]
   to:sum::@return
 sum::@return: from sum
   [10] return  [ sum::return#0 s1#0 s2#0 ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/summin.log

@@ -43,7 +43,7 @@ SYMBOLS
 (byte) sum::return
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte~) $0 ← call sum (byte) 1 (byte) 2 
   (byte) s1 ← (byte~) $0
   (byte~) $1 ← call sum (byte) 3 (byte) 4 
@@ -61,17 +61,17 @@ sum: from
 sum::@return: from sum sum::@1
   (byte) sum::return ← (byte) sum::return
   return (byte) sum::return
-  to:@RETURN
+  to:@return
 sum::@1: from
   to:sum::@return
-@1: from @BEGIN
-  to:@END
-@END: from @1
+@1: from @begin
+  to:@end
+@end: from @1
 
 Removing empty block sum::@1
 Removing empty block @1
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte~) $0 ← call sum (byte) 1 (byte) 2 
   (byte) s1 ← (byte~) $0
   (byte~) $1 ← call sum (byte) 3 (byte) 4 
@@ -81,7 +81,7 @@ CONTROL FLOW GRAPH
   (byte~) $3 ← (byte) s1 + (byte) s2
   (byte~) $4 ← (byte~) $3 + (byte) s3
   (byte) s4 ← (byte~) $4
-  to:@END
+  to:@end
 sum: from
   (byte~) sum::$0 ← (byte) sum::a + (byte) sum::b
   (byte) sum::return ← (byte~) sum::$0
@@ -89,18 +89,18 @@ sum: from
 sum::@return: from sum
   (byte) sum::return ← (byte) sum::return
   return (byte) sum::return
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   (byte) sum::a ← (byte) 1
   (byte) sum::b ← (byte) 2
   (byte) sum::return ← call sum param-assignment
   to:@2
-@2: from @BEGIN
+@2: from @begin
   (byte~) $0 ← (byte) sum::return
   (byte) s1 ← (byte~) $0
   (byte) sum::a ← (byte) 3
@@ -120,27 +120,27 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
   (byte~) $3 ← (byte) s1 + (byte) s2
   (byte~) $4 ← (byte~) $3 + (byte) s3
   (byte) s4 ← (byte~) $4
-  to:@END
-sum: from @2 @3 @BEGIN
+  to:@end
+sum: from @2 @3 @begin
   (byte~) sum::$0 ← (byte) sum::a + (byte) sum::b
   (byte) sum::return ← (byte~) sum::$0
   to:sum::@return
 sum::@return: from sum
   (byte) sum::return ← (byte) sum::return
   return (byte) sum::return
-  to:@RETURN
-@END: from @4
+  to:@return
+@end: from @4
 
 Completing Phi functions...
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   (byte) sum::a#0 ← (byte) 1
   (byte) sum::b#0 ← (byte) 2
   (byte) sum::return#0 ← call sum param-assignment
   to:@2
-@2: from @BEGIN
-  (byte) sum::return#5 ← phi( @BEGIN/(byte) sum::return#0 )
+@2: from @begin
+  (byte) sum::return#5 ← phi( @begin/(byte) sum::return#0 )
   (byte~) $0 ← (byte) sum::return#5
   (byte) s1#0 ← (byte~) $0
   (byte) sum::a#1 ← (byte) 3
@@ -165,10 +165,10 @@ CONTROL FLOW GRAPH SSA
   (byte~) $3 ← (byte) s1#1 + (byte) s2#1
   (byte~) $4 ← (byte~) $3 + (byte) s3#0
   (byte) s4#0 ← (byte~) $4
-  to:@END
-sum: from @2 @3 @BEGIN
-  (byte) sum::b#3 ← phi( @2/(byte) sum::b#1 @3/(byte) sum::b#2 @BEGIN/(byte) sum::b#0 )
-  (byte) sum::a#3 ← phi( @2/(byte) sum::a#1 @3/(byte) sum::a#2 @BEGIN/(byte) sum::a#0 )
+  to:@end
+sum: from @2 @3 @begin
+  (byte) sum::b#3 ← phi( @2/(byte) sum::b#1 @3/(byte) sum::b#2 @begin/(byte) sum::b#0 )
+  (byte) sum::a#3 ← phi( @2/(byte) sum::a#1 @3/(byte) sum::a#2 @begin/(byte) sum::a#0 )
   (byte~) sum::$0 ← (byte) sum::a#3 + (byte) sum::b#3
   (byte) sum::return#3 ← (byte~) sum::$0
   to:sum::@return
@@ -176,18 +176,18 @@ sum::@return: from sum
   (byte) sum::return#8 ← phi( sum/(byte) sum::return#3 )
   (byte) sum::return#4 ← (byte) sum::return#8
   return (byte) sum::return#4
-  to:@RETURN
-@END: from @4
+  to:@return
+@end: from @4
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   (byte) sum::a#0 ← (byte) 1
   (byte) sum::b#0 ← (byte) 2
   call sum param-assignment
   (byte) sum::return#0 ← (byte) sum::return#4
   to:@2
-@2: from @BEGIN
-  (byte) sum::return#5 ← phi( @BEGIN/(byte) sum::return#0 )
+@2: from @begin
+  (byte) sum::return#5 ← phi( @begin/(byte) sum::return#0 )
   (byte~) $0 ← (byte) sum::return#5
   (byte) s1#0 ← (byte~) $0
   (byte) sum::a#1 ← (byte) 3
@@ -214,10 +214,10 @@ CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
   (byte~) $3 ← (byte) s1#1 + (byte) s2#1
   (byte~) $4 ← (byte~) $3 + (byte) s3#0
   (byte) s4#0 ← (byte~) $4
-  to:@END
-sum: from @2 @3 @BEGIN
-  (byte) sum::b#3 ← phi( @2/(byte) sum::b#1 @3/(byte) sum::b#2 @BEGIN/(byte) sum::b#0 )
-  (byte) sum::a#3 ← phi( @2/(byte) sum::a#1 @3/(byte) sum::a#2 @BEGIN/(byte) sum::a#0 )
+  to:@end
+sum: from @2 @3 @begin
+  (byte) sum::b#3 ← phi( @2/(byte) sum::b#1 @3/(byte) sum::b#2 @begin/(byte) sum::b#0 )
+  (byte) sum::a#3 ← phi( @2/(byte) sum::a#1 @3/(byte) sum::a#2 @begin/(byte) sum::a#0 )
   (byte~) sum::$0 ← (byte) sum::a#3 + (byte) sum::b#3
   (byte) sum::return#3 ← (byte~) sum::$0
   to:sum::@return
@@ -225,8 +225,8 @@ sum::@return: from sum
   (byte) sum::return#8 ← phi( sum/(byte) sum::return#3 )
   (byte) sum::return#4 ← (byte) sum::return#8
   return 
-  to:@RETURN
-@END: from @4
+  to:@return
+@end: from @4
 
 Constant (byte) sum::a#0 (byte) 1
 Constant (byte) sum::b#0 (byte) 2
@@ -236,12 +236,12 @@ Constant (byte) sum::a#2 (byte) 9
 Constant (byte) sum::b#2 (byte) 13
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call sum param-assignment
   (byte) sum::return#0 ← (byte) sum::return#4
   to:@2
-@2: from @BEGIN
-  (byte) sum::return#5 ← phi( @BEGIN/(byte) sum::return#0 )
+@2: from @begin
+  (byte) sum::return#5 ← phi( @begin/(byte) sum::return#0 )
   (byte~) $0 ← (byte) sum::return#5
   (byte) s1#0 ← (byte~) $0
   call sum param-assignment
@@ -264,10 +264,10 @@ CONTROL FLOW GRAPH
   (byte~) $3 ← (byte) s1#1 + (byte) s2#1
   (byte~) $4 ← (byte~) $3 + (byte) s3#0
   (byte) s4#0 ← (byte~) $4
-  to:@END
-sum: from @2 @3 @BEGIN
-  (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @BEGIN/(byte) 2 )
-  (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @BEGIN/(byte) 1 )
+  to:@end
+sum: from @2 @3 @begin
+  (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @begin/(byte) 2 )
+  (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @begin/(byte) 1 )
   (byte~) sum::$0 ← (byte) sum::a#3 + (byte) sum::b#3
   (byte) sum::return#3 ← (byte~) sum::$0
   to:sum::@return
@@ -275,8 +275,8 @@ sum::@return: from sum
   (byte) sum::return#8 ← phi( sum/(byte) sum::return#3 )
   (byte) sum::return#4 ← (byte) sum::return#8
   return 
-  to:@RETURN
-@END: from @4
+  to:@return
+@end: from @4
 
 Not aliassing across scopes: $0 sum::return#5
 Not aliassing across scopes: $1 sum::return#6
@@ -288,10 +288,10 @@ Alias (byte) s3#0 = (byte~) $2
 Alias (byte) s4#0 = (byte~) $4 
 Succesful SSA optimization Pass2AliasElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call sum param-assignment
   to:@2
-@2: from @BEGIN
+@2: from @begin
   (byte) s1#0 ← (byte) sum::return#0
   call sum param-assignment
   to:@3
@@ -303,27 +303,27 @@ CONTROL FLOW GRAPH
   (byte) s3#0 ← (byte) sum::return#0
   (byte~) $3 ← (byte) s1#0 + (byte) s2#0
   (byte) s4#0 ← (byte~) $3 + (byte) s3#0
-  to:@END
-sum: from @2 @3 @BEGIN
-  (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @BEGIN/(byte) 2 )
-  (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @BEGIN/(byte) 1 )
+  to:@end
+sum: from @2 @3 @begin
+  (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @begin/(byte) 2 )
+  (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @begin/(byte) 1 )
   (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3
   to:sum::@return
 sum::@return: from sum
   return 
-  to:@RETURN
-@END: from @4
+  to:@return
+@end: from @4
 
 Not aliassing across scopes: s1#0 sum::return#0
 Not aliassing across scopes: s2#0 sum::return#0
 Not aliassing across scopes: s3#0 sum::return#0
-Block Sequence Planned @BEGIN @2 @3 @4 @END sum sum::@return 
-Block Sequence Planned @BEGIN @2 @3 @4 @END sum sum::@return 
+Block Sequence Planned @begin @2 @3 @4 @end sum sum::@return 
+Block Sequence Planned @begin @2 @3 @4 @end sum sum::@return 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   call sum param-assignment
   to:@2
-@2: from @BEGIN
+@2: from @begin
   (byte) s1#0 ← (byte) sum::return#0
   call sum param-assignment
   to:@3
@@ -335,16 +335,16 @@ CONTROL FLOW GRAPH - PHI LIFTED
   (byte) s3#0 ← (byte) sum::return#0
   (byte~) $3 ← (byte) s1#0 + (byte) s2#0
   (byte) s4#0 ← (byte~) $3 + (byte) s3#0
-  to:@END
-@END: from @4
-sum: from @2 @3 @BEGIN
-  (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @BEGIN/(byte) 2 )
-  (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @BEGIN/(byte) 1 )
+  to:@end
+@end: from @4
+sum: from @2 @3 @begin
+  (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @begin/(byte) 2 )
+  (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @begin/(byte) 1 )
   (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3
   to:sum::@return
 sum::@return: from sum
   return 
-  to:@RETURN
+  to:@return
 
 Adding empty live range for unused variable s4#0
 Propagating live ranges...
@@ -362,10 +362,10 @@ Propagated s1#0 through call [4] call sum param-assignment
 Propagated s2#0 through call [4] call sum param-assignment
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   [0] call sum param-assignment [ sum::return#0 ]
   to:@2
-@2: from @BEGIN
+@2: from @begin
   [1] (byte) s1#0 ← (byte) sum::return#0 [ s1#0 ]
   [2] call sum param-assignment [ sum::return#0 s1#0 ]
   to:@3
@@ -377,20 +377,20 @@ CONTROL FLOW GRAPH - LIVE RANGES
   [5] (byte) s3#0 ← (byte) sum::return#0 [ s1#0 s2#0 s3#0 ]
   [6] (byte~) $3 ← (byte) s1#0 + (byte) s2#0 [ $3 s3#0 ]
   [7] (byte) s4#0 ← (byte~) $3 + (byte) s3#0 [ ]
-  to:@END
-@END: from @4
-sum: from @2 @3 @BEGIN
-  [8] (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @BEGIN/(byte) 2 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
-  [8] (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @BEGIN/(byte) 1 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
+  to:@end
+@end: from @4
+sum: from @2 @3 @begin
+  [8] (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @begin/(byte) 2 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
+  [8] (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @begin/(byte) 1 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
   [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ]
   to:sum::@return
 sum::@return: from sum
   [10] return  [ sum::return#0 s1#0 s2#0 ]
-  to:@RETURN
+  to:@return
 
 Created 2 initial phi equivalence classes
 Coalesced down to 2 phi equivalence classes
-Block Sequence Planned @BEGIN @2 @3 @4 @END sum sum::@return 
+Block Sequence Planned @begin @2 @3 @4 @end sum sum::@return 
 Adding empty live range for unused variable s4#0
 Propagating live ranges...
 Propagating live ranges...
@@ -407,10 +407,10 @@ Propagated s1#0 through call [4] call sum param-assignment
 Propagated s2#0 through call [4] call sum param-assignment
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   [0] call sum param-assignment [ sum::return#0 ]
   to:@2
-@2: from @BEGIN
+@2: from @begin
   [1] (byte) s1#0 ← (byte) sum::return#0 [ s1#0 ]
   [2] call sum param-assignment [ sum::return#0 s1#0 ]
   to:@3
@@ -422,28 +422,28 @@ CONTROL FLOW GRAPH - PHI MEM COALESCED
   [5] (byte) s3#0 ← (byte) sum::return#0 [ s1#0 s2#0 s3#0 ]
   [6] (byte~) $3 ← (byte) s1#0 + (byte) s2#0 [ $3 s3#0 ]
   [7] (byte) s4#0 ← (byte~) $3 + (byte) s3#0 [ ]
-  to:@END
-@END: from @4
-sum: from @2 @3 @BEGIN
-  [8] (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @BEGIN/(byte) 2 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
-  [8] (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @BEGIN/(byte) 1 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
+  to:@end
+@end: from @4
+sum: from @2 @3 @begin
+  [8] (byte) sum::b#3 ← phi( @2/(byte) 4 @3/(byte) 13 @begin/(byte) 2 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
+  [8] (byte) sum::a#3 ← phi( @2/(byte) 3 @3/(byte) 9 @begin/(byte) 1 ) [ s1#0 s2#0 sum::a#3 sum::b#3 ]
   [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ]
   to:sum::@return
 sum::@return: from sum
   [10] return  [ sum::return#0 s1#0 s2#0 ]
-  to:@RETURN
+  to:@return
 
 CALL GRAPH
 Calls in [] to 0:sum 2:sum 4:sum 
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@2 dominated by  @BEGIN @2 
-@3 dominated by  @BEGIN @2 @3 
-@4 dominated by  @BEGIN @2 @3 @4 
-@END dominated by  @BEGIN @2 @3 @4 @END 
-sum dominated by  @BEGIN sum 
-sum::@return dominated by  @BEGIN sum::@return sum 
+@begin dominated by  @begin 
+@2 dominated by  @2 @begin 
+@3 dominated by  @2 @3 @begin 
+@4 dominated by  @2 @3 @4 @begin 
+@end dominated by  @2 @3 @4 @end @begin 
+sum dominated by  @begin sum 
+sum::@return dominated by  @begin sum::@return sum 
 
 NATURAL LOOPS
 
@@ -497,11 +497,11 @@ Allocated zp byte:7 to zp byte:7 [ $3 ]
 Allocated zp byte:8 to zp byte:8 [ s4#0 ]
 Allocated zp byte:9 to zp byte:9 [ sum::return#0 ]
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call sum param-assignment [ sum::return#0 ]
-//SEG2 [8] phi from @BEGIN to sum
-sum_from_BBEGIN:
+//SEG2 [8] phi from @begin to sum
+sum_from_bbegin:
 //SEG3 [8] phi (byte) sum::b#3 = (byte) 2 -- zpby1=coby1 
   lda #$2
   sta $3
@@ -509,15 +509,15 @@ sum_from_BBEGIN:
   lda #$1
   sta $2
   jsr sum
-  jmp B2
+  jmp b2
 //SEG5 @2
-B2:
+b2:
 //SEG6 [1] (byte) s1#0 ← (byte) sum::return#0 [ s1#0 ] -- zpby1=zpby2 
   lda $9
   sta $4
 //SEG7 [2] call sum param-assignment [ sum::return#0 s1#0 ]
 //SEG8 [8] phi from @2 to sum
-sum_from_B2:
+sum_from_b2:
 //SEG9 [8] phi (byte) sum::b#3 = (byte) 4 -- zpby1=coby1 
   lda #$4
   sta $3
@@ -525,15 +525,15 @@ sum_from_B2:
   lda #$3
   sta $2
   jsr sum
-  jmp B3
+  jmp b3
 //SEG11 @3
-B3:
+b3:
 //SEG12 [3] (byte) s2#0 ← (byte) sum::return#0 [ s1#0 s2#0 ] -- zpby1=zpby2 
   lda $9
   sta $5
 //SEG13 [4] call sum param-assignment [ sum::return#0 s1#0 s2#0 ]
 //SEG14 [8] phi from @3 to sum
-sum_from_B3:
+sum_from_b3:
 //SEG15 [8] phi (byte) sum::b#3 = (byte) 13 -- zpby1=coby1 
   lda #$d
   sta $3
@@ -541,9 +541,9 @@ sum_from_B3:
   lda #$9
   sta $2
   jsr sum
-  jmp B4
+  jmp b4
 //SEG17 @4
-B4:
+b4:
 //SEG18 [5] (byte) s3#0 ← (byte) sum::return#0 [ s1#0 s2#0 s3#0 ] -- zpby1=zpby2 
   lda $9
   sta $6
@@ -557,21 +557,22 @@ B4:
   clc
   adc $6
   sta $8
-  jmp BEND
-//SEG21 @END
-BEND:
+  jmp bend
+//SEG21 @end
+bend:
 //SEG22 sum
-sum:
-//SEG23 [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ] -- zpby1=zpby2_plus_zpby3 
-  lda $2
-  clc
-  adc $3
-  sta $9
-  jmp sum__Breturn
-//SEG24 sum::@return
-sum__Breturn:
-//SEG25 [10] return  [ sum::return#0 s1#0 s2#0 ]
-  rts
+sum: {
+  //SEG23 [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ] -- zpby1=zpby2_plus_zpby3 
+    lda $2
+    clc
+    adc $3
+    sta $9
+    jmp breturn
+  //SEG24 sum::@return
+  breturn:
+  //SEG25 [10] return  [ sum::return#0 s1#0 s2#0 ]
+    rts
+}
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Potential registers zp byte:2 [ sum::a#3 ] : zp byte:2 , reg byte a , reg byte x , reg byte y , 
@@ -591,49 +592,49 @@ Uplifting [] best 107 combination reg byte a [ s4#0 ] reg byte a [ $3 ] zp byte:
 Uplifting [sum] best 79 combination reg byte y [ sum::a#3 ] reg byte a [ sum::b#3 ] reg byte a [ sum::return#0 ] 
 Re-allocated ZP register from zp byte:4 to zp byte:2
 Re-allocated ZP register from zp byte:6 to zp byte:3
-Removing instruction jmp B2
-Removing instruction jmp B3
-Removing instruction jmp B4
-Removing instruction jmp BEND
-Removing instruction jmp sum__Breturn
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp bend
+Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call sum param-assignment [ sum::return#0 ]
-//SEG2 [8] phi from @BEGIN to sum
-sum_from_BBEGIN:
+//SEG2 [8] phi from @begin to sum
+sum_from_bbegin:
 //SEG3 [8] phi (byte) sum::b#3 = (byte) 2 -- aby=coby1 
   lda #$2
 //SEG4 [8] phi (byte) sum::a#3 = (byte) 1 -- yby=coby1 
   ldy #$1
   jsr sum
 //SEG5 @2
-B2:
+b2:
 //SEG6 [1] (byte) s1#0 ← (byte) sum::return#0 [ s1#0 ] -- zpby1=aby 
   sta $2
 //SEG7 [2] call sum param-assignment [ sum::return#0 s1#0 ]
 //SEG8 [8] phi from @2 to sum
-sum_from_B2:
+sum_from_b2:
 //SEG9 [8] phi (byte) sum::b#3 = (byte) 4 -- aby=coby1 
   lda #$4
 //SEG10 [8] phi (byte) sum::a#3 = (byte) 3 -- yby=coby1 
   ldy #$3
   jsr sum
 //SEG11 @3
-B3:
+b3:
 //SEG12 [3] (byte) s2#0 ← (byte) sum::return#0 [ s1#0 s2#0 ] -- xby=aby 
   tax
 //SEG13 [4] call sum param-assignment [ sum::return#0 s1#0 s2#0 ]
 //SEG14 [8] phi from @3 to sum
-sum_from_B3:
+sum_from_b3:
 //SEG15 [8] phi (byte) sum::b#3 = (byte) 13 -- aby=coby1 
   lda #$d
 //SEG16 [8] phi (byte) sum::a#3 = (byte) 9 -- yby=coby1 
   ldy #$9
   jsr sum
 //SEG17 @4
-B4:
+b4:
 //SEG18 [5] (byte) s3#0 ← (byte) sum::return#0 [ s1#0 s2#0 s3#0 ] -- zpby1=aby 
   sta $3
 //SEG19 [6] (byte~) $3 ← (byte) s1#0 + (byte) s2#0 [ $3 s3#0 ] -- aby=zpby1_plus_xby 
@@ -643,26 +644,27 @@ B4:
 //SEG20 [7] (byte) s4#0 ← (byte~) $3 + (byte) s3#0 [ ] -- aby=aby_plus_zpby1 
   clc
   adc $3
-//SEG21 @END
-BEND:
+//SEG21 @end
+bend:
 //SEG22 sum
-sum:
-//SEG23 [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ] -- aby=yby_plus_aby 
-  sty $ff
-  clc
-  adc $ff
-//SEG24 sum::@return
-sum__Breturn:
-//SEG25 [10] return  [ sum::return#0 s1#0 s2#0 ]
-  rts
+sum: {
+  //SEG23 [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ] -- aby=yby_plus_aby 
+    sty $ff
+    clc
+    adc $ff
+  //SEG24 sum::@return
+  breturn:
+  //SEG25 [10] return  [ sum::return#0 s1#0 s2#0 ]
+    rts
+}
 
 FINAL SYMBOL TABLE
 (byte~) $3 reg byte a 4.0
 (label) @2
 (label) @3
 (label) @4
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte) s1
 (byte) s1#0 zp byte:2 0.5
 (byte) s2
@@ -690,42 +692,42 @@ reg byte a [ s4#0 ]
 reg byte a [ sum::return#0 ]
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call sum param-assignment [ sum::return#0 ]
-//SEG2 [8] phi from @BEGIN to sum
-sum_from_BBEGIN:
+//SEG2 [8] phi from @begin to sum
+sum_from_bbegin:
 //SEG3 [8] phi (byte) sum::b#3 = (byte) 2 -- aby=coby1 
   lda #$2
 //SEG4 [8] phi (byte) sum::a#3 = (byte) 1 -- yby=coby1 
   ldy #$1
   jsr sum
 //SEG5 @2
-B2:
+b2:
 //SEG6 [1] (byte) s1#0 ← (byte) sum::return#0 [ s1#0 ] -- zpby1=aby 
   sta $2
 //SEG7 [2] call sum param-assignment [ sum::return#0 s1#0 ]
 //SEG8 [8] phi from @2 to sum
-sum_from_B2:
+sum_from_b2:
 //SEG9 [8] phi (byte) sum::b#3 = (byte) 4 -- aby=coby1 
   lda #$4
 //SEG10 [8] phi (byte) sum::a#3 = (byte) 3 -- yby=coby1 
   ldy #$3
   jsr sum
 //SEG11 @3
-B3:
+b3:
 //SEG12 [3] (byte) s2#0 ← (byte) sum::return#0 [ s1#0 s2#0 ] -- xby=aby 
   tax
 //SEG13 [4] call sum param-assignment [ sum::return#0 s1#0 s2#0 ]
 //SEG14 [8] phi from @3 to sum
-sum_from_B3:
+sum_from_b3:
 //SEG15 [8] phi (byte) sum::b#3 = (byte) 13 -- aby=coby1 
   lda #$d
 //SEG16 [8] phi (byte) sum::a#3 = (byte) 9 -- yby=coby1 
   ldy #$9
   jsr sum
 //SEG17 @4
-B4:
+b4:
 //SEG18 [5] (byte) s3#0 ← (byte) sum::return#0 [ s1#0 s2#0 s3#0 ] -- zpby1=aby 
   sta $3
 //SEG19 [6] (byte~) $3 ← (byte) s1#0 + (byte) s2#0 [ $3 s3#0 ] -- aby=zpby1_plus_xby 
@@ -735,16 +737,17 @@ B4:
 //SEG20 [7] (byte) s4#0 ← (byte~) $3 + (byte) s3#0 [ ] -- aby=aby_plus_zpby1 
   clc
   adc $3
-//SEG21 @END
-BEND:
+//SEG21 @end
+bend:
 //SEG22 sum
-sum:
-//SEG23 [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ] -- aby=yby_plus_aby 
-  sty $ff
-  clc
-  adc $ff
-//SEG24 sum::@return
-sum__Breturn:
-//SEG25 [10] return  [ sum::return#0 s1#0 s2#0 ]
-  rts
+sum: {
+  //SEG23 [9] (byte) sum::return#0 ← (byte) sum::a#3 + (byte) sum::b#3 [ sum::return#0 s1#0 s2#0 ] -- aby=yby_plus_aby 
+    sty $ff
+    clc
+    adc $ff
+  //SEG24 sum::@return
+  breturn:
+  //SEG25 [10] return  [ sum::return#0 s1#0 s2#0 ]
+    rts
+}
 

src/main/java/dk/camelot64/kickc/test/ref/summin.sym

@@ -2,8 +2,8 @@
 (label) @2
 (label) @3
 (label) @4
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte) s1
 (byte) s1#0 zp byte:2 0.5
 (byte) s2

src/main/java/dk/camelot64/kickc/test/ref/useglobal.asm

@@ -1,8 +1,9 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-  lda #$1
-  sta $400
-main__Breturn:
-  rts
+bend:
+main: {
+    lda #$1
+    sta $400
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/useglobal.cfg

@@ -1,10 +1,10 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] *((word) 1024) ← (byte) 1 [ ]
   to:main::@return
 main::@return: from main
   [2] return  [ ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/useglobal.log

@@ -20,7 +20,7 @@ SYMBOLS
 (label) main::@return
 
 INITIAL CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte*) SCREEN ← (word) 1024
   (void~) $0 ← call main 
   to:@1
@@ -29,171 +29,171 @@ main: from
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@1: from @BEGIN
-  to:@END
-@END: from @1
+  to:@return
+@1: from @begin
+  to:@end
+@end: from @1
 
 Removing empty block @1
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte*) SCREEN ← (word) 1024
   (void~) $0 ← call main 
-  to:@END
+  to:@end
 main: from
   *((byte*) SCREEN) ← (byte) 1
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 PROCEDURE MODIFY VARIABLE ANALYSIS
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL
-@BEGIN: from
+@begin: from
   (byte*) SCREEN ← (word) 1024
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
+@2: from @begin
+  to:@end
+main: from @begin
   *((byte*) SCREEN) ← (byte) 1
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 Completing Phi functions...
 CONTROL FLOW GRAPH SSA
-@BEGIN: from
+@begin: from
   (byte*) SCREEN#0 ← (word) 1024
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
-  (byte*) SCREEN#1 ← phi( @BEGIN/(byte*) SCREEN#0 )
+@2: from @begin
+  to:@end
+main: from @begin
+  (byte*) SCREEN#1 ← phi( @begin/(byte*) SCREEN#0 )
   *((byte*) SCREEN#1) ← (byte) 1
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 CONTROL FLOW GRAPH WITH ASSIGNMENT CALL & RETURN
-@BEGIN: from
+@begin: from
   (byte*) SCREEN#0 ← (word) 1024
   call main param-assignment
   to:@2
-@2: from @BEGIN
-  to:@END
-main: from @BEGIN
-  (byte*) SCREEN#1 ← phi( @BEGIN/(byte*) SCREEN#0 )
+@2: from @begin
+  to:@end
+main: from @begin
+  (byte*) SCREEN#1 ← phi( @begin/(byte*) SCREEN#0 )
   *((byte*) SCREEN#1) ← (byte) 1
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@END: from @2
+  to:@return
+@end: from @2
 
 Culled Empty Block (label) @2
 Succesful SSA optimization Pass2CullEmptyBlocks
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   (byte*) SCREEN#0 ← (word) 1024
   call main param-assignment
-  to:@END
-main: from @BEGIN
-  (byte*) SCREEN#1 ← phi( @BEGIN/(byte*) SCREEN#0 )
+  to:@end
+main: from @begin
+  (byte*) SCREEN#1 ← phi( @begin/(byte*) SCREEN#0 )
   *((byte*) SCREEN#1) ← (byte) 1
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Constant (byte*) SCREEN#0 (word) 1024
 Succesful SSA optimization Pass2ConstantPropagation
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
-  (byte*) SCREEN#1 ← phi( @BEGIN/(word) 1024 )
+  to:@end
+main: from @begin
+  (byte*) SCREEN#1 ← phi( @begin/(word) 1024 )
   *((byte*) SCREEN#1) ← (byte) 1
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
 Redundant Phi (byte*) SCREEN#1 (word) 1024
 Succesful SSA optimization Pass2RedundantPhiElimination
 CONTROL FLOW GRAPH
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-main: from @BEGIN
+  to:@end
+main: from @begin
   *((word) 1024) ← (byte) 1
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
-@END: from @BEGIN
+  to:@return
+@end: from @begin
 
-Block Sequence Planned @BEGIN @END main main::@return 
-Block Sequence Planned @BEGIN @END main main::@return 
+Block Sequence Planned @begin @end main main::@return 
+Block Sequence Planned @begin @end main main::@return 
 CONTROL FLOW GRAPH - PHI LIFTED
-@BEGIN: from
+@begin: from
   call main param-assignment
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   *((word) 1024) ← (byte) 1
   to:main::@return
 main::@return: from main
   return 
-  to:@RETURN
+  to:@return
 
 Propagating live ranges...
 CONTROL FLOW GRAPH - LIVE RANGES
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] *((word) 1024) ← (byte) 1 [ ]
   to:main::@return
 main::@return: from main
   [2] return  [ ]
-  to:@RETURN
+  to:@return
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
-Block Sequence Planned @BEGIN @END main main::@return 
+Block Sequence Planned @begin @end main main::@return 
 Propagating live ranges...
 CONTROL FLOW GRAPH - PHI MEM COALESCED
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] *((word) 1024) ← (byte) 1 [ ]
   to:main::@return
 main::@return: from main
   [2] return  [ ]
-  to:@RETURN
+  to:@return
 
 CALL GRAPH
 Calls in [] to 0:main 
 
 DOMINATORS
-@BEGIN dominated by  @BEGIN 
-@END dominated by  @BEGIN @END 
-main dominated by  @BEGIN main 
-main::@return dominated by  @BEGIN main::@return main 
+@begin dominated by  @begin 
+@end dominated by  @end @begin 
+main dominated by  @begin main 
+main::@return dominated by  main::@return @begin main 
 
 NATURAL LOOPS
 
@@ -209,23 +209,24 @@ VARIABLE REGISTER WEIGHTS
 Initial phi equivalence classes
 Complete equivalence classes
 INITIAL ASM
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-  jmp BEND
-//SEG2 @END
-BEND:
+  jmp bend
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] *((word) 1024) ← (byte) 1 [ ] -- _star_cowo1=coby2 
-  lda #$1
-  sta $400
-  jmp main__Breturn
-//SEG5 main::@return
-main__Breturn:
-//SEG6 [2] return  [ ]
-  rts
+main: {
+  //SEG4 [1] *((word) 1024) ← (byte) 1 [ ] -- _star_cowo1=coby2 
+    lda #$1
+    sta $400
+    jmp breturn
+  //SEG5 main::@return
+  breturn:
+  //SEG6 [2] return  [ ]
+    rts
+}
 
 Statement [1] *((word) 1024) ← (byte) 1 [ ] always clobbers reg byte a 
 Statement [1] *((word) 1024) ← (byte) 1 [ ] always clobbers reg byte a 
@@ -237,48 +238,50 @@ Uplift Scope []
 
 Uplifting [main] best 24 combination 
 Uplifting [] best 24 combination 
-Removing instruction jmp BEND
-Removing instruction jmp main__Breturn
+Removing instruction jmp bend
+Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 ASSEMBLER
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] *((word) 1024) ← (byte) 1 [ ] -- _star_cowo1=coby2 
-  lda #$1
-  sta $400
-//SEG5 main::@return
-main__Breturn:
-//SEG6 [2] return  [ ]
-  rts
+main: {
+  //SEG4 [1] *((word) 1024) ← (byte) 1 [ ] -- _star_cowo1=coby2 
+    lda #$1
+    sta $400
+  //SEG5 main::@return
+  breturn:
+  //SEG6 [2] return  [ ]
+    rts
+}
 
 FINAL SYMBOL TABLE
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte*) SCREEN
 (void()) main()
 (label) main::@return
 
 
 FINAL CODE
-//SEG0 @BEGIN
-BBEGIN:
+//SEG0 @begin
+bbegin:
 //SEG1 [0] call main param-assignment [ ]
   jsr main
-//SEG2 @END
-BEND:
+//SEG2 @end
+bend:
 //SEG3 main
-main:
-//SEG4 [1] *((word) 1024) ← (byte) 1 [ ] -- _star_cowo1=coby2 
-  lda #$1
-  sta $400
-//SEG5 main::@return
-main__Breturn:
-//SEG6 [2] return  [ ]
-  rts
+main: {
+  //SEG4 [1] *((word) 1024) ← (byte) 1 [ ] -- _star_cowo1=coby2 
+    lda #$1
+    sta $400
+  //SEG5 main::@return
+  breturn:
+  //SEG6 [2] return  [ ]
+    rts
+}
 

src/main/java/dk/camelot64/kickc/test/ref/useglobal.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte*) SCREEN
 (void()) main()
 (label) main::@return

src/main/java/dk/camelot64/kickc/test/ref/voronoi.asm

@@ -1,101 +1,103 @@
-BBEGIN:
+bbegin:
   jsr main
-BEND:
-main:
-addpoint_from_main:
-  lda #$1
-  sta $2
-  ldy #$5
-  lda #$0
-  sta $8
-  lda #$5
-  jsr addpoint
-main__B3:
-addpoint_from_B3:
-  lda #$2
-  sta $2
-  ldy #$8
-  lda #$f
-  jsr addpoint
-main__B4:
-addpoint_from_B4:
-  lda #$3
-  sta $2
-  ldy #$e
-  lda #$6
-  jsr addpoint
-main__B5:
-addpoint_from_B5:
-  lda #$4
-  sta $2
-  ldy #$2
-  lda #$22
-  jsr addpoint
-main__B6:
-addpoint_from_B6:
-  lda #$5
-  sta $2
-  ldy #$11
-  lda #$15
-  jsr addpoint
-main__B7:
-addpoint_from_B7:
-  lda #$7
-  sta $2
-  ldy #$16
-  lda #$1f
-  jsr addpoint
-main__B8:
-  jsr initscreen
-main__B1:
-  jsr render
-main__B10:
-  jsr animate
-main__B11:
-  jmp main__B1
-main__Breturn:
-  rts
-animate:
-  lda $1000
-  clc
-  adc #$1
-  sta $1000
-  lda $1000
-  cmp #$28
-  beq animate__B1
-animate__B2:
-  lda $1100
-  clc
-  adc #$1
-  sta $1100
-  lda $1100
-  cmp #$19
-  beq animate__B3
-animate__B4:
-  ldx $1001
-  dex
-  stx $1001
-  lda $1001
-  cmp #$ff
-  beq animate__B5
-animate__B6:
-  lda $1102
-  clc
-  adc #$1
-  sta $1102
-  lda $1102
-  cmp #$19
-  beq animate__B7
-animate__B8:
-  ldx $1103
-  dex
-  stx $1103
-  lda $1103
-  cmp #$ff
-  beq animate__B9
-animate__Breturn:
-  rts
-animate__B9:
+bend:
+main: {
+  addpoint_from_main:
+    lda #$1
+    sta $2
+    ldy #$5
+    lda #$0
+    sta $8
+    lda #$5
+    jsr addpoint
+  b3:
+  addpoint_from_b3:
+    lda #$2
+    sta $2
+    ldy #$8
+    lda #$f
+    jsr addpoint
+  b4:
+  addpoint_from_b4:
+    lda #$3
+    sta $2
+    ldy #$e
+    lda #$6
+    jsr addpoint
+  b5:
+  addpoint_from_b5:
+    lda #$4
+    sta $2
+    ldy #$2
+    lda #$22
+    jsr addpoint
+  b6:
+  addpoint_from_b6:
+    lda #$5
+    sta $2
+    ldy #$11
+    lda #$15
+    jsr addpoint
+  b7:
+  addpoint_from_b7:
+    lda #$7
+    sta $2
+    ldy #$16
+    lda #$1f
+    jsr addpoint
+  b8:
+    jsr initscreen
+  b1:
+    jsr render
+  b10:
+    jsr animate
+  b11:
+    jmp b1
+  breturn:
+    rts
+}
+animate: {
+    lda $1000
+    clc
+    adc #$1
+    sta $1000
+    lda $1000
+    cmp #$28
+    beq b1
+  b2:
+    lda $1100
+    clc
+    adc #$1
+    sta $1100
+    lda $1100
+    cmp #$19
+    beq b3
+  b4:
+    ldx $1001
+    dex
+    stx $1001
+    lda $1001
+    cmp #$ff
+    beq b5
+  b6:
+    lda $1102
+    clc
+    adc #$1
+    sta $1102
+    lda $1102
+    cmp #$19
+    beq b7
+  b8:
+    ldx $1103
+    dex
+    stx $1103
+    lda $1103
+    cmp #$ff
+    beq b9
+  breturn:
+    rts
+}
+b9:
   lda #$19
   sta $1103
   lda $1003
@@ -104,181 +106,185 @@ animate__B9:
   sta $1003
   lda $1003
   cmp #$28
-  bcs animate__B11
-  jmp animate__Breturn
-animate__B11:
+  bcs b11
+  jmp breturn
+b11:
   lda $1003
   sec
   sbc #$28
   sta $1003
-  jmp animate__Breturn
-animate__B7:
+  jmp breturn
+b7:
   lda #$0
   sta $1102
-  jmp animate__B8
-animate__B5:
+  jmp b8
+b5:
   lda #$28
   sta $1001
-  jmp animate__B6
-animate__B3:
+  jmp b6
+b3:
   lda #$0
   sta $1100
-  jmp animate__B4
-animate__B1:
+  jmp b4
+b1:
   lda #$0
   sta $1000
-  jmp animate__B2
-render:
-render__B1_from_render:
-  lda #<$d800
-  sta $3
-  lda #>$d800
-  sta $3+$1
-  lda #$0
-  sta $2
-render__B1_from_B3:
-render__B1:
-render__B2_from_B1:
-  lda #$0
-  sta $5
-render__B2_from_B5:
-render__B2:
-  lda $5
-  sta $9
-  lda $2
-  sta $a
-  jsr findcol
-render__B5:
-  tya
-  ldy $5
-  sta ($3),y
-  inc $5
-  lda $5
-  cmp #$28
-  bcc render__B2_from_B5
-render__B3:
-  lda $3
-  clc
-  adc #$28
-  sta $3
-  bcc !+
-  inc $3+$1
-!:
-  inc $2
-  lda $2
-  cmp #$19
-  bcc render__B1_from_B3
-render__Breturn:
-  rts
-findcol:
-findcol__B1_from_findcol:
-  ldy #$0
-  lda #$ff
-  sta $6
-  ldx #$0
-findcol__B1_from_B13:
-findcol__B1:
-  lda $1000,x
-  sta $7
-  lda $1100,x
-  sta $b
-  lda $9
-  cmp $7
-  beq findcol__B2
-findcol__B3:
-  lda $9
-  cmp $7
-  bcc findcol__B6
-findcol__B7:
-  lda $9
-  sec
-  sbc $7
-  sta $7
-findcol__B8_from_B7:
-findcol__B8:
-  lda $a
-  cmp $b
-  bcc findcol__B9
-findcol__B10:
-  lda $a
-  sec
-  sbc $b
-  clc
-  adc $7
-findcol__B11_from_B10:
-findcol__B11:
-  cmp $6
-  bcc findcol__B12
-findcol__B13_from_B11:
-findcol__B13:
-  inx
-  cpx $8
-  bcc findcol__B1_from_B13
-findcol__Breturn_from_B13:
-  jmp findcol__Breturn
-findcol__Breturn_from_B2:
-  ldy #$0
-findcol__Breturn:
-  rts
-findcol__B12:
+  jmp b2
+render: {
+  b1_from_render:
+    lda #<$d800
+    sta $3
+    lda #>$d800
+    sta $3+$1
+    lda #$0
+    sta $2
+  b1_from_b3:
+  b1:
+  b2_from_b1:
+    lda #$0
+    sta $5
+  b2_from_b5:
+  b2:
+    lda $5
+    sta $9
+    lda $2
+    sta $a
+    jsr findcol
+  b5:
+    tya
+    ldy $5
+    sta ($3),y
+    inc $5
+    lda $5
+    cmp #$28
+    bcc b2_from_b5
+  b3:
+    lda $3
+    clc
+    adc #$28
+    sta $3
+    bcc !+
+    inc $3+$1
+  !:
+    inc $2
+    lda $2
+    cmp #$19
+    bcc b1_from_b3
+  breturn:
+    rts
+}
+findcol: {
+  b1_from_findcol:
+    ldy #$0
+    lda #$ff
+    sta $6
+    ldx #$0
+  b1_from_b13:
+  b1:
+    lda $1000,x
+    sta $7
+    lda $1100,x
+    sta $b
+    lda $9
+    cmp $7
+    beq b2
+  b3:
+    lda $9
+    cmp $7
+    bcc b6
+  b7:
+    lda $9
+    sec
+    sbc $7
+    sta $7
+  b8_from_b7:
+  b8:
+    lda $a
+    cmp $b
+    bcc b9
+  b10:
+    lda $a
+    sec
+    sbc $b
+    clc
+    adc $7
+  b11_from_b10:
+  b11:
+    cmp $6
+    bcc b12
+  b13_from_b11:
+  b13:
+    inx
+    cpx $8
+    bcc b1_from_b13
+  breturn_from_b13:
+    jmp breturn
+  breturn_from_b2:
+    ldy #$0
+  breturn:
+    rts
+}
+b12:
   ldy $1200,x
   sta $6
-findcol__B13_from_B12:
-  jmp findcol__B13
-findcol__B9:
+b13_from_b12:
+  jmp b13
+b9:
   lda $b
   sec
   sbc $a
   clc
   adc $7
-findcol__B11_from_B9:
-  jmp findcol__B11
-findcol__B6:
+b11_from_b9:
+  jmp b11
+b6:
   lda $7
   sec
   sbc $9
   sta $7
-findcol__B8_from_B6:
-  jmp findcol__B8
-findcol__B2:
+b8_from_b6:
+  jmp b8
+b2:
   lda $a
   cmp $b
-  beq findcol__Breturn_from_B2
-  jmp findcol__B3
-initscreen:
-initscreen__B1_from_initscreen:
-  lda #<$400
-  sta $3
-  lda #>$400
-  sta $3+$1
-initscreen__B1_from_B1:
-initscreen__B1:
-  ldy #$0
-  lda #$e6
-  sta ($3),y
-  inc $3
-  bne !+
-  inc $3+$1
-!:
-  lda $3+$1
-  cmp #>$7e8
-  bcc initscreen__B1_from_B1
-  bne !+
-  lda $3
-  cmp #<$7e8
-  bcc initscreen__B1_from_B1
-!:
-initscreen__Breturn:
-  rts
-addpoint:
-  ldx $8
-  sta $1000,x
-  tya
-  ldy $8
-  sta $1100,y
-  lda $2
-  ldx $8
-  sta $1200,x
-  inc $8
-addpoint__Breturn:
-  rts
+  beq breturn_from_b2
+  jmp b3
+initscreen: {
+  b1_from_initscreen:
+    lda #<$400
+    sta $3
+    lda #>$400
+    sta $3+$1
+  b1_from_b1:
+  b1:
+    ldy #$0
+    lda #$e6
+    sta ($3),y
+    inc $3
+    bne !+
+    inc $3+$1
+  !:
+    lda $3+$1
+    cmp #>$7e8
+    bcc b1_from_b1
+    bne !+
+    lda $3
+    cmp #<$7e8
+    bcc b1_from_b1
+  !:
+  breturn:
+    rts
+}
+addpoint: {
+    ldx $8
+    sta $1000,x
+    tya
+    ldy $8
+    sta $1100,y
+    lda $2
+    ldx $8
+    sta $1200,x
+    inc $8
+  breturn:
+    rts
+}

src/main/java/dk/camelot64/kickc/test/ref/voronoi.cfg

@@ -1,8 +1,8 @@
-@BEGIN: from
+@begin: from
   [0] call main param-assignment [ ]
-  to:@END
-@END: from @BEGIN
-main: from @BEGIN
+  to:@end
+@end: from @begin
+main: from @begin
   [1] call addpoint param-assignment [ ]
   to:main::@3
 main::@3: from main
@@ -34,7 +34,7 @@ main::@11: from main::@10
   to:main::@return
 main::@return: from main::@11
   [11] return  [ ]
-  to:@RETURN
+  to:@return
 animate: from main::@10
   [12] (byte~) animate::$0 ← * (word) 4096 [ animate::$0 ]
   [13] (byte~) animate::$1 ← (byte~) animate::$0 + (byte) 1 [ animate::$1 ]
@@ -72,7 +72,7 @@ animate::@8: from animate::@6 animate::@7
   to:animate::@return
 animate::@return: from animate::@11 animate::@8 animate::@9
   [37] return  [ ]
-  to:@RETURN
+  to:@return
 animate::@9: from animate::@8
   [38] *((word) 4355) ← (byte) 25 [ ]
   [39] (byte~) animate::$20 ← * (word) 4099 [ animate::$20 ]
@@ -123,7 +123,7 @@ render::@3: from render::@5
   to:render::@return
 render::@return: from render::@3
   [63] return  [ ]
-  to:@RETURN
+  to:@return
 findcol: from render::@2
   to:findcol::@1
 findcol::@1: from findcol findcol::@13
@@ -161,7 +161,7 @@ findcol::@13: from findcol::@11 findcol::@12
 findcol::@return: from findcol::@13 findcol::@2
   [79] (byte) findcol::return#0 ← phi( findcol::@13/(byte) findcol::mincol#2 findcol::@2/(byte) 0 ) [ render::x#2 render::y#2 findcol::return#0 render::colline#2 ]
   [80] return  [ render::x#2 render::y#2 findcol::return#0 render::colline#2 ]
-  to:@RETURN
+  to:@return
 findcol::@12: from findcol::@11
   [81] (byte) findcol::mincol#1 ← (word) 4608 *idx (byte) findcol::i#12 [ render::x#2 render::y#2 render::colline#2 findcol::i#12 findcol::x#0 findcol::y#0 findcol::diff#6 findcol::mincol#1 numpoints#1 ]
   [82] (byte~) findcol::diff#13 ← (byte) findcol::diff#6 [ render::x#2 render::y#2 render::colline#2 findcol::i#12 findcol::x#0 findcol::y#0 findcol::mincol#1 findcol::diff#13 numpoints#1 ]
@@ -186,7 +186,7 @@ initscreen::@1: from initscreen initscreen::@1
   to:initscreen::@return
 initscreen::@return: from initscreen::@1
   [91] return  [ ]
-  to:@RETURN
+  to:@return
 addpoint: from main main::@3 main::@4 main::@5 main::@6 main::@7
   [92] (byte) addpoint::c#6 ← phi( main/(byte) 1 main::@3/(byte) 2 main::@4/(byte) 3 main::@5/(byte) 4 main::@6/(byte) 5 main::@7/(byte) 7 ) [ numpoints#19 addpoint::x#6 addpoint::y#6 addpoint::c#6 ]
   [92] (byte) addpoint::y#6 ← phi( main/(byte) 5 main::@3/(byte) 8 main::@4/(byte) 14 main::@5/(byte) 2 main::@6/(byte) 17 main::@7/(byte) 22 ) [ numpoints#19 addpoint::x#6 addpoint::y#6 addpoint::c#6 ]
@@ -199,4 +199,4 @@ addpoint: from main main::@3 main::@4 main::@5 main::@6 main::@7
   to:addpoint::@return
 addpoint::@return: from addpoint
   [97] return  [ ]
-  to:@RETURN
+  to:@return

src/main/java/dk/camelot64/kickc/test/ref/voronoi.sym

@@ -1,5 +1,5 @@
-(label) @BEGIN
-(label) @END
+(label) @begin
+(label) @end
 (byte*) COLORS
 (byte[256]) COLS
 (byte) FILL