Added MAKEWORD() and MAKELONG(). Removed support for initializer lists for initializing word/dword. #668

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

@@ -2137,3 +2137,429 @@ sta {z1}+3
 NO_SYNTHESIS
 //FRAGMENT vduz1=vwsc1
 NO_SYNTHESIS
+//FRAGMENT vbuz1=_deref_pbuc1_plus_1
+lda {c1}
+inc
+sta {z1}
+//FRAGMENT vwuz1=_word_vbuz2
+lda {z2}
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_rol_2
+lda {z2}
+asl
+sta {z1}
+lda {z2}+1
+rol
+sta {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT vwuz1=vwuz2_plus_vwuz3
+lda {z2}
+clc
+adc {z3}
+sta {z1}
+lda {z2}+1
+adc {z3}+1
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_rol_4
+lda {z2}
+asl
+sta {z1}
+lda {z2}+1
+rol
+sta {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT pbuz1=pbuc1_plus_vwuz2
+lda {z2}
+clc
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+//FRAGMENT 0_neq_vbuz1_then_la1
+lda {z1}
+bne {la1}
+//FRAGMENT pbuz1_derefidx_vbuz2=vbuz3
+lda {z3}
+ldz {z2}
+sta ({z1}),z
+//FRAGMENT pbuz1_derefidx_vbuz2=vbuc1
+lda #{c1}
+ldz {z2}
+sta ({z1}),z
+//FRAGMENT pbuz1=pbuz1_plus_vbuc1
+lda #{c1}
+clc
+adc {z1}
+sta {z1}
+bcc !+
+inc {z1}+1
+!:
+//FRAGMENT pvoz1=pvoc1
+lda #<{c1}
+sta {z1}
+lda #>{c1}
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz1_minus_vbuc1
+sec
+lda {z1}
+sbc #{c1}
+sta {z1}
+lda {z1}+1
+sbc #0
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2_plus_vwuc1
+lda {z2}
+clc
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT pbuz1_neq_pbuz2_then_la1
+lda {z1}+1
+cmp {z2}+1
+bne {la1}
+lda {z1}
+cmp {z2}
+bne {la1}
+//FRAGMENT _deref_pbuz1=_deref_pbuz2
+ldy #0
+lda ({z2}),y
+ldy #0
+sta ({z1}),y
+//FRAGMENT pbuz1=pbuz2_plus_vbuc1
+lda #{c1}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT _deref_pbuz1=vbuz2
+lda {z2}
+ldy #0
+sta ({z1}),y
+//FRAGMENT vbuaa=_deref_pbuc1_plus_1
+lda {c1}
+inc
+//FRAGMENT vbuxx=_deref_pbuc1_plus_1
+ldx {c1}
+inx
+//FRAGMENT vwuz1=_word_vbuxx
+txa
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=_word_vbuyy
+tya
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=_word_vbuzz
+tza
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT 0_neq_vbuaa_then_la1
+cmp #0
+bne {la1}
+//FRAGMENT pbuz1_derefidx_vbuz2=vbuaa
+ldz {z2}
+sta ({z1}),z
+//FRAGMENT pbuz1_derefidx_vbuz2=vbuxx
+txa
+ldz {z2}
+sta ({z1}),z
+//FRAGMENT pbuz1_derefidx_vbuz2=vbuyy
+tya
+ldz {z2}
+sta ({z1}),z
+//FRAGMENT pbuz1_derefidx_vbuz2=vbuzz
+tza
+ldz {z2}
+sta ({z1}),z
+//FRAGMENT _deref_pbuz1=vbuxx
+txa
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=vbuyy
+tya
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=vbuzz
+tza
+ldy #0
+sta ({z1}),y
+//FRAGMENT 0_neq_vbuxx_then_la1
+cpx #0
+bne {la1}
+//FRAGMENT vbuaa=vbuxx
+txa
+//FRAGMENT 0_neq_vbuyy_then_la1
+cpy #0
+bne {la1}
+//FRAGMENT vbuaa=vbuyy
+tya
+//FRAGMENT 0_neq_vbuzz_then_la1
+cpz #0
+bne {la1}
+//FRAGMENT vbuaa=vbuzz
+tza
+//FRAGMENT vbuyy=_deref_pbuc1_plus_1
+ldy {c1}
+iny
+//FRAGMENT vbuxx=vbuyy
+tya
+tax
+//FRAGMENT vbuzz=_deref_pbuc1_plus_1
+lda {c1}
+inc
+taz
+//FRAGMENT vbuxx=vbuzz
+tza
+tax
+//FRAGMENT vwuz1=vwuz2_plus_vwuz1
+clc
+lda {z1}
+adc {z2}
+sta {z1}
+lda {z1}+1
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pbuz1=pbuc1_plus_vwuz1
+lda {z1}
+clc
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz1_rol_4
+asw {z1}
+asw {z1}
+asw {z1}
+asw {z1}
+//FRAGMENT pwuz1=pbuc1
+lda #<{c1}
+sta {z1}
+lda #>{c1}
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz1_plus_vwuc1
+lda {z1}
+clc
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT pbuz1_derefidx_vbuz2=pbuz3_derefidx_vbuz2
+ldy {z2}
+lda ({z3}),y
+sta ({z1}),y
+//FRAGMENT pwuz1=pwuz1_plus_vbuc1
+lda #{c1}
+clc
+adc {z1}
+sta {z1}
+bcc !+
+inc {z1}+1
+!:
+//FRAGMENT vbuz1=vbuz2_rol_1
+lda {z2}
+asl
+sta {z1}
+//FRAGMENT pwuz1_derefidx_vbuz2=vwuz3
+ldy {z2}
+lda {z3}
+sta ({z1}),y
+iny
+lda {z3}+1
+sta ({z1}),y
+//FRAGMENT vwuz1=vwuz1_plus_vbuc1
+lda #{c1}
+clc
+adc {z1}
+sta {z1}
+bcc !+
+inc {z1}+1
+!:
+//FRAGMENT _deref_pwuc1=vwuz1
+lda {z1}
+sta {c1}
+lda {z1}+1
+sta {c1}+1
+//FRAGMENT _deref_qbuc1=_ptr_vbuz1
+lda {z1}
+sta {c1}
+lda #0
+sta {c1}+1
+//FRAGMENT _deref_qbuc1=pbuz1
+lda {z1}
+sta {c1}
+lda {z1}+1
+sta {c1}+1
+//FRAGMENT pbuz1_derefidx_vbuaa=pbuz2_derefidx_vbuaa
+tay
+lda ({z2}),y
+sta ({z1}),y
+//FRAGMENT pbuz1_derefidx_vbuxx=pbuz2_derefidx_vbuxx
+txa
+tay
+lda ({z2}),y
+sta ({z1}),y
+//FRAGMENT pbuz1_derefidx_vbuyy=pbuz2_derefidx_vbuyy
+lda ({z2}),y
+sta ({z1}),y
+//FRAGMENT pbuz1_derefidx_vbuzz=pbuz2_derefidx_vbuzz
+tza
+tay
+lda ({z2}),y
+sta ({z1}),y
+//FRAGMENT vwuz1=_word_vbuaa
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vbuz1=vbuaa_rol_1
+asl
+sta {z1}
+//FRAGMENT vbuz1=vbuxx_rol_1
+txa
+asl
+sta {z1}
+//FRAGMENT vbuz1=vbuyy_rol_1
+tya
+asl
+sta {z1}
+//FRAGMENT vbuz1=vbuzz_rol_1
+tza
+asl
+sta {z1}
+//FRAGMENT vbuaa=vbuz1_rol_1
+lda {z1}
+asl
+//FRAGMENT vbuaa=vbuaa_rol_1
+asl
+//FRAGMENT vbuaa=vbuxx_rol_1
+txa
+asl
+//FRAGMENT vbuaa=vbuyy_rol_1
+tya
+asl
+//FRAGMENT vbuaa=vbuzz_rol_1
+tza
+asl
+//FRAGMENT vbuxx=vbuz1_rol_1
+lda {z1}
+asl
+tax
+//FRAGMENT vbuxx=vbuaa_rol_1
+asl
+tax
+//FRAGMENT vbuxx=vbuxx_rol_1
+txa
+asl
+tax
+//FRAGMENT vbuxx=vbuyy_rol_1
+tya
+asl
+tax
+//FRAGMENT vbuxx=vbuzz_rol_1
+tza
+asl
+tax
+//FRAGMENT vbuyy=vbuz1_rol_1
+lda {z1}
+asl
+tay
+//FRAGMENT vbuyy=vbuaa_rol_1
+asl
+tay
+//FRAGMENT vbuyy=vbuxx_rol_1
+txa
+asl
+tay
+//FRAGMENT vbuyy=vbuyy_rol_1
+tya
+asl
+tay
+//FRAGMENT vbuyy=vbuzz_rol_1
+tza
+asl
+tay
+//FRAGMENT vbuzz=vbuz1_rol_1
+lda {z1}
+asl
+taz
+//FRAGMENT vbuzz=vbuaa_rol_1
+asl
+taz
+//FRAGMENT vbuzz=vbuxx_rol_1
+txa
+asl
+taz
+//FRAGMENT vbuzz=vbuyy_rol_1
+tya
+asl
+taz
+//FRAGMENT vbuzz=vbuzz_rol_1
+tza
+asl
+taz
+//FRAGMENT pwuz1_derefidx_vbuaa=vwuz2
+tay
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT pwuz1_derefidx_vbuxx=vwuz2
+txa
+tay
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT pwuz1_derefidx_vbuyy=vwuz2
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT pwuz1_derefidx_vbuzz=vwuz2
+tza
+tay
+lda {z2}
+sta ({z1}),y
+iny
+lda {z2}+1
+sta ({z1}),y
+//FRAGMENT _deref_qbuc1=_ptr_vbuxx
+txa
+sta {c1}
+lda #0
+sta {c1}+1
+//FRAGMENT _deref_qbuc1=_ptr_vbuyy
+tya
+sta {c1}
+lda #0
+sta {c1}+1
+//FRAGMENT _deref_qbuc1=_ptr_vbuzz
+tza
+sta {c1}
+lda #0
+sta {c1}+1

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

@@ -917,3 +917,276 @@ sta {z1}
 bcc !+
 inc {z1}+1
 !:
+//FRAGMENT vbuz1=_dec_vbuz1
+dec {z1}
+//FRAGMENT pbuz1=pbuz2
+lda {z2}
+sta {z1}
+lda {z2}+1
+sta {z1}+1
+//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuz2
+ldy {z2}
+lda {c1},y
+ldy #0
+sta ({z1}),y
+//FRAGMENT pbuz1=_inc_pbuz2
+clc
+lda {z2}
+adc #1
+sta {z1}
+lda {z2}+1
+adc #0
+sta {z1}+1
+//FRAGMENT _deref_pbuz1=vbuc1
+lda #{c1}
+ldy #0
+sta ({z1}),y
+//FRAGMENT vbuz1=pbuc1_derefidx_vbuz2
+ldy {z2}
+lda {c1},y
+sta {z1}
+//FRAGMENT vbuz1_ge_vbuz2_then_la1
+lda {z1}
+cmp {z2}
+bcs {la1}
+//FRAGMENT vbuz1=vbuz1_minus_vbuz2
+lda {z1}
+sec
+sbc {z2}
+sta {z1}
+//FRAGMENT vwuz1=_word_vbuz2
+lda {z2}
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=vwuz2_rol_5
+lda {z2}
+asl
+sta {z1}
+lda {z2}+1
+rol
+sta {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT pbuz1=pbuc1_plus_vwuz2
+lda {z2}
+clc
+adc #<{c1}
+sta {z1}
+lda {z2}+1
+adc #>{c1}
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz2_plus_vbuz3
+lda {z3}
+clc
+adc {z2}
+sta {z1}
+lda #0
+adc {z2}+1
+sta {z1}+1
+//FRAGMENT pbuz1=pbuz1_minus_vbuc1
+sec
+lda {z1}
+sbc #{c1}
+sta {z1}
+lda {z1}+1
+sbc #0
+sta {z1}+1
+//FRAGMENT vbuz1=_deref_pbuc1
+lda {c1}
+sta {z1}
+//FRAGMENT _deref_pbuz1=vbuz2
+lda {z2}
+ldy #0
+sta ({z1}),y
+//FRAGMENT vbuxx=vbuxx_band_vbuc1
+lda #{c1}
+axs #0
+//FRAGMENT vbuyy=vbuxx_band_vbuc1
+txa
+and #{c1}
+tay
+//FRAGMENT vbuxx=vbuyy_band_vbuc1
+ldx #{c1}
+tya
+axs #0
+//FRAGMENT vbuyy=vbuyy_band_vbuc1
+tya
+and #{c1}
+tay
+//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuaa
+tay
+lda {c1},y
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuxx
+lda {c1},x
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=pbuc1_derefidx_vbuyy
+lda {c1},y
+ldy #0
+sta ({z1}),y
+//FRAGMENT vbuaa=pbuc1_derefidx_vbuz1
+ldy {z1}
+lda {c1},y
+//FRAGMENT vbuxx=pbuc1_derefidx_vbuz1
+ldy {z1}
+ldx {c1},y
+//FRAGMENT vbuyy=pbuc1_derefidx_vbuz1
+ldx {z1}
+ldy {c1},x
+//FRAGMENT vbuz1=pbuc1_derefidx_vbuaa
+tay
+lda {c1},y
+sta {z1}
+//FRAGMENT vbuaa=pbuc1_derefidx_vbuaa
+tay
+lda {c1},y
+//FRAGMENT vbuxx=pbuc1_derefidx_vbuaa
+tay
+ldx {c1},y
+//FRAGMENT vbuyy=pbuc1_derefidx_vbuaa
+tax
+ldy {c1},x
+//FRAGMENT vbuz1=pbuc1_derefidx_vbuxx
+lda {c1},x
+sta {z1}
+//FRAGMENT 0_neq_vbuaa_then_la1
+cmp #0
+bne {la1}
+//FRAGMENT vbuaa_ge_vbuz1_then_la1
+cmp {z1}
+bcs {la1}
+//FRAGMENT vbuxx=vbuxx_minus_vbuz1
+txa
+sec
+sbc {z1}
+tax
+//FRAGMENT vbuz1=vbuz1_minus_vbuaa
+eor #$ff
+sec
+adc {z1}
+sta {z1}
+//FRAGMENT vbuxx=vbuxx_minus_vbuaa
+sta $ff
+txa
+sec
+sbc $ff
+tax
+//FRAGMENT vbuz1=vbuz1_minus_vbuxx
+txa
+eor #$ff
+sec
+adc {z1}
+sta {z1}
+//FRAGMENT vbuxx=vbuxx_minus_vbuxx
+lda #0
+tax
+//FRAGMENT vbuz1=vbuz1_minus_vbuyy
+tya
+eor #$ff
+sec
+adc {z1}
+sta {z1}
+//FRAGMENT vbuxx=vbuxx_minus_vbuyy
+txa
+sty $ff
+sec
+sbc $ff
+tax
+//FRAGMENT vwuz1=_word_vbuaa
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=_word_vbuxx
+txa
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vwuz1=_word_vbuyy
+tya
+sta {z1}
+lda #0
+sta {z1}+1
+//FRAGMENT vbuaa_eq_vbuc1_then_la1
+cmp #{c1}
+beq {la1}
+//FRAGMENT vbuaa=_deref_pbuc1
+lda {c1}
+//FRAGMENT vbuxx=_deref_pbuc1
+ldx {c1}
+//FRAGMENT _deref_pbuz1=vbuaa
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=vbuxx
+txa
+ldy #0
+sta ({z1}),y
+//FRAGMENT _deref_pbuz1=vbuyy
+tya
+ldy #0
+sta ({z1}),y
+//FRAGMENT vbuxx_ge_vbuz1_then_la1
+cpx {z1}
+bcs {la1}
+//FRAGMENT vbuxx_eq_vbuc1_then_la1
+cpx #{c1}
+beq {la1}
+//FRAGMENT vbuyy=_deref_pbuc1
+ldy {c1}
+//FRAGMENT vbuz1_ge_vbuxx_then_la1
+lda {z1}
+stx $ff
+cmp $ff
+bcs {la1}
+//FRAGMENT vbuz1_ge_vbuyy_then_la1
+lda {z1}
+sty $ff
+cmp $ff
+bcs {la1}
+//FRAGMENT vbuxx_ge_vbuyy_then_la1
+sty $ff
+cpx $ff
+bcs  {la1}
+//FRAGMENT vbuaa=vbuxx
+txa
+//FRAGMENT vbuyy=vbuxx
+txa
+tay
+//FRAGMENT vbuyy_eq_vbuc1_then_la1
+cpy #{c1}
+beq {la1}
+//FRAGMENT vbuaa=vbuyy
+tya
+//FRAGMENT vbuxx=vbuyy
+tya
+tax
+//FRAGMENT vbuyy_ge_vbuz1_then_la1
+cpy {z1}
+bcs {la1}
+//FRAGMENT vwuz1=vwuz1_rol_5
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+asl {z1}
+rol {z1}+1
+//FRAGMENT pbuz1=pbuc1_plus_vwuz1
+lda {z1}
+clc
+adc #<{c1}
+sta {z1}
+lda {z1}+1
+adc #>{c1}
+sta {z1}+1

src/main/java/dk/camelot64/kickc/Compiler.java

@@ -324,7 +324,7 @@ public class Compiler {
 
    private void pass2AssertSSA() {
       List<Pass2SsaAssertion> assertions = new ArrayList<>();
-      //assertions.add(new Pass2AssertNoLValueObjectEquality(program));
+      assertions.add(new Pass2AssertNoValueLists(program));
       assertions.add(new PassNAssertTypeDeref(program));
       assertions.add(new PassNAssertTypeMatch(program));
       assertions.add(new Pass2AssertSymbols(program));
@@ -344,7 +344,6 @@ public class Compiler {
 
    private List<PassStep> getPass2Optimizations() {
       List<PassStep> optimizations = new ArrayList<>();
-      optimizations.add(new Pass2FixInlineConstructors(program));
       optimizations.add(new PassNAddNumberTypeConversions(program));
       optimizations.add(new Pass2InlineCast(program));
       optimizations.add(new PassNCastSimplification(program));

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

@@ -99,6 +99,22 @@ public class AsmFormat {
                ")";
       }
 
+      if(Operators.WORD.equals(operator)) {
+         return
+               getAsmConstant(program, left, operator.getPrecedence(), codeScope) +
+                     "*$100+" +
+                     getAsmConstant(program, right, operator.getPrecedence(), codeScope)
+               ;
+      }
+
+      if(Operators.DWORD.equals(operator)) {
+         return
+               getAsmConstant(program, left, operator.getPrecedence(), codeScope) +
+                     "*$10000+" +
+                     getAsmConstant(program, right, operator.getPrecedence(), codeScope)
+               ;
+      }
+
       // Handle non-associative operators - only handle right side since parser is left-associative A-B-C = (A-B)-C
       boolean rightParenthesis = false;
       if(!operator.isAssociative()) {

src/main/java/dk/camelot64/kickc/model/Initializers.java

@@ -98,12 +98,6 @@ public class Initializers {
          } else if(typeSpec.getType() instanceof SymbolTypeStruct) {
             // Type is a struct
             initValue = constantifyStruct(initList, (SymbolTypeStruct) typeSpec.getType(), program, source);
-         } else if(typeSpec.getType().equals(SymbolType.WORD) && initList.getList().size() == 2) {
-            // Type is an inline word
-            initValue = constantifyWord(initList, program, source);
-         } else if(typeSpec.getType().equals(SymbolType.DWORD) && initList.getList().size() == 2) {
-            // Type is an inline dword
-            initValue = constantifyDWord(initList, program, source);
          } else {
             throw new CompileError("Value list cannot initialize type " + typeSpec.getType(), source);
          }
@@ -134,42 +128,6 @@ public class Initializers {
       return initValue;
    }
 
-   private static RValue constantifyWord(ValueList valueList, Program program, StatementSource source) {
-      boolean allConst = true;
-      List<RValue> constantifiedList = new ArrayList<>();
-      for(RValue elementValue : valueList.getList()) {
-         RValue constantifiedElement = constantify(elementValue, new ValueTypeSpec(SymbolType.BYTE), program, source);
-         constantifiedList.add(constantifiedElement);
-         if(!(constantifiedElement instanceof ConstantValue))
-            allConst = false;
-      }
-      if(allConst) {
-         ConstantValue hiByte = (ConstantValue) constantifiedList.get(0);
-         ConstantValue loByte = (ConstantValue) constantifiedList.get(1);
-         return new ConstantBinary(new ConstantBinary(hiByte, Operators.MULTIPLY, new ConstantInteger(0x100L, SymbolType.WORD)), Operators.PLUS, loByte);
-      } else {
-         return new CastValue(SymbolType.WORD, new ValueList(constantifiedList));
-      }
-   }
-
-   private static RValue constantifyDWord(ValueList valueList, Program program, StatementSource source) {
-      boolean allConst = true;
-      List<RValue> constantifiedList = new ArrayList<>();
-      for(RValue elementValue : valueList.getList()) {
-         RValue constantifiedElement = constantify(elementValue, new ValueTypeSpec(SymbolType.WORD), program, source);
-         constantifiedList.add(constantifiedElement);
-         if(!(constantifiedElement instanceof ConstantValue))
-            allConst = false;
-      }
-      if(allConst) {
-         ConstantValue hiWord = (ConstantValue) constantifiedList.get(0);
-         ConstantValue loWord = (ConstantValue) constantifiedList.get(1);
-         return new ConstantBinary(new ConstantBinary(hiWord, Operators.MULTIPLY, new ConstantInteger(0x10000L, SymbolType.DWORD)), Operators.PLUS, loWord);
-      } else {
-         return new CastValue(SymbolType.DWORD, new ValueList(constantifiedList));
-      }
-   }
-
    /**
     * Convert as much as possible of a struct to constants.
     *

src/main/java/dk/camelot64/kickc/model/operators/OperatorDWord.java

@@ -31,13 +31,7 @@ public class OperatorDWord extends OperatorBinary {
       if(right instanceof SymbolTypePointer) {
          right = SymbolType.WORD;
       }
-      if(SymbolType.BYTE.equals(left)) {
-         left = SymbolType.WORD;
-      }
-      if(SymbolType.BYTE.equals(right)) {
-         right = SymbolType.WORD;
-      }
-      if(SymbolType.WORD.equals(left) && SymbolType.WORD.equals(right)) {
+      if(SymbolType.isInteger(left) && SymbolType.isInteger(right)) {
          return SymbolType.DWORD;
       }
       throw new NoMatchingType("DWord constructor cannot use " + left + " " + getOperator() + " " + right);

src/main/java/dk/camelot64/kickc/model/operators/OperatorWord.java

@@ -23,7 +23,7 @@ public class OperatorWord extends OperatorBinary {
 
    @Override
    public SymbolType inferType(SymbolType left, SymbolType right) {
-      if(SymbolType.BYTE.equals(left) && SymbolType.BYTE.equals(right)) {
+      if(SymbolType.isInteger(left) && SymbolType.isInteger(right)) {
          return SymbolType.WORD;
       }
       throw new NoMatchingType("Word constructor cannot use " + left + " " + getOperator() + " " + right);

src/main/java/dk/camelot64/kickc/model/operators/Operators.java

@@ -15,8 +15,6 @@ public class Operators {
    public static final OperatorUnary LOGIC_NOT = new OperatorLogicNot(2);
    public static final OperatorUnary DEREF = new OperatorDeref(2);
    public static final OperatorUnary ADDRESS_OF = new OperatorAddressOf(2);
-   public static final OperatorBinary WORD = new OperatorWord(2);
-   public static final OperatorBinary DWORD = new OperatorDWord(2);
    public static final OperatorBinary DEREF_IDX = new OperatorDerefIdx(2);
    public static final OperatorBinary SET_BYTE0 = new OperatorSetByte0(2);
    public static final OperatorBinary SET_BYTE1 = new OperatorSetByte1(2);
@@ -40,6 +38,8 @@ public class Operators {
    public static final OperatorBinary MODULO = new OperatorModulo(3);
    public static final OperatorBinary PLUS = new OperatorPlus(4);
    public static final OperatorBinary MINUS = new OperatorMinus(4);
+   public static final OperatorBinary WORD = new OperatorWord(4);
+   public static final OperatorBinary DWORD = new OperatorDWord(4);
    public static final OperatorBinary SHIFT_LEFT = new OperatorShiftLeft(5);
    public static final OperatorBinary SHIFT_RIGHT = new OperatorShiftRight(5);
    public static final OperatorBinary LT = new OperatorLessThan(7);

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

@@ -2344,7 +2344,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       RValue result;
       if(ctx.expr() instanceof KickCParser.ExprIdContext) {
          procedureName = ctx.expr().getText();
-         // Handle the special BYTE0/1/2/3 calls
+         // Handle the special BYTE0/1/2/3/WORD0/1/MAKEWORD/MAKEDWORD calls
          if(Pass1ByteXIntrinsicRewrite.INTRINSIC_BYTE0_NAME.equals(procedureName) && parameters.size() == 1) {
             result = addExprUnary(ctx, Operators.BYTE0, parameters.get(0));
          } else if(Pass1ByteXIntrinsicRewrite.INTRINSIC_BYTE1_NAME.equals(procedureName) && parameters.size() == 1) {
@@ -2357,6 +2357,10 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
             result = addExprUnary(ctx, Operators.WORD0, parameters.get(0));
          } else if(Pass1ByteXIntrinsicRewrite.INTRINSIC_WORD1_NAME.equals(procedureName) && parameters.size() == 1) {
             result = addExprUnary(ctx, Operators.WORD1, parameters.get(0));
+         } else if(Pass1ByteXIntrinsicRewrite.INTRINSIC_MAKEWORD.equals(procedureName) && parameters.size() == 2) {
+            result = addExprBinary(ctx, parameters.get(0), Operators.WORD, parameters.get(1));
+         } else if(Pass1ByteXIntrinsicRewrite.INTRINSIC_MAKELONG.equals(procedureName) && parameters.size() == 2) {
+            result = addExprBinary(ctx, parameters.get(0), Operators.DWORD, parameters.get(1));
          } else {
             // A normal named call
             result = addIntermediateVar().getRef();
@@ -2458,6 +2462,10 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       RValue right = (RValue) this.visit(ctx.expr(1));
       String op = ((TerminalNode) ctx.getChild(1)).getSymbol().getText();
       Operator operator = Operators.getBinary(op);
+      return addExprBinary(ctx, left, operator, right);
+   }
+
+   private RValue addExprBinary(ParserRuleContext ctx, RValue left, Operator operator, RValue right) {
       if(left instanceof ConstantValue && right instanceof ConstantValue) {
          return new ConstantBinary((ConstantValue) left, (OperatorBinary) operator, (ConstantValue) right);
       } else {

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

@@ -30,6 +30,10 @@ public class Pass1ByteXIntrinsicRewrite extends Pass2SsaOptimization {
    public static final String INTRINSIC_WORD0_NAME = "WORD0";
    /** The word1 procedure name. */
    public static final String INTRINSIC_WORD1_NAME = "WORD1";
+   /** The makeword procedure name. */
+   public static final String INTRINSIC_MAKEWORD = "MAKEWORD";
+   /** The makelong procedure name. */
+   public static final String INTRINSIC_MAKELONG = "MAKELONG";
 
    public Pass1ByteXIntrinsicRewrite(Program program) {
       super(program);

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

@@ -55,23 +55,23 @@ public class Pass1FixLValuesLoHi extends Pass1Base {
                         fixLoHiLValue(programScope, currentScope, statementsIt, statementLValue, intermediate, intermediateAssignment, Operators.SET_BYTE0);
                         intermediates.add(intermediate.getVariable());
                      } else if(Operators.BYTE1.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
-                        // Found assignment to an intermediate low byte lValue byte0(x) = ...
+                        // Found assignment to an intermediate low byte lValue byte1(x) = ...
                         fixLoHiLValue(programScope, currentScope, statementsIt, statementLValue, intermediate, intermediateAssignment, Operators.SET_BYTE1);
                         intermediates.add(intermediate.getVariable());
                      } else if(Operators.BYTE2.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
-                        // Found assignment to an intermediate low byte lValue byte0(x) = ...
+                        // Found assignment to an intermediate low byte lValue byte2(x) = ...
                         fixLoHiLValue(programScope, currentScope, statementsIt, statementLValue, intermediate, intermediateAssignment, Operators.SET_BYTE2);
                         intermediates.add(intermediate.getVariable());
                      } else if(Operators.BYTE3.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
-                        // Found assignment to an intermediate low byte lValue byte0(x) = ...
+                        // Found assignment to an intermediate low byte lValue byte3(x) = ...
                         fixLoHiLValue(programScope, currentScope, statementsIt, statementLValue, intermediate, intermediateAssignment, Operators.SET_BYTE3);
                         intermediates.add(intermediate.getVariable());
                      } else if(Operators.WORD0.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
-                        // Found assignment to an intermediate low byte lValue byte0(x) = ...
+                        // Found assignment to an intermediate low byte lValue word0(x) = ...
                         fixLoHiLValue(programScope, currentScope, statementsIt, statementLValue, intermediate, intermediateAssignment, Operators.SET_WORD0);
                         intermediates.add(intermediate.getVariable());
                      } else if(Operators.WORD1.equals(intermediateAssignment.getOperator()) && intermediateAssignment.getrValue1() == null) {
-                        // Found assignment to an intermediate low byte lValue byte0(x) = ...
+                        // Found assignment to an intermediate low byte lValue word1(x) = ...
                         fixLoHiLValue(programScope, currentScope, statementsIt, statementLValue, intermediate, intermediateAssignment, Operators.SET_WORD1);
                         intermediates.add(intermediate.getVariable());
                      }

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

@@ -1,47 +0,0 @@
-package dk.camelot64.kickc.passes;
-
-import dk.camelot64.kickc.model.InternalError;
-import dk.camelot64.kickc.model.Program;
-import dk.camelot64.kickc.model.iterator.ProgramValue;
-import dk.camelot64.kickc.model.iterator.ProgramValueIterator;
-import dk.camelot64.kickc.model.values.ConstantValue;
-import dk.camelot64.kickc.model.values.SymbolRef;
-import dk.camelot64.kickc.model.values.Value;
-
-import java.util.HashMap;
-
-/** Asserts that the program does not contain calls with lValues */
-public class Pass2AssertNoLValueObjectEquality extends Pass2SsaAssertion {
-
-   public Pass2AssertNoLValueObjectEquality(Program program) {
-      super(program);
-   }
-
-   @Override
-   public void check() throws AssertionFailed {
-      HashMap<Value, ValueInProgram> allValues = new HashMap<>();
-      ProgramValueIterator.execute(getGraph(), (programValue, currentStmt, stmtIt, currentBlock) -> {
-         Value value = programValue.get();
-         if(value!=null && !(value instanceof SymbolRef) && !(value instanceof ConstantValue)) {
-            ValueInProgram other = allValues.get(value);
-            if(other != null) {
-               if(other.value == value)
-                  throw new InternalError("Error! Value object equality in program " + value.toString(getProgram()), currentStmt.getSource());
-            } else {
-               allValues.put(value, new ValueInProgram(value, programValue));
-            }
-         }
-      });
-   }
-
-   private static class ValueInProgram {
-      Value value;
-      ProgramValue programValue;
-
-      public ValueInProgram(Value value, ProgramValue programValue) {
-         this.value = value;
-         this.programValue = programValue;
-      }
-   }
-
-}

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

@@ -0,0 +1,28 @@
+package dk.camelot64.kickc.passes;
+
+import dk.camelot64.kickc.model.CompileError;
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.iterator.ProgramValueIterator;
+import dk.camelot64.kickc.model.values.Value;
+import dk.camelot64.kickc.model.values.ValueList;
+
+/**
+ * Fail if any initializer lists are still present in the program
+ */
+public class Pass2AssertNoValueLists extends Pass2SsaAssertion {
+
+   public Pass2AssertNoValueLists(Program program) {
+      super(program);
+   }
+
+   @Override
+   public void check() throws AssertionFailed {
+      ProgramValueIterator.execute(getProgram(), (programValue, currentStmt, stmtIt, currentBlock) -> {
+         final Value value = programValue.get();
+         if(value instanceof ValueList) {
+            throw new CompileError("Initializer list not supported.", currentStmt);
+         }
+      });
+   }
+
+}

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

@@ -1,103 +0,0 @@
-package dk.camelot64.kickc.passes;
-
-import dk.camelot64.kickc.model.Comment;
-import dk.camelot64.kickc.model.ControlFlowBlock;
-import dk.camelot64.kickc.model.Program;
-import dk.camelot64.kickc.model.VariableBuilder;
-import dk.camelot64.kickc.model.iterator.ProgramExpression;
-import dk.camelot64.kickc.model.iterator.ProgramExpressionIterator;
-import dk.camelot64.kickc.model.iterator.ProgramExpressionUnary;
-import dk.camelot64.kickc.model.operators.*;
-import dk.camelot64.kickc.model.statements.Statement;
-import dk.camelot64.kickc.model.statements.StatementAssignment;
-import dk.camelot64.kickc.model.symbols.Scope;
-import dk.camelot64.kickc.model.symbols.Variable;
-import dk.camelot64.kickc.model.types.SymbolType;
-import dk.camelot64.kickc.model.types.SymbolTypePointer;
-import dk.camelot64.kickc.model.values.CastValue;
-import dk.camelot64.kickc.model.values.LValue;
-import dk.camelot64.kickc.model.values.RValue;
-import dk.camelot64.kickc.model.values.ValueList;
-
-import java.util.List;
-import java.util.ListIterator;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Identifies word constructors <code> (word) { b1, b2 }</code> and replaces
- * them with a binary operator <code>word w = b1 w= b2 ;</code>
- */
-public class Pass2FixInlineConstructors extends Pass2SsaOptimization {
-
-   public Pass2FixInlineConstructors(Program program) {
-      super(program);
-   }
-
-   @Override
-   public boolean step() {
-      AtomicBoolean optimized = new AtomicBoolean(false);
-      ProgramExpressionIterator.execute(getProgram(), (programExpression, currentStmt, stmtIt, currentBlock) -> {
-         if(programExpression instanceof ProgramExpressionUnary) {
-            if(((ProgramExpressionUnary) programExpression).getOperand() instanceof ValueList) {
-               ValueList list = (ValueList) ((ProgramExpressionUnary) programExpression).getOperand();
-               List<RValue> listValues = list.getList();
-               if(listValues.size() == 2) {
-                  Operator operator = programExpression.getOperator();
-                  if(operator instanceof OperatorCast) {
-                     OperatorCast operatorCast = (OperatorCast) operator;
-                     SymbolType castToType = operatorCast.getToType();
-                     if(SymbolType.WORD.equals(castToType)) {
-                        addLiteralWordConstructor(Operators.WORD, SymbolType.WORD, SymbolType.WORD, SymbolType.BYTE, programExpression, listValues, currentStmt, stmtIt, currentBlock);
-                        optimized.set(true);
-                     } else if(SymbolType.DWORD.equals(castToType)) {
-                        addLiteralWordConstructor(Operators.DWORD, SymbolType.DWORD, SymbolType.DWORD, SymbolType.WORD, programExpression, listValues, currentStmt, stmtIt, currentBlock);
-                        optimized.set(true);
-                     } else if((castToType instanceof SymbolTypePointer)) {
-                        SymbolType castType = ((OperatorCastPtr) operator).getToType();
-                        addLiteralWordConstructor(Operators.WORD, castType, SymbolType.WORD, SymbolType.BYTE, programExpression, listValues, currentStmt, stmtIt, currentBlock);
-                        optimized.set(true);
-                     }
-                  }
-               }
-            }
-         }
-      });
-      return optimized.get();
-
-   }
-
-   /**
-    * Add a literal word/dword constructor.
-    * Converts a cast value-list with 2 items to a word/dword constructor.
-    * (word) { 1, 2 }  ->  1 =w 2
-    *
-    * @param constructOperator The operator to add
-    * @param constructType The type being constructed
-    * @param subType The sub-type
-    * @param programExpression The program expression containing the cast value list
-    * @param listValues
-    * @param currentStmt
-    * @param stmtIt
-    * @param currentBlock
-    */
-   public void addLiteralWordConstructor(OperatorBinary constructOperator, SymbolType castType, SymbolType constructType, SymbolType subType, ProgramExpression programExpression, List<RValue> listValues, Statement currentStmt, ListIterator<Statement> stmtIt, ControlFlowBlock currentBlock) {
-      // Convert list to a word constructor in a new tmp variable
-      Scope currentScope = Pass2FixInlineConstructors.this.getScope().getScope(currentBlock.getScope());
-      Variable tmpVar = VariableBuilder.createIntermediate(currentScope, constructType, getProgram());
-      // Move backward - to insert before the current statement
-      stmtIt.previous();
-      // Add assignment of the new tmpVar
-      StatementAssignment assignment = new StatementAssignment((LValue) tmpVar.getRef(), new CastValue(subType, listValues.get(0)), constructOperator, new CastValue(subType, listValues.get(1)), true, currentStmt.getSource(), Comment.NO_COMMENTS);
-      stmtIt.add(assignment);
-      // Move back before the current statement
-      stmtIt.next();
-      // Replace current value with the reference (adding a cast if needed)
-      if(constructType.equals(castType))
-         programExpression.set(tmpVar.getRef());
-      else
-         programExpression.set(new CastValue(castType, tmpVar.getRef()));
-      Pass2FixInlineConstructors.this.getLog().append("Fixing inline constructor with " + assignment.toString());
-   }
-
-
-}

src/main/kc/lib/c64-basic-floats.c

@@ -36,7 +36,7 @@ unsigned int getFAC() {
         sty memLo
         sta memHi
     }
-    unsigned int w = { *memHi, *memLo };
+    unsigned int w = MAKEWORD( *memHi, *memLo );
     return w;
 }
 

src/main/kc/lib/c64-bitmap.c

@@ -45,7 +45,7 @@ void bitmap_clear(char bgcol, char fgcol) {
 
 // Plot a single dot in the bitmap
 void bitmap_plot(unsigned int x, char y) {
-    char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] };
+    char* plotter = (char*) MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] );
     plotter += ( x & $fff8 );
     *plotter |= bitmap_plot_bit[BYTE0(x)];
 }

src/main/kc/lib/division.c

@@ -42,7 +42,7 @@ char divr8u(char dividend, char divisor, char rem) {
 unsigned int div16u8u(unsigned int dividend, unsigned char divisor) {
   unsigned char quotient_hi = divr8u(BYTE1(dividend), divisor, 0);
   unsigned char quotient_lo = divr8u(BYTE0(dividend), divisor, rem8u);
-  unsigned int quotient = { quotient_hi, quotient_lo};
+  unsigned int quotient = MAKEWORD( quotient_hi, quotient_lo );
   return quotient;
 }
 
@@ -92,7 +92,7 @@ unsigned int div16u(unsigned int dividend, unsigned int divisor) {
 unsigned long div32u16u(unsigned long dividend, unsigned int divisor) {
   unsigned int quotient_hi = divr16u(WORD1(dividend), divisor, 0);
   unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u);
-  unsigned long quotient = { quotient_hi, quotient_lo};
+  unsigned long quotient = MAKELONG( quotient_hi, quotient_lo );
   return quotient;
 }
 

src/main/kc/lib/fastmultiply.c

@@ -82,7 +82,7 @@ unsigned int mulf8u_prepared(char b) {
         sbc mulf_sqr2_hi,x
         sta memB
     }
-    return { *memB, *resL };
+    return MAKEWORD( *memB, *resL );
 }
 
 // Fast multiply two unsigned chars to a unsigned int result

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

@@ -9,6 +9,21 @@ import java.io.IOException;
  */
 public class TestProgramsFast extends TestPrograms {
 
+   @Test
+   public void testMakeDWord0() throws IOException {
+      compileAndCompare("makelong-0.c");
+   }
+
+   @Test
+   public void testMakeWord1() throws IOException {
+      compileAndCompare("makeword-1.c");
+   }
+
+   @Test
+   public void testMakeWord0() throws IOException {
+      compileAndCompare("makeword-0.c");
+   }
+
    @Test
    public void testMissingInstruction() throws IOException {
       compileAndCompare("missing-instruction.c");
@@ -1908,6 +1923,11 @@ public class TestProgramsFast extends TestPrograms {
       compileAndCompare("number-ternary-fail-3.c");
    }
 
+   @Test
+   public void testInitializerUnsupported0() throws IOException {
+      assertError("initializer-unsupported-0.c", "Initializer list not supported.");
+   }
+
    @Test
    public void testInitializer0() throws IOException {
       compileAndCompare("initializer-0.c");

src/test/kc/c64dtv-gfxexplorer.c

@@ -712,7 +712,7 @@ void form_set_screen(byte* screen) {
 // field_idx is the index of the field to get the screen address for
 byte* form_field_ptr(byte field_idx) {
     byte y = form_fields_y[field_idx];
-    byte* line = (byte*) { form_line_hi[y], form_line_lo[y] };
+    byte* line = (byte*) MAKEWORD( form_line_hi[y], form_line_lo[y] );
     byte x = form_fields_x[field_idx];
     byte* field = line+x;
     return field;

src/test/kc/call-parameter-autocast.c

@@ -4,7 +4,7 @@ void main() {
     word w = 0x1234;
     print(0x1234);
     print(w);
-    print( {0x12,0x34} );
+    print( MAKEWORD(0x12,0x34) );
 }
 
 word* const SCREEN = (word*)0x0400;

src/test/kc/complex/borderline_pacman/pacman-render.c

@@ -109,7 +109,7 @@ void init_render_index() {
 void render(char xcol, char ypos, char pixels) {
     char ytile = ypos/4;
     char * render_index_xcol = (char*){ BYTE1(RENDER_INDEX) + xcol, ytile*2 };
-    unsigned int canvas_offset = { render_index_xcol[RENDER_OFFSET_CANVAS_HI], render_index_xcol[RENDER_OFFSET_CANVAS_LO] };
+    unsigned int canvas_offset = MAKEWORD( render_index_xcol[RENDER_OFFSET_CANVAS_HI], render_index_xcol[RENDER_OFFSET_CANVAS_LO] );
     char * canvas1 = SPRITES_1 + canvas_offset;
     char * canvas2 = SPRITES_2 + canvas_offset;
     char ypos_inc_offset = render_index_xcol[RENDER_OFFSET_YPOS_INC];
@@ -135,7 +135,7 @@ void render_tiles(char xcol, char ytile, char tile_left, char tile_right) {
     char * tile_left_pixels = TILES_LEFT + tile_left*4;
     char * tile_right_pixels = TILES_RIGHT + tile_right*4;
     char * render_index_xcol = (char*){ BYTE1(RENDER_INDEX) + xcol, ytile*2 };
-    unsigned int canvas_offset = {render_index_xcol[RENDER_OFFSET_CANVAS_HI], render_index_xcol[RENDER_OFFSET_CANVAS_LO] };
+    unsigned int canvas_offset = MAKEWORD( render_index_xcol[RENDER_OFFSET_CANVAS_HI], render_index_xcol[RENDER_OFFSET_CANVAS_LO] );
     char * canvas1 = SPRITES_1 + canvas_offset;
     char * canvas2 = SPRITES_2 + canvas_offset;
     char ypos_inc_offset = render_index_xcol[RENDER_OFFSET_YPOS_INC];

src/test/kc/cordic-atan2-16-ref.c

@@ -27,8 +27,8 @@ void main() {
             //diff_sum += diff(angle_b, *screen_ref);
             //*screen = angle_b - *screen_ref++;
             //*screen = angle_b;
-            signed word xw = (signed word)(word){ (byte)x, 0 };
-            signed word yw = (signed word)(word){ (byte)y, 0 };
+            signed word xw = (signed word)MAKEWORD( (byte)x, 0 );
+            signed word yw = (signed word)MAKEWORD( (byte)y, 0 );
             word angle_w = atan2_16(xw, yw);
             byte ang_w = BYTE1(angle_w+0x0080);
             //*screen = (>angle_w)-angle_b;

src/test/kc/cordic-atan2-16.c

@@ -14,8 +14,8 @@ void main() {
     byte* screen = SCREEN;
     for(signed byte y: -12..12) {
         for(signed byte x: -19..20) {
-            signed word xw = (signed word)(word){ (byte)x, 0 };
-            signed word yw = (signed word)(word){ (byte)y, 0 };
+            signed word xw = (signed word)MAKEWORD( (byte)x, 0 );
+            signed word yw = (signed word)MAKEWORD( (byte)y, 0 );
             word angle_w = atan2_16(xw, yw);
             byte ang_w = BYTE1(angle_w+0x0080);
             *screen++ = ang_w;

src/test/kc/cordic-atan2-clear.c

@@ -29,8 +29,8 @@ void init_angle_screen(byte* screen) {
     byte *screen_bottomline = screen+40*12;
     for(byte y: 0..12) {
         for( byte x=0,xb=39; x<=19; x++, xb--) {
-            signed word xw = (signed word)(word){ 39-x*2, 0 };
-            signed word yw = (signed word)(word){ y*2, 0 };
+            signed word xw = (signed word)MAKEWORD( 39-x*2, 0 );
+            signed word yw = (signed word)MAKEWORD( y*2, 0 );
             word angle_w = atan2_16(xw, yw);
             byte ang_w = BYTE1(angle_w+0x0080);
             screen_topline[x] = 0x80+ang_w;

src/test/kc/initializer-unsupported-0.c

@@ -0,0 +1,6 @@
+// Unsupported initializer list
+
+void main() {
+    byte* screen = (byte*) { 4, 0 };
+    *screen = 'a';
+}

src/test/kc/inline-dword-0.c

@@ -1,7 +1,7 @@
 // Tests minimal inline dword
 
 void main() {
-    dword w = { 0x01234, 0x5678 };
+    dword w = MAKELONG( 0x01234, 0x5678 );
     dword* screen = (char*)0x0400;
     screen[0] = w;
 }

src/test/kc/inline-function-level2.c

@@ -10,7 +10,7 @@ byte* cur_line = (byte*)$400;
 
 inline void line(byte xpos, byte xadd, byte ysize, byte ch) {
     cur_line = (byte*)$400;
-    word pos = {xpos, 0};
+    word pos = MAKEWORD(xpos, 0);
     for( byte i=0;i<ysize; i++) {
         plot(BYTE1(pos), ch);
         pos += xadd;

src/test/kc/inline-pointer-0.c

@@ -1,6 +1,6 @@
 // Tests creating a literal pointer from two bytes
 
 void main() {
-    byte* screen = (byte*) { 4, 0 };
+    byte* screen = (byte*) MAKEWORD( 4, 0 );
     *screen = 'a';
 }

src/test/kc/inline-pointer-1.c

@@ -6,6 +6,6 @@ void main() {
 }
 
 void puta(byte ph, byte pl) {
-    byte* screen = (byte*) { ph, pl };
+    byte* screen = (byte*) MAKEWORD( ph, pl );
     *screen = 'a';
 }

src/test/kc/inline-pointer-2.c

@@ -1,6 +1,6 @@
 // Tests creating a literal pointer from two bytes
 
 void main() {
-    byte* screen = (byte*){ 4, 0 } + (word){ 0, 40 };
+    byte* screen = (byte*)MAKEWORD( 4, 0 ) + (word)MAKEWORD( 0, 40 );
     *screen = 'a';
 }

src/test/kc/inline-string-3.c

@@ -6,7 +6,7 @@ void main() {
     byte* const PTR = (byte*)$9ffe;
     *PTR = BYTE0(STRING);
     *(PTR+1)= BYTE1(STRING);
-    byte* ptr = (byte*) { *(PTR+1), *PTR };
+    byte* ptr = (byte*) MAKEWORD( *(PTR+1), *PTR );
     byte* const SCREEN = (byte*)$400;
     *SCREEN = *ptr;
 }

src/test/kc/inline-word-0.c

@@ -1,7 +1,7 @@
 // Tests minimal inline word
 
 void main() {
-    word w = { 0x02ub, 0x01ub };
+    word w = MAKEWORD( 0x02ub, 0x01ub );
     word* screen = (char*)0x0400;
     screen[0] = w;
 }

src/test/kc/inline-word-1.c

@@ -1,7 +1,7 @@
 // Tests minimal inline word
 
 void main() {
-    word w = { 0x01, 0x02 };
+    word w = MAKEWORD( 0x01, 0x02 );
     word* screen = (char*)0x0400;
     screen[0] = w;
 }

src/test/kc/inline-word-2.c

@@ -1,7 +1,7 @@
 // Tests minimal inline word
 
 void main() {
-    word w = { 0x01, 0x02ub };
+    word w = MAKEWORD( 0x01, 0x02ub );
     word* screen = (word*)0x0400;
     screen[0] = w;
 }

src/test/kc/inline-word.c

@@ -4,7 +4,7 @@ void main() {
    byte his[] = { BYTE1(SCREEN), BYTE1(SCREEN+$100), BYTE1(SCREEN+$200) }; // constant array
    for( byte h: 0..2) {
       for (byte l: 4..7) {
-         word w = { his[h], l }; // inline word
+         word w = MAKEWORD( his[h], l ); // inline word
          byte* sc = (byte*)w;
          *sc = '*';
       }

src/test/kc/line-anim.c

@@ -119,7 +119,7 @@ void bitmap_init(byte* bitmap) {
 
 // Clear all graphics on the bitmap
 void bitmap_clear() {
-    byte* bitmap = (byte*) { bitmap_plot_yhi[0], bitmap_plot_ylo[0] };
+    byte* bitmap = (byte*) MAKEWORD( bitmap_plot_yhi[0], bitmap_plot_ylo[0] );
     for( byte y: 0..39 ) {
         for( byte x: 0..199 ) {
             *bitmap++ = 0;
@@ -129,7 +129,7 @@ void bitmap_clear() {
 
 // Plot a single dot in the bitmap
 void bitmap_plot(word x, byte y) {
-    byte* plotter = (byte*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] };
+    byte* plotter = (byte*) MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] );
     plotter += ( x & $fff8 );
     *plotter |= bitmap_plot_bit[BYTE0(x)];
 }

src/test/kc/linegen.c

@@ -44,8 +44,8 @@ void lin16u_gen(word min, word max, word* lintab, word length) {
     word ampl = max-min;
     word stepi = divr16u(ampl, length-1, 0);
     word stepf = divr16u(0, length-1, rem16u);
-    dword step = { stepi, stepf };
-    dword val = { min, 0 };
+    dword step = MAKELONG( stepi, stepf );
+    dword val = MAKELONG( min, 0 );
     for(word i=0; i<length; i++) {
         *lintab = WORD1(val);
         val = val + step;

src/test/kc/makeword-0.c

@@ -0,0 +1,11 @@
+// Test MAKEWORD()
+
+void main() {
+    unsigned int* const SCREEN = (unsigned int*)0x0400;
+    for(char lo=0;lo<100;lo++)
+        for(char hi=0;hi<100;hi++) {
+            unsigned int i = MAKEWORD(hi, lo);
+            *SCREEN = i;
+        }
+
+}

src/test/kc/makeword-1.c

@@ -0,0 +1,7 @@
+// Test MAKEWORD()
+
+void main() {
+    signed char lo = 1;
+    char hi = 2;
+    unsigned int i = MAKEWORD(hi, lo);
+}

src/test/kc/plasma-center.c

@@ -67,8 +67,8 @@ void init_angle_screen(byte* screen) {
     byte *screen_bottomline = screen+40*12;
     for(byte y: 0..12) {
         for( byte x=0,xb=39; x<=19; x++, xb--) {
-            signed word xw = (signed word)(word){ 39-x*2, 0 };
-            signed word yw = (signed word)(word){ y*2, 0 };
+            signed word xw = (signed word)MAKEWORD( 39-x*2, 0 );
+            signed word yw = (signed word)MAKEWORD( y*2, 0 );
             word angle_w = atan2_16(xw, yw);
             byte ang_w = BYTE1(angle_w+0x0080);
             screen_bottomline[xb] = ang_w;

src/test/kc/screen-center-angle.c

@@ -30,8 +30,8 @@ void init_angle_screen(byte* screen) {
     byte *screen_bottomline = screen+40*12;
     for(byte y: 0..12) {
         for( byte x=0,xb=39; x<=19; x++, xb--) {
-            signed word xw = (signed word)(word){ 39-x*2, 0 };
-            signed word yw = (signed word)(word){ y*2, 0 };
+            signed word xw = (signed word)MAKEWORD( 39-x*2, 0 );
+            signed word yw = (signed word)MAKEWORD( y*2, 0 );
             word angle_w = atan2_16(xw, yw);
             byte ang_w = BYTE1(angle_w+0x0080);
             screen_bottomline[xb] = ang_w;

src/test/kc/screen-show-spiral-buckets.c

@@ -115,8 +115,8 @@ void init_angle_screen(byte* screen) {
     byte *screen_bottomline = screen+40*12;
     for(byte y: 0..12) {
         for( byte x=0,xb=39; x<=19; x++, xb--) {
-            signed word xw = (signed word)(word){ 39-x*2, 0 };
-            signed word yw = (signed word)(word){ y*2, 0 };
+            signed word xw = (signed word)MAKEWORD( 39-x*2, 0 );
+            signed word yw = (signed word)MAKEWORD( y*2, 0 );
             word angle_w = atan2_16(xw, yw);
             byte ang_w = BYTE1(angle_w+0x0080);
             screen_bottomline[xb] = ang_w;

src/test/kc/screen-show-spiral.c

@@ -27,7 +27,7 @@ void main() {
         byte* min_fill = SCREEN_FILL;
         do {
             if(*fill!=FILL_CHAR) {
-                word dist_angle = { *dist, *angle };
+                word dist_angle = MAKEWORD( *dist, *angle );
                 if(dist_angle<min_dist_angle) {
                     min_fill = fill;
                     min_dist_angle = dist_angle;
@@ -54,8 +54,8 @@ void init_angle_screen(byte* screen) {
     byte *screen_bottomline = screen+40*12;
     for(byte y: 0..12) {
         for( byte x=0,xb=39; x<=19; x++, xb--) {
-            signed word xw = (signed word)(word){ 39-x*2, 0 };
-            signed word yw = (signed word)(word){ y*2, 0 };
+            signed word xw = (signed word)MAKEWORD( 39-x*2, 0 );
+            signed word yw = (signed word)MAKEWORD( y*2, 0 );
             word angle_w = atan2_16(xw, yw);
             byte ang_w = BYTE1(angle_w+0x0080);
             screen_bottomline[xb] = ang_w;

src/test/kc/struct-ptr-12-ref.c

@@ -1,7 +1,7 @@
 // Reference file for Minimal struct -  using address-of
 
 void main() {
-    word p = { 2, 3 };
+    word p = MAKEWORD( 2, 3 );
     word *q = &p;
     byte* const SCREEN = (char*)0x0400;
     SCREEN[0] = BYTE0(*q);

src/test/kc/true-inline-words.c

@@ -2,8 +2,8 @@
 void main() {
     byte bs[] = { 'c', 'm' };           // constant byte array
     byte b = 4;                         // constant byte
-    word w = { b, 0 };                  // constant inline word
-    word w2 = (word){ 1, 1 } + w + (word){ 0, 0 };  // constant inline words inside expression
+    word w = MAKEWORD(b, 0);                  // constant inline word
+    word w2 = MAKEWORD(1, 1) + w + MAKEWORD(0, 0);  // constant inline words inside expression
     byte* sc = (byte*)w2;               // cast to (byte*)
     *sc = bs[1];                        // In the end $501 is set to 'c'
 

src/test/ref/bitmap-line-anim-1.asm

@@ -507,10 +507,10 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(8) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $17
+    .label __1 = $17
     .label plotter = $15
     .label x = 8
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -518,17 +518,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x

src/test/ref/bitmap-line-anim-1.cfg

@@ -250,10 +250,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [117] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_line::x1#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [117] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [118] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [119] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [121] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [119] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [121] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [123] return 

src/test/ref/bitmap-line-anim-1.log

@@ -122,11 +122,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_line::@6 bitmap_line::@9
   bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#4], bitmap_plot_ylo[bitmap_plot::y#4] }
-  bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -862,8 +863,9 @@ word bitmap_line::y2#7
 word bitmap_line::y2#8
 word bitmap_line::y2#9
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -992,8 +994,6 @@ word sgn_u16::w#0
 word sgn_u16::w#1
 word sgn_u16::w#2
 
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#4] w= (byte)bitmap_plot_ylo[bitmap_plot::y#4]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) 1 in bitmap_init::bits#1 = bitmap_init::bits#3 >> 1
 Adding number conversion cast (unumber) 0 in bitmap_init::$0 = bitmap_init::bits#1 == 0
 Adding number conversion cast (unumber) $80 in bitmap_init::bits#2 = $80
@@ -1008,8 +1008,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#1 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#4 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#4 & (unumber)$fff8
 Adding number conversion cast (unumber) 0 in bitmap_line::$4 = bitmap_line::dx#1 == 0
 Adding number conversion cast (unumber) 0 in bitmap_line::$5 = bitmap_line::dy#0 == 0
 Adding number conversion cast (unumber) 2 in bitmap_line::$20 = bitmap_line::dy#2 / 2
@@ -1067,8 +1067,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#4]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#4]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast 0
 Simplifying constant integer cast 0
@@ -1133,7 +1131,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
 Inferred type updated to word in bitmap_line::$20 = bitmap_line::dy#2 / 2
 Inferred type updated to word in bitmap_line::$15 = bitmap_line::dx#3 / 2
 Inferred type updated to byte in abs_u16::$1 = abs_u16::$0 & $80
@@ -1392,7 +1390,7 @@ Constant sgn_u16::w#1 = bitmap_line::y2#0
 Successful SSA optimization Pass2ConstantIdentification
 Constant memset::c#0 = bitmap_clear::col#0
 Successful SSA optimization Pass2ConstantIdentification
-Inlining Noop Cast [25] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [25] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Successful SSA optimization Pass2NopCastInlining
 Inlining Noop Cast [79] memset::$4 = (byte*)memset::str#3 keeping memset::str#3
 Inlining Noop Cast [81] memset::dst#0 = (byte*)memset::str#3 keeping memset::str#3
@@ -1816,10 +1814,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [117] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_line::x1#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [117] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [118] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [119] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [121] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [119] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [121] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [123] return 
@@ -1905,8 +1903,8 @@ word bitmap_line::y#7 10001.0
 word bitmap_line::y1
 word bitmap_line::y2
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 200002.0
-byte~ bitmap_plot::$1 200002.0
+word~ bitmap_plot::$1 200002.0
+byte~ bitmap_plot::$2 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 50000.5
 byte* bitmap_plot::plotter#1 150001.5
@@ -1993,9 +1991,9 @@ Added variable abs_u16::$1 to live range equivalence class [ abs_u16::$1 ]
 Added variable sgn_u16::$0 to live range equivalence class [ sgn_u16::$0 ]
 Added variable sgn_u16::$1 to live range equivalence class [ sgn_u16::$1 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Complete equivalence classes
 [ next#5 next#0 ]
 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ]
@@ -2035,9 +2033,9 @@ Complete equivalence classes
 [ sgn_u16::$0 ]
 [ sgn_u16::$1 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 Allocated zp[1]:2 [ next#5 next#0 ]
 Allocated zp[1]:3 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ]
 Allocated zp[1]:4 [ bitmap_init::x#2 bitmap_init::x#1 ]
@@ -2076,9 +2074,9 @@ Allocated zp[1]:59 [ abs_u16::$1 ]
 Allocated zp[1]:60 [ sgn_u16::$0 ]
 Allocated zp[1]:61 [ sgn_u16::$1 ]
 Allocated zp[2]:62 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:64 [ bitmap_plot::$0 ]
+Allocated zp[2]:64 [ bitmap_plot::$1 ]
 Allocated zp[2]:66 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:68 [ bitmap_plot::$1 ]
+Allocated zp[1]:68 [ bitmap_plot::$2 ]
 REGISTER UPLIFT POTENTIAL REGISTERS
 Equivalence Class zp[1]:37 [ bitmap_init::$4 ] has ALU potential.
 Statement [0] *BORDER_COLOR = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -2130,9 +2128,9 @@ Statement [101] *memset::dst#2 = memset::c#4 [ memset::c#4 memset::end#0 memset:
 Removing always clobbered register reg byte y as potential for zp[1]:22 [ memset::c#4 ]
 Statement [107] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( bitmap_line:11::abs_u16:47 [ next#5 bitmap_line::x2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 bitmap_line::x2#0 next#5 } { abs_u16::return#0 = abs_u16::return#4 } }  bitmap_line:11::abs_u16:50 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { next#5 = bitmap_line::x2#0 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [118] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [119] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [119] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
+Statement [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
+Statement [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte y as potential for zp[1]:2 [ next#5 next#0 ]
 Statement [0] *BORDER_COLOR = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
 Statement [1] *BG_COLOR = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -2180,9 +2178,9 @@ Statement [99] if(memset::dst#2!=memset::end#0) goto memset::@3 [ memset::c#4 me
 Statement [101] *memset::dst#2 = memset::c#4 [ memset::c#4 memset::end#0 memset::dst#2 ] ( bitmap_clear:6::memset:36 [ memset::c#4 memset::end#0 memset::dst#2 ] { }  bitmap_clear:6::memset:38 [ memset::c#4 memset::end#0 memset::dst#2 ] { }  ) always clobbers reg byte a reg byte y 
 Statement [107] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( bitmap_line:11::abs_u16:47 [ next#5 bitmap_line::x2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 bitmap_line::x2#0 next#5 } { abs_u16::return#0 = abs_u16::return#4 } }  bitmap_line:11::abs_u16:50 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { next#5 = bitmap_line::x2#0 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [118] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [119] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [119] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
+Statement [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
+Statement [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( bitmap_line:11::bitmap_plot:67 [ next#5 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:11::bitmap_plot:78 [ next#5 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:11::bitmap_plot:84 [ next#5 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { next#5 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:11::bitmap_plot:93 [ next#5 ] { { next#5 = bitmap_line::x2#0 } }  ) always clobbers reg byte a reg byte y 
 Potential registers zp[1]:2 [ next#5 next#0 ] : zp[1]:2 , reg byte x , 
 Potential registers zp[1]:3 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] : zp[1]:3 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:4 [ bitmap_init::x#2 bitmap_init::x#1 ] : zp[1]:4 , reg byte a , reg byte x , reg byte y , 
@@ -2221,12 +2219,12 @@ Potential registers zp[1]:59 [ abs_u16::$1 ] : zp[1]:59 , reg byte a , reg byte
 Potential registers zp[1]:60 [ sgn_u16::$0 ] : zp[1]:60 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:61 [ sgn_u16::$1 ] : zp[1]:61 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:62 [ bitmap_plot::plotter#0 ] : zp[2]:62 , 
-Potential registers zp[2]:64 [ bitmap_plot::$0 ] : zp[2]:64 , 
+Potential registers zp[2]:64 [ bitmap_plot::$1 ] : zp[2]:64 , 
 Potential registers zp[2]:66 [ bitmap_plot::plotter#1 ] : zp[2]:66 , 
-Potential registers zp[1]:68 [ bitmap_plot::$1 ] : zp[1]:68 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:68 [ bitmap_plot::$2 ] : zp[1]:68 , reg byte a , reg byte x , reg byte y , 
 
 REGISTER UPLIFT SCOPES
-Uplift Scope [bitmap_plot] 260,311: zp[1]:31 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#1 bitmap_plot::y#3 ] 200,002: zp[2]:64 [ bitmap_plot::$0 ] 200,002: zp[1]:68 [ bitmap_plot::$1 ] 150,001.5: zp[2]:66 [ bitmap_plot::plotter#1 ] 75,129.25: zp[2]:32 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#1 bitmap_plot::x#3 ] 50,000.5: zp[2]:62 [ bitmap_plot::plotter#0 ] 
+Uplift Scope [bitmap_plot] 260,311: zp[1]:31 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#1 bitmap_plot::y#3 ] 200,002: zp[2]:64 [ bitmap_plot::$1 ] 200,002: zp[1]:68 [ bitmap_plot::$2 ] 150,001.5: zp[2]:66 [ bitmap_plot::plotter#1 ] 75,129.25: zp[2]:32 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#1 bitmap_plot::x#3 ] 50,000.5: zp[2]:62 [ bitmap_plot::plotter#0 ] 
 Uplift Scope [bitmap_line] 69,036.46: zp[2]:12 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x#12 bitmap_line::x#1 ] 55,005.5: zp[2]:14 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y#1 bitmap_line::y#2 ] 52,560.77: zp[2]:10 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] 52,560.77: zp[2]:16 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] 868.77: zp[2]:46 [ bitmap_line::dy#0 ] 800.18: zp[2]:42 [ bitmap_line::dx#0 ] 773.19: zp[2]:54 [ bitmap_line::sy#0 ] 693.21: zp[2]:50 [ bitmap_line::sx#0 ] 340.47: zp[2]:34 [ bitmap_line::x2#0 ] 
 Uplift Scope [abs_u16] 3,531: zp[2]:25 [ abs_u16::return#4 abs_u16::return#2 abs_u16::w#2 abs_u16::w#0 ] 2,002: zp[1]:58 [ abs_u16::$0 ] 2,002: zp[1]:59 [ abs_u16::$1 ] 202: zp[2]:40 [ abs_u16::return#0 ] 202: zp[2]:44 [ abs_u16::return#1 ] 
 Uplift Scope [sgn_u16] 2,002: zp[1]:60 [ sgn_u16::$0 ] 2,002: zp[1]:61 [ sgn_u16::$1 ] 1,304: zp[2]:27 [ sgn_u16::w#2 sgn_u16::w#0 ] 202: zp[2]:48 [ sgn_u16::return#0 ] 202: zp[2]:52 [ sgn_u16::return#1 ] 50.5: zp[2]:29 [ sgn_u16::return#4 ] 
@@ -2240,7 +2238,7 @@ Uplift Scope [MOS6581_SID]
 Uplift Scope [bitmap_clear] 
 Uplift Scope [main] 
 
-Uplifting [bitmap_plot] best 36707 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:64 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:66 [ bitmap_plot::plotter#1 ] zp[2]:32 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:62 [ bitmap_plot::plotter#0 ] 
+Uplifting [bitmap_plot] best 36707 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:64 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:66 [ bitmap_plot::plotter#1 ] zp[2]:32 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:62 [ bitmap_plot::plotter#0 ] 
 Uplifting [bitmap_line] best 36707 combination zp[2]:12 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x#12 bitmap_line::x#1 ] zp[2]:14 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y#1 bitmap_line::y#2 ] zp[2]:10 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] zp[2]:16 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] zp[2]:46 [ bitmap_line::dy#0 ] zp[2]:42 [ bitmap_line::dx#0 ] zp[2]:54 [ bitmap_line::sy#0 ] zp[2]:50 [ bitmap_line::sx#0 ] zp[2]:34 [ bitmap_line::x2#0 ] 
 Uplifting [abs_u16] best 36697 combination zp[2]:25 [ abs_u16::return#4 abs_u16::return#2 abs_u16::w#2 abs_u16::w#0 ] reg byte a [ abs_u16::$0 ] reg byte a [ abs_u16::$1 ] zp[2]:40 [ abs_u16::return#0 ] zp[2]:44 [ abs_u16::return#1 ] 
 Uplifting [sgn_u16] best 36687 combination reg byte a [ sgn_u16::$0 ] reg byte a [ sgn_u16::$1 ] zp[2]:27 [ sgn_u16::w#2 sgn_u16::w#0 ] zp[2]:48 [ sgn_u16::return#0 ] zp[2]:52 [ sgn_u16::return#1 ] zp[2]:29 [ sgn_u16::return#4 ] 
@@ -2289,7 +2287,7 @@ Allocated (was zp[1]:36) zp[1]:16 [ bitmap_init::$7 next#5 next#0 ]
 Allocated (was zp[2]:42) zp[2]:17 [ bitmap_line::dx#0 ]
 Allocated (was zp[2]:50) zp[2]:19 [ bitmap_line::sx#0 ]
 Allocated (was zp[2]:62) zp[2]:21 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 ]
-Allocated (was zp[2]:64) zp[2]:23 [ bitmap_plot::$0 ]
+Allocated (was zp[2]:64) zp[2]:23 [ bitmap_plot::$1 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
@@ -3081,7 +3079,7 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(8) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $17
+    .label __1 = $17
     .label plotter = $15
     .label x = 8
     // [118] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -3089,24 +3087,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [119] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [119] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [121] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [121] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -3369,8 +3367,8 @@ constant word bitmap_line::y1#0 y1 = 0
 word bitmap_line::y2
 constant word bitmap_line::y2#0 y2 = $64
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:23 200002.0
-byte~ bitmap_plot::$1 reg byte x 200002.0
+word~ bitmap_plot::$1 zp[2]:23 200002.0
+byte~ bitmap_plot::$2 reg byte x 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:21 50000.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:21 150001.5
@@ -3444,8 +3442,8 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:21 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 ]
-zp[2]:23 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:23 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]
 
 
 FINAL ASSEMBLER
@@ -4202,37 +4200,37 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(8) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $17
+    .label __1 = $17
     .label plotter = $15
     .label x = 8
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [118] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [119] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [119] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [120] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [121] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [121] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [122] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y

src/test/ref/bitmap-line-anim-1.sym

@@ -90,8 +90,8 @@ constant word bitmap_line::y1#0 y1 = 0
 word bitmap_line::y2
 constant word bitmap_line::y2#0 y2 = $64
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:23 200002.0
-byte~ bitmap_plot::$1 reg byte x 200002.0
+word~ bitmap_plot::$1 zp[2]:23 200002.0
+byte~ bitmap_plot::$2 reg byte x 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:21 50000.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:21 150001.5
@@ -165,5 +165,5 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:21 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 ]
-zp[2]:23 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:23 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]

src/test/ref/bitmap-line-anim-2.asm

@@ -488,10 +488,10 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($a) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $17
+    .label __1 = $17
     .label plotter = $15
     .label x = $a
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -499,17 +499,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x

src/test/ref/bitmap-line-anim-2.cfg

@@ -237,10 +237,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [112] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_line::x1#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [112] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [113] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [114] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [116] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [114] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [116] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [118] return 

src/test/ref/bitmap-line-anim-2.log

@@ -122,11 +122,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_line::@6 bitmap_line::@9
   bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#4], bitmap_plot_ylo[bitmap_plot::y#4] }
-  bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -852,8 +853,9 @@ word bitmap_line::y2#7
 word bitmap_line::y2#8
 word bitmap_line::y2#9
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -979,8 +981,6 @@ word sgn_u16::w#0
 word sgn_u16::w#1
 word sgn_u16::w#2
 
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#4] w= (byte)bitmap_plot_ylo[bitmap_plot::y#4]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) 1 in bitmap_init::bits#1 = bitmap_init::bits#3 >> 1
 Adding number conversion cast (unumber) 0 in bitmap_init::$0 = bitmap_init::bits#1 == 0
 Adding number conversion cast (unumber) $80 in bitmap_init::bits#2 = $80
@@ -995,8 +995,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#1 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#4 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#4 & (unumber)$fff8
 Adding number conversion cast (unumber) 0 in bitmap_line::$4 = bitmap_line::dx#1 == 0
 Adding number conversion cast (unumber) 0 in bitmap_line::$5 = bitmap_line::dy#0 == 0
 Adding number conversion cast (unumber) 2 in bitmap_line::$20 = bitmap_line::dy#2 / 2
@@ -1054,8 +1054,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#4]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#4]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast 0
 Simplifying constant integer cast 0
@@ -1120,7 +1118,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
 Inferred type updated to word in bitmap_line::$20 = bitmap_line::dy#2 / 2
 Inferred type updated to word in bitmap_line::$15 = bitmap_line::dx#3 / 2
 Inferred type updated to byte in abs_u16::$1 = abs_u16::$0 & $80
@@ -1382,7 +1380,7 @@ Constant bitmap_clear::col#0 = bitmap_clear::$0+bitmap_clear::bgcol#0
 Successful SSA optimization Pass2ConstantIdentification
 Constant memset::c#0 = bitmap_clear::col#0
 Successful SSA optimization Pass2ConstantIdentification
-Inlining Noop Cast [25] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [25] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Successful SSA optimization Pass2NopCastInlining
 Inlining Noop Cast [79] memset::$4 = (byte*)memset::str#3 keeping memset::str#3
 Inlining Noop Cast [81] memset::dst#0 = (byte*)memset::str#3 keeping memset::str#3
@@ -1797,10 +1795,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [112] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_line::x1#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [112] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [113] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [114] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [116] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [114] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [116] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [118] return 
@@ -1886,8 +1884,8 @@ word bitmap_line::y#7 10001.0
 word bitmap_line::y1
 word bitmap_line::y2
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 200002.0
-byte~ bitmap_plot::$1 200002.0
+word~ bitmap_plot::$1 200002.0
+byte~ bitmap_plot::$2 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 50000.5
 byte* bitmap_plot::plotter#1 150001.5
@@ -1970,9 +1968,9 @@ Added variable abs_u16::$1 to live range equivalence class [ abs_u16::$1 ]
 Added variable sgn_u16::$0 to live range equivalence class [ sgn_u16::$0 ]
 Added variable sgn_u16::$1 to live range equivalence class [ sgn_u16::$1 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Complete equivalence classes
 [ next#6 next#11 next#0 ]
 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ]
@@ -2011,9 +2009,9 @@ Complete equivalence classes
 [ sgn_u16::$0 ]
 [ sgn_u16::$1 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 Allocated zp[2]:2 [ next#6 next#11 next#0 ]
 Allocated zp[1]:4 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ]
 Allocated zp[1]:5 [ bitmap_init::x#2 bitmap_init::x#1 ]
@@ -2051,9 +2049,9 @@ Allocated zp[1]:58 [ abs_u16::$1 ]
 Allocated zp[1]:59 [ sgn_u16::$0 ]
 Allocated zp[1]:60 [ sgn_u16::$1 ]
 Allocated zp[2]:61 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:63 [ bitmap_plot::$0 ]
+Allocated zp[2]:63 [ bitmap_plot::$1 ]
 Allocated zp[2]:65 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:67 [ bitmap_plot::$1 ]
+Allocated zp[1]:67 [ bitmap_plot::$2 ]
 REGISTER UPLIFT POTENTIAL REGISTERS
 Equivalence Class zp[1]:36 [ bitmap_init::$4 ] has ALU potential.
 Statement [0] *BORDER_COLOR = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -2103,9 +2101,9 @@ Statement [96] *memset::dst#2 = memset::c#4 [ memset::c#4 memset::end#0 memset::
 Removing always clobbered register reg byte y as potential for zp[1]:21 [ memset::c#4 ]
 Statement [102] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( bitmap_line:9::abs_u16:42 [ next#6 bitmap_line::x2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 bitmap_line::x2#0 next#6 } { abs_u16::return#0 = abs_u16::return#4 } }  bitmap_line:9::abs_u16:45 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { next#6 = bitmap_line::x2#0 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [113] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [114] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [114] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
+Statement [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
+Statement [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a reg byte y 
 Statement [0] *BORDER_COLOR = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
 Statement [1] *BG_COLOR = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
 Statement [2] *D011 = VICII_BMM|VICII_DEN|VICII_RSEL|3 [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -2151,9 +2149,9 @@ Statement [94] if(memset::dst#2!=memset::end#0) goto memset::@3 [ memset::c#4 me
 Statement [96] *memset::dst#2 = memset::c#4 [ memset::c#4 memset::end#0 memset::dst#2 ] ( bitmap_clear:6::memset:37 [ memset::c#4 memset::end#0 memset::dst#2 ] { }  bitmap_clear:6::memset:39 [ memset::c#4 memset::end#0 memset::dst#2 ] { }  ) always clobbers reg byte a reg byte y 
 Statement [102] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( bitmap_line:9::abs_u16:42 [ next#6 bitmap_line::x2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 bitmap_line::x2#0 next#6 } { abs_u16::return#0 = abs_u16::return#4 } }  bitmap_line:9::abs_u16:45 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { next#6 = bitmap_line::x2#0 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [113] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [114] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
-Statement [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [114] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
+Statement [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a 
+Statement [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( bitmap_line:9::bitmap_plot:62 [ next#6 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:9::bitmap_plot:73 [ next#6 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:9::bitmap_plot:79 [ next#6 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { next#6 = bitmap_line::x2#0 } { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:9::bitmap_plot:88 [ next#6 ] { { next#6 = bitmap_line::x2#0 } }  ) always clobbers reg byte a reg byte y 
 Potential registers zp[2]:2 [ next#6 next#11 next#0 ] : zp[2]:2 , 
 Potential registers zp[1]:4 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] : zp[1]:4 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:5 [ bitmap_init::x#2 bitmap_init::x#1 ] : zp[1]:5 , reg byte a , reg byte x , reg byte y , 
@@ -2191,12 +2189,12 @@ Potential registers zp[1]:58 [ abs_u16::$1 ] : zp[1]:58 , reg byte a , reg byte
 Potential registers zp[1]:59 [ sgn_u16::$0 ] : zp[1]:59 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:60 [ sgn_u16::$1 ] : zp[1]:60 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:61 [ bitmap_plot::plotter#0 ] : zp[2]:61 , 
-Potential registers zp[2]:63 [ bitmap_plot::$0 ] : zp[2]:63 , 
+Potential registers zp[2]:63 [ bitmap_plot::$1 ] : zp[2]:63 , 
 Potential registers zp[2]:65 [ bitmap_plot::plotter#1 ] : zp[2]:65 , 
-Potential registers zp[1]:67 [ bitmap_plot::$1 ] : zp[1]:67 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:67 [ bitmap_plot::$2 ] : zp[1]:67 , reg byte a , reg byte x , reg byte y , 
 
 REGISTER UPLIFT SCOPES
-Uplift Scope [bitmap_plot] 260,311: zp[1]:30 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#1 bitmap_plot::y#3 ] 200,002: zp[2]:63 [ bitmap_plot::$0 ] 200,002: zp[1]:67 [ bitmap_plot::$1 ] 150,001.5: zp[2]:65 [ bitmap_plot::plotter#1 ] 75,129.25: zp[2]:31 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#1 bitmap_plot::x#3 ] 50,000.5: zp[2]:61 [ bitmap_plot::plotter#0 ] 
+Uplift Scope [bitmap_plot] 260,311: zp[1]:30 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#1 bitmap_plot::y#3 ] 200,002: zp[2]:63 [ bitmap_plot::$1 ] 200,002: zp[1]:67 [ bitmap_plot::$2 ] 150,001.5: zp[2]:65 [ bitmap_plot::plotter#1 ] 75,129.25: zp[2]:31 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#1 bitmap_plot::x#3 ] 50,000.5: zp[2]:61 [ bitmap_plot::plotter#0 ] 
 Uplift Scope [bitmap_line] 69,036.46: zp[2]:11 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x#12 bitmap_line::x#1 ] 55,005.5: zp[2]:13 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y#1 bitmap_line::y#2 ] 52,560.77: zp[2]:9 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] 52,560.77: zp[2]:15 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] 868.77: zp[2]:45 [ bitmap_line::dy#0 ] 800.18: zp[2]:41 [ bitmap_line::dx#0 ] 773.19: zp[2]:53 [ bitmap_line::sy#0 ] 693.21: zp[2]:49 [ bitmap_line::sx#0 ] 340.47: zp[2]:33 [ bitmap_line::x2#0 ] 
 Uplift Scope [abs_u16] 3,531: zp[2]:24 [ abs_u16::return#4 abs_u16::return#2 abs_u16::w#2 abs_u16::w#0 ] 2,002: zp[1]:57 [ abs_u16::$0 ] 2,002: zp[1]:58 [ abs_u16::$1 ] 202: zp[2]:39 [ abs_u16::return#0 ] 202: zp[2]:43 [ abs_u16::return#1 ] 
 Uplift Scope [sgn_u16] 2,002: zp[1]:59 [ sgn_u16::$0 ] 2,002: zp[1]:60 [ sgn_u16::$1 ] 1,304: zp[2]:26 [ sgn_u16::w#2 sgn_u16::w#0 ] 202: zp[2]:47 [ sgn_u16::return#0 ] 202: zp[2]:51 [ sgn_u16::return#1 ] 50.5: zp[2]:28 [ sgn_u16::return#4 ] 
@@ -2209,7 +2207,7 @@ Uplift Scope [MOS6581_SID]
 Uplift Scope [bitmap_clear] 
 Uplift Scope [main] 
 
-Uplifting [bitmap_plot] best 36602 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:63 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:65 [ bitmap_plot::plotter#1 ] zp[2]:31 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:61 [ bitmap_plot::plotter#0 ] 
+Uplifting [bitmap_plot] best 36602 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:63 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:65 [ bitmap_plot::plotter#1 ] zp[2]:31 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:61 [ bitmap_plot::plotter#0 ] 
 Uplifting [bitmap_line] best 36602 combination zp[2]:11 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x#12 bitmap_line::x#1 ] zp[2]:13 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y#1 bitmap_line::y#2 ] zp[2]:9 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] zp[2]:15 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] zp[2]:45 [ bitmap_line::dy#0 ] zp[2]:41 [ bitmap_line::dx#0 ] zp[2]:53 [ bitmap_line::sy#0 ] zp[2]:49 [ bitmap_line::sx#0 ] zp[2]:33 [ bitmap_line::x2#0 ] 
 Uplifting [abs_u16] best 36592 combination zp[2]:24 [ abs_u16::return#4 abs_u16::return#2 abs_u16::w#2 abs_u16::w#0 ] reg byte a [ abs_u16::$0 ] reg byte a [ abs_u16::$1 ] zp[2]:39 [ abs_u16::return#0 ] zp[2]:43 [ abs_u16::return#1 ] 
 Uplifting [sgn_u16] best 36582 combination reg byte a [ sgn_u16::$0 ] reg byte a [ sgn_u16::$1 ] zp[2]:26 [ sgn_u16::w#2 sgn_u16::w#0 ] zp[2]:47 [ sgn_u16::return#0 ] zp[2]:51 [ sgn_u16::return#1 ] zp[2]:28 [ sgn_u16::return#4 ] 
@@ -2254,7 +2252,7 @@ Allocated (was zp[1]:35) zp[1]:16 [ bitmap_init::$7 ]
 Allocated (was zp[2]:41) zp[2]:17 [ bitmap_line::dx#0 ]
 Allocated (was zp[2]:49) zp[2]:19 [ bitmap_line::sx#0 ]
 Allocated (was zp[2]:61) zp[2]:21 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 ]
-Allocated (was zp[2]:63) zp[2]:23 [ bitmap_plot::$0 ]
+Allocated (was zp[2]:63) zp[2]:23 [ bitmap_plot::$1 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
@@ -3024,7 +3022,7 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($a) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $17
+    .label __1 = $17
     .label plotter = $15
     .label x = $a
     // [113] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -3032,24 +3030,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [114] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [114] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [116] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [116] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -3320,8 +3318,8 @@ constant word bitmap_line::y1#0 y1 = 0
 word bitmap_line::y2
 constant word bitmap_line::y2#0 y2 = $64
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:23 200002.0
-byte~ bitmap_plot::$1 reg byte x 200002.0
+word~ bitmap_plot::$1 zp[2]:23 200002.0
+byte~ bitmap_plot::$2 reg byte x 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:21 50000.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:21 150001.5
@@ -3392,8 +3390,8 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:21 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 ]
-zp[2]:23 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:23 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]
 
 
 FINAL ASSEMBLER
@@ -4123,37 +4121,37 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($a) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $17
+    .label __1 = $17
     .label plotter = $15
     .label x = $a
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [113] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [114] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [114] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [115] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [116] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [116] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [117] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y

src/test/ref/bitmap-line-anim-2.sym

@@ -91,8 +91,8 @@ constant word bitmap_line::y1#0 y1 = 0
 word bitmap_line::y2
 constant word bitmap_line::y2#0 y2 = $64
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:23 200002.0
-byte~ bitmap_plot::$1 reg byte x 200002.0
+word~ bitmap_plot::$1 zp[2]:23 200002.0
+byte~ bitmap_plot::$2 reg byte x 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:21 50000.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:21 150001.5
@@ -163,5 +163,5 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:21 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 ]
-zp[2]:23 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:23 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]

src/test/ref/bitmap-plot-0.asm

@@ -326,10 +326,10 @@ init_irq: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(2) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $c
+    .label __1 = $c
     .label plotter = $a
     .label x = 2
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -337,17 +337,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x

src/test/ref/bitmap-plot-0.cfg

@@ -160,10 +160,10 @@ init_irq::@return: scope:[init_irq]  from init_irq
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@2
   [71] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0]
-  [72] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8
-  [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [74] bitmap_plot::$1 = byte0  bitmap_plot::x#0
-  [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [72] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8
+  [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [74] bitmap_plot::$2 = byte0  bitmap_plot::x#0
+  [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [76] return 

src/test/ref/bitmap-plot-0.log

@@ -127,11 +127,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@2
   bitmap_plot::x#1 = phi( main::@2/bitmap_plot::x#0 )
   bitmap_plot::y#1 = phi( main::@2/bitmap_plot::y#0 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#1], bitmap_plot_ylo[bitmap_plot::y#1] }
-  bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#1
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#1] w= bitmap_plot_ylo[bitmap_plot::y#1]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#1
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -508,8 +509,9 @@ byte* bitmap_init::yoffs#2
 byte* bitmap_init::yoffs#3
 byte* bitmap_init::yoffs#4
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -676,8 +678,6 @@ void* memset::str#5
 void* memset::str#6
 constant byte* plots_per_frame[$100]  = { fill( $100, 0) }
 
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#1] w= (byte)bitmap_plot_ylo[bitmap_plot::y#1]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) 1 in bitmap_init::bits#1 = bitmap_init::bits#3 >> 1
 Adding number conversion cast (unumber) 0 in bitmap_init::$0 = bitmap_init::bits#1 == 0
 Adding number conversion cast (unumber) $80 in bitmap_init::bits#2 = $80
@@ -692,8 +692,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#1 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#1 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#1 & (unumber)$fff8
 Adding number conversion cast (unumber) 0 in memset::$0 = memset::num#2 > 0
 Adding number conversion cast (unumber) VICII_BMM|VICII_DEN|VICII_RSEL|3 in *D011 = VICII_BMM|VICII_DEN|VICII_RSEL|3
 Adding number conversion cast (unumber) 3 in *D011 = ((unumber)) VICII_BMM|VICII_DEN|VICII_RSEL|3
@@ -741,8 +741,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#1]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#1]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast 0
 Simplifying constant integer cast VICII_BMM|VICII_DEN|VICII_RSEL|(unumber)3
@@ -787,7 +785,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
 Inferred type updated to word in main::toD0181_$0 = main::toD0181_$7 & $3fff
 Inferred type updated to word in main::toD0181_$1 = main::toD0181_$0 * 4
 Inferred type updated to byte in main::toD0181_$4 = main::toD0181_$3 / 4
@@ -996,7 +994,7 @@ Constant right-side identified [43] main::toD0181_return#0 = main::toD0181_$2 |
 Successful SSA optimization Pass2ConstantRValueConsolidation
 Constant main::toD0181_return#0 = main::toD0181_$2|main::toD0181_$5
 Successful SSA optimization Pass2ConstantIdentification
-Inlining Noop Cast [24] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [24] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Successful SSA optimization Pass2NopCastInlining
 Inlining Noop Cast [32] memset::$4 = (byte*)memset::str#3 keeping memset::str#3
 Inlining Noop Cast [34] memset::dst#0 = (byte*)memset::str#3 keeping memset::str#3
@@ -1294,10 +1292,10 @@ init_irq::@return: scope:[init_irq]  from init_irq
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@2
   [71] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0]
-  [72] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8
-  [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [74] bitmap_plot::$1 = byte0  bitmap_plot::x#0
-  [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [72] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8
+  [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [74] bitmap_plot::$2 = byte0  bitmap_plot::x#0
+  [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [76] return 
@@ -1356,8 +1354,8 @@ byte* bitmap_init::yoffs#1 2002.0
 byte* bitmap_init::yoffs#2 625.625
 byte* bitmap_init::yoffs#4 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 2002.0
-byte~ bitmap_plot::$1 2002.0
+word~ bitmap_plot::$1 2002.0
+byte~ bitmap_plot::$2 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 500.5
 byte* bitmap_plot::plotter#1 1501.5
@@ -1423,9 +1421,9 @@ Added variable bitmap_init::$4 to live range equivalence class [ bitmap_init::$4
 Added variable bitmap_init::$5 to live range equivalence class [ bitmap_init::$5 ]
 Added variable bitmap_init::$6 to live range equivalence class [ bitmap_init::$6 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Added variable memset::end#0 to live range equivalence class [ memset::end#0 ]
 Complete equivalence classes
 [ main::x#2 main::x#1 ]
@@ -1448,9 +1446,9 @@ Complete equivalence classes
 [ bitmap_init::$5 ]
 [ bitmap_init::$6 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 [ memset::end#0 ]
 Allocated zp[2]:2 [ main::x#2 main::x#1 ]
 Allocated zp[1]:4 [ main::y#2 main::y#1 ]
@@ -1472,9 +1470,9 @@ Allocated zp[1]:25 [ bitmap_init::$4 ]
 Allocated zp[1]:26 [ bitmap_init::$5 ]
 Allocated zp[1]:27 [ bitmap_init::$6 ]
 Allocated zp[2]:28 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:30 [ bitmap_plot::$0 ]
+Allocated zp[2]:30 [ bitmap_plot::$1 ]
 Allocated zp[2]:32 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:34 [ bitmap_plot::$1 ]
+Allocated zp[1]:34 [ bitmap_plot::$2 ]
 Allocated zp[2]:35 [ memset::end#0 ]
 REGISTER UPLIFT POTENTIAL REGISTERS
 Equivalence Class zp[1]:25 [ bitmap_init::$4 ] has ALU potential.
@@ -1508,9 +1506,9 @@ Statement [66] *RASTER = 0 [ ] ( main:3::init_irq:18 [ frame_cnt ] { }  ) always
 Statement [67] *IRQ_ENABLE = IRQ_RASTER [ ] ( main:3::init_irq:18 [ frame_cnt ] { }  ) always clobbers reg byte a 
 Statement [68] *HARDWARE_IRQ = &irq [ ] ( main:3::init_irq:18 [ frame_cnt ] { }  ) always clobbers reg byte a 
 Statement [71] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] [ bitmap_plot::x#0 bitmap_plot::plotter#0 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#0 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
-Statement [72] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
-Statement [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
-Statement [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a reg byte y 
+Statement [72] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
+Statement [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
+Statement [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte y as potential for zp[1]:4 [ main::y#2 main::y#1 ]
 Removing always clobbered register reg byte y as potential for zp[1]:7 [ main::vy#2 main::vy#8 main::vy#1 ]
 Statement [78] if(memset::num#2<=0) goto memset::@return [ memset::num#2 memset::str#3 memset::c#4 ] ( main:3::bitmap_clear:14::memset:57 [ frame_cnt memset::num#2 memset::str#3 memset::c#4 ] { }  main:3::bitmap_clear:14::memset:59 [ frame_cnt memset::num#2 memset::str#3 memset::c#4 ] { }  ) always clobbers reg byte a 
@@ -1548,9 +1546,9 @@ Statement [66] *RASTER = 0 [ ] ( main:3::init_irq:18 [ frame_cnt ] { }  ) always
 Statement [67] *IRQ_ENABLE = IRQ_RASTER [ ] ( main:3::init_irq:18 [ frame_cnt ] { }  ) always clobbers reg byte a 
 Statement [68] *HARDWARE_IRQ = &irq [ ] ( main:3::init_irq:18 [ frame_cnt ] { }  ) always clobbers reg byte a 
 Statement [71] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] [ bitmap_plot::x#0 bitmap_plot::plotter#0 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#0 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
-Statement [72] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
-Statement [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
-Statement [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a reg byte y 
+Statement [72] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
+Statement [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a 
+Statement [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( main:3::bitmap_plot:22 [ frame_cnt main::x#2 main::y#2 main::vx#2 main::vy#2 ] { { bitmap_plot::x#0 = main::x#2 } { bitmap_plot::y#0 = main::y#2 } }  ) always clobbers reg byte a reg byte y 
 Statement [78] if(memset::num#2<=0) goto memset::@return [ memset::num#2 memset::str#3 memset::c#4 ] ( main:3::bitmap_clear:14::memset:57 [ frame_cnt memset::num#2 memset::str#3 memset::c#4 ] { }  main:3::bitmap_clear:14::memset:59 [ frame_cnt memset::num#2 memset::str#3 memset::c#4 ] { }  ) always clobbers reg byte a 
 Statement [79] memset::end#0 = (byte*)memset::str#3 + memset::num#2 [ memset::str#3 memset::c#4 memset::end#0 ] ( main:3::bitmap_clear:14::memset:57 [ frame_cnt memset::str#3 memset::c#4 memset::end#0 ] { }  main:3::bitmap_clear:14::memset:59 [ frame_cnt memset::str#3 memset::c#4 memset::end#0 ] { }  ) always clobbers reg byte a 
 Statement [80] memset::dst#4 = (byte*)memset::str#3 [ memset::c#4 memset::end#0 memset::dst#4 ] ( main:3::bitmap_clear:14::memset:57 [ frame_cnt memset::c#4 memset::end#0 memset::dst#4 ] { }  main:3::bitmap_clear:14::memset:59 [ frame_cnt memset::c#4 memset::end#0 memset::dst#4 ] { }  ) always clobbers reg byte a 
@@ -1576,15 +1574,15 @@ Potential registers zp[1]:25 [ bitmap_init::$4 ] : zp[1]:25 , reg byte a , reg b
 Potential registers zp[1]:26 [ bitmap_init::$5 ] : zp[1]:26 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:27 [ bitmap_init::$6 ] : zp[1]:27 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:28 [ bitmap_plot::plotter#0 ] : zp[2]:28 , 
-Potential registers zp[2]:30 [ bitmap_plot::$0 ] : zp[2]:30 , 
+Potential registers zp[2]:30 [ bitmap_plot::$1 ] : zp[2]:30 , 
 Potential registers zp[2]:32 [ bitmap_plot::plotter#1 ] : zp[2]:32 , 
-Potential registers zp[1]:34 [ bitmap_plot::$1 ] : zp[1]:34 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:34 [ bitmap_plot::$2 ] : zp[1]:34 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:35 [ memset::end#0 ] : zp[2]:35 , 
 
 REGISTER UPLIFT SCOPES
 Uplift Scope [memset] 35,672.33: zp[2]:18 [ memset::dst#2 memset::dst#4 memset::dst#1 ] 1,833.67: zp[2]:35 [ memset::end#0 ] 1,250.12: zp[1]:17 [ memset::c#4 ] 1,001: zp[2]:13 [ memset::num#2 ] 0: zp[2]:15 [ memset::str#3 ] 
 Uplift Scope [bitmap_init] 3,628.62: zp[2]:11 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] 3,169.83: zp[1]:8 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] 2,002: zp[1]:9 [ bitmap_init::x#2 bitmap_init::x#1 ] 2,002: zp[1]:10 [ bitmap_init::y#2 bitmap_init::y#1 ] 2,002: zp[1]:25 [ bitmap_init::$4 ] 2,002: zp[1]:26 [ bitmap_init::$5 ] 2,002: zp[1]:27 [ bitmap_init::$6 ] 500.5: zp[1]:24 [ bitmap_init::$7 ] 
-Uplift Scope [bitmap_plot] 2,103: zp[1]:23 [ bitmap_plot::y#0 ] 2,002: zp[2]:30 [ bitmap_plot::$0 ] 2,002: zp[1]:34 [ bitmap_plot::$1 ] 1,501.5: zp[2]:32 [ bitmap_plot::plotter#1 ] 500.5: zp[2]:28 [ bitmap_plot::plotter#0 ] 420.6: zp[2]:21 [ bitmap_plot::x#0 ] 
+Uplift Scope [bitmap_plot] 2,103: zp[1]:23 [ bitmap_plot::y#0 ] 2,002: zp[2]:30 [ bitmap_plot::$1 ] 2,002: zp[1]:34 [ bitmap_plot::$2 ] 1,501.5: zp[2]:32 [ bitmap_plot::plotter#1 ] 500.5: zp[2]:28 [ bitmap_plot::plotter#0 ] 420.6: zp[2]:21 [ bitmap_plot::x#0 ] 
 Uplift Scope [main] 387.17: zp[1]:7 [ main::vy#2 main::vy#8 main::vy#1 ] 303: zp[2]:5 [ main::vx#2 main::vx#6 main::vx#1 ] 112.48: zp[2]:2 [ main::x#2 main::x#1 ] 101: zp[1]:4 [ main::y#2 main::y#1 ] 
 Uplift Scope [] 7.78: zp[1]:20 [ frame_cnt ] 
 Uplift Scope [MOS6526_CIA] 
@@ -1598,7 +1596,7 @@ Uplift Scope [__start]
 Uplifting [memset] best 4870 combination zp[2]:18 [ memset::dst#2 memset::dst#4 memset::dst#1 ] zp[2]:35 [ memset::end#0 ] reg byte x [ memset::c#4 ] zp[2]:13 [ memset::num#2 ] zp[2]:15 [ memset::str#3 ] 
 Uplifting [bitmap_init] best 4420 combination zp[2]:11 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] reg byte a [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] reg byte x [ bitmap_init::x#2 bitmap_init::x#1 ] reg byte x [ bitmap_init::y#2 bitmap_init::y#1 ] reg byte a [ bitmap_init::$4 ] zp[1]:26 [ bitmap_init::$5 ] zp[1]:27 [ bitmap_init::$6 ] zp[1]:24 [ bitmap_init::$7 ] 
 Limited combination testing to 100 combinations of 15360 possible.
-Uplifting [bitmap_plot] best 4381 combination reg byte x [ bitmap_plot::y#0 ] zp[2]:30 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:32 [ bitmap_plot::plotter#1 ] zp[2]:28 [ bitmap_plot::plotter#0 ] zp[2]:21 [ bitmap_plot::x#0 ] 
+Uplifting [bitmap_plot] best 4381 combination reg byte x [ bitmap_plot::y#0 ] zp[2]:30 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:32 [ bitmap_plot::plotter#1 ] zp[2]:28 [ bitmap_plot::plotter#0 ] zp[2]:21 [ bitmap_plot::x#0 ] 
 Uplifting [main] best 4381 combination zp[1]:7 [ main::vy#2 main::vy#8 main::vy#1 ] zp[2]:5 [ main::vx#2 main::vx#6 main::vx#1 ] zp[2]:2 [ main::x#2 main::x#1 ] zp[1]:4 [ main::y#2 main::y#1 ] 
 Uplifting [] best 4381 combination zp[1]:20 [ frame_cnt ] 
 Uplifting [MOS6526_CIA] best 4381 combination 
@@ -1626,11 +1624,11 @@ Coalescing zero page register [ zp[2]:15 [ memset::str#3 ] ] with [ zp[2]:18 [ m
 Coalescing zero page register [ zp[2]:28 [ bitmap_plot::plotter#0 ] ] with [ zp[2]:32 [ bitmap_plot::plotter#1 ] ] - score: 1
 Coalescing zero page register [ zp[2]:13 [ memset::num#2 memset::end#0 ] ] with [ zp[2]:11 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] ]
 Coalescing zero page register [ zp[2]:28 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 ] ] with [ zp[2]:15 [ memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ] ]
-Coalescing zero page register [ zp[2]:30 [ bitmap_plot::$0 ] ] with [ zp[2]:13 [ memset::num#2 memset::end#0 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] ]
+Coalescing zero page register [ zp[2]:30 [ bitmap_plot::$1 ] ] with [ zp[2]:13 [ memset::num#2 memset::end#0 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] ]
 Allocated (was zp[1]:20) zp[1]:8 [ frame_cnt ]
 Allocated (was zp[1]:24) zp[1]:9 [ bitmap_init::$7 ]
 Allocated (was zp[2]:28) zp[2]:10 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ]
-Allocated (was zp[2]:30) zp[2]:12 [ bitmap_plot::$0 memset::num#2 memset::end#0 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ]
+Allocated (was zp[2]:30) zp[2]:12 [ bitmap_plot::$1 memset::num#2 memset::end#0 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ]
 Interrupt procedure irq clobbers AnzP
 
 ASSEMBLER BEFORE OPTIMIZATION
@@ -2138,7 +2136,7 @@ init_irq: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(2) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $c
+    .label __1 = $c
     .label plotter = $a
     .label x = 2
     // [71] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -2146,24 +2144,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [72] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [72] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [74] bitmap_plot::$1 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
+    // [74] bitmap_plot::$2 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -2395,8 +2393,8 @@ byte* bitmap_init::yoffs#1 yoffs zp[2]:12 2002.0
 byte* bitmap_init::yoffs#2 yoffs zp[2]:12 625.625
 byte* bitmap_init::yoffs#4 yoffs zp[2]:12 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:12 2002.0
-byte~ bitmap_plot::$1 reg byte x 2002.0
+word~ bitmap_plot::$1 zp[2]:12 2002.0
+byte~ bitmap_plot::$2 reg byte x 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:10 500.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:10 1501.5
@@ -2461,8 +2459,8 @@ reg byte a [ bitmap_init::$4 ]
 reg byte a [ bitmap_init::$5 ]
 reg byte a [ bitmap_init::$6 ]
 zp[2]:10 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ]
-zp[2]:12 [ bitmap_plot::$0 memset::num#2 memset::end#0 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:12 [ bitmap_plot::$1 memset::num#2 memset::end#0 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ]
+reg byte x [ bitmap_plot::$2 ]
 
 
 FINAL ASSEMBLER
@@ -2940,37 +2938,37 @@ init_irq: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(2) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $c
+    .label __1 = $c
     .label plotter = $a
     .label x = 2
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [71] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [72] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [72] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [73] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [74] bitmap_plot::$1 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
+    // [74] bitmap_plot::$2 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [75] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y

src/test/ref/bitmap-plot-0.sym

@@ -50,8 +50,8 @@ byte* bitmap_init::yoffs#1 yoffs zp[2]:12 2002.0
 byte* bitmap_init::yoffs#2 yoffs zp[2]:12 625.625
 byte* bitmap_init::yoffs#4 yoffs zp[2]:12 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:12 2002.0
-byte~ bitmap_plot::$1 reg byte x 2002.0
+word~ bitmap_plot::$1 zp[2]:12 2002.0
+byte~ bitmap_plot::$2 reg byte x 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:10 500.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:10 1501.5
@@ -116,5 +116,5 @@ reg byte a [ bitmap_init::$4 ]
 reg byte a [ bitmap_init::$5 ]
 reg byte a [ bitmap_init::$6 ]
 zp[2]:10 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ]
-zp[2]:12 [ bitmap_plot::$0 memset::num#2 memset::end#0 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:12 [ bitmap_plot::$1 memset::num#2 memset::end#0 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ]
+reg byte x [ bitmap_plot::$2 ]

src/test/ref/bitmap-plot-1.asm

@@ -617,10 +617,10 @@ mul16s: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($17) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $22
+    .label __1 = $22
     .label plotter = $20
     .label x = $17
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -628,17 +628,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x
@@ -683,7 +683,7 @@ div32u16u: {
     jsr divr16u
     // divr16u(WORD0(dividend), divisor, rem16u)
     // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u)
-    // unsigned long quotient = { quotient_hi, quotient_lo}
+    // MAKEDWORD( quotient_hi, quotient_lo )
     lda.z quotient_hi
     sta.z return+2
     lda.z quotient_hi+1

src/test/ref/bitmap-plot-1.cfg

@@ -252,10 +252,10 @@ mul16s::@return: scope:[mul16s]  from mul16s::@2
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@10
   [128] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0]
-  [129] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8
-  [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [131] bitmap_plot::$1 = byte0  bitmap_plot::x#0
-  [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [129] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8
+  [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [131] bitmap_plot::$2 = byte0  bitmap_plot::x#0
+  [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [133] return 

src/test/ref/bitmap-plot-1.log

@@ -363,7 +363,8 @@ div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   div32u16u::$3 = divr16u::return#6
   rem16u#5 = rem16u#16
   div32u16u::quotient_lo#0 = div32u16u::$3
-  div32u16u::quotient#0 = (dword){ div32u16u::quotient_hi#1, div32u16u::quotient_lo#0 }
+  div32u16u::$4 = div32u16u::quotient_hi#1 dw= div32u16u::quotient_lo#0
+  div32u16u::quotient#0 = div32u16u::$4
   div32u16u::return#1 = div32u16u::quotient#0
   to:div32u16u::@return
 div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
@@ -598,11 +599,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@13
   bitmap_plot::x#1 = phi( main::@13/bitmap_plot::x#0 )
   bitmap_plot::y#1 = phi( main::@13/bitmap_plot::y#0 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#1], bitmap_plot_ylo[bitmap_plot::y#1] }
-  bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#1
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#1] w= bitmap_plot_ylo[bitmap_plot::y#1]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#1
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -1037,8 +1039,9 @@ byte* bitmap_init::yoffs#2
 byte* bitmap_init::yoffs#3
 byte* bitmap_init::yoffs#4
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -1094,6 +1097,7 @@ word~ div32u16u::$0
 word~ div32u16u::$1
 word~ div32u16u::$2
 word~ div32u16u::$3
+dword~ div32u16u::$4
 dword div32u16u::dividend
 dword div32u16u::dividend#0
 dword div32u16u::dividend#1
@@ -1629,9 +1633,6 @@ dword sin16s_gen2::x#3
 dword sin16s_gen2::x#4
 dword sin16s_gen2::x#5
 
-Fixing inline constructor with div32u16u::$4 = (word)div32u16u::quotient_hi#1 dw= (word)div32u16u::quotient_lo#0
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#1] w= (byte)bitmap_plot_ylo[bitmap_plot::y#1]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (snumber) 1 in sin16s_gen2::$1 = sin16s_gen2::ampl#0 >> 1
 Adding number conversion cast (unumber) 1 in sin16s::isUpper#1 = 1
 Adding number conversion cast (unumber) 3 in sin16s::$4 = sin16s::x#6 << 3
@@ -1674,8 +1675,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#1 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#1 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#1 & (unumber)$fff8
 Adding number conversion cast (unumber) 0 in memset::$0 = memset::num#2 > 0
 Adding number conversion cast (unumber) $200 in sin16s_gen2::wavelength#0 = $200
 Adding number conversion cast (snumber) -$1001 in sin16s_gen2::min#0 = -$1001
@@ -1758,8 +1759,6 @@ Simplifying constant integer cast 1
 Simplifying constant integer cast 1
 Simplifying constant integer cast 1
 Simplifying constant integer cast 0
-Simplifying constant integer cast div32u16u::quotient_hi#1
-Simplifying constant integer cast div32u16u::quotient_lo#0
 Simplifying constant integer cast 0
 Simplifying constant integer cast 1
 Simplifying constant integer cast 0
@@ -1775,8 +1774,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#1]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#1]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast 0
 Simplifying constant integer cast $200
@@ -1866,7 +1863,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
 Inferred type updated to word in main::toD0181_$0 = main::toD0181_$7 & $3fff
 Inferred type updated to word in main::toD0181_$1 = main::toD0181_$0 * 4
 Inferred type updated to byte in main::toD0181_$4 = main::toD0181_$3 / 4
@@ -2267,7 +2264,7 @@ Successful SSA optimization Pass2ConstantRValueConsolidation
 Constant main::toD0181_return#0 = main::toD0181_$2|main::toD0181_$5
 Successful SSA optimization Pass2ConstantIdentification
 Inlining Noop Cast [13] sin16s_gen2::$8 = (signed word)sin16s_gen2::$7 keeping sin16s_gen2::$8
-Inlining Noop Cast [150] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [150] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Successful SSA optimization Pass2NopCastInlining
 Inlining Noop Cast [53] sin16s::sinx#0 = (signed word)sin16s::usinx#1 keeping sin16s::usinx#1
 Inlining Noop Cast [116] mul16s::$13 = (word)mul16s::b#3 keeping mul16s::b#3
@@ -2803,10 +2800,10 @@ mul16s::@return: scope:[mul16s]  from mul16s::@2
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@10
   [128] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0]
-  [129] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8
-  [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [131] bitmap_plot::$1 = byte0  bitmap_plot::x#0
-  [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [129] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8
+  [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [131] bitmap_plot::$2 = byte0  bitmap_plot::x#0
+  [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [133] return 
@@ -3044,8 +3041,8 @@ byte* bitmap_init::yoffs#1 2002.0
 byte* bitmap_init::yoffs#2 625.625
 byte* bitmap_init::yoffs#4 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 2002.0
-byte~ bitmap_plot::$1 2002.0
+word~ bitmap_plot::$1 2002.0
+byte~ bitmap_plot::$2 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 500.5
 byte* bitmap_plot::plotter#1 1501.5
@@ -3335,9 +3332,9 @@ Added variable mul16s::$9 to live range equivalence class [ mul16s::$9 ]
 Added variable mul16s::$12 to live range equivalence class [ mul16s::$12 ]
 Added variable mul16s::return#1 to live range equivalence class [ mul16s::return#1 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Added variable divr16u::return#2 to live range equivalence class [ divr16u::return#2 ]
 Added variable div32u16u::quotient_hi#0 to live range equivalence class [ div32u16u::quotient_hi#0 ]
 Added variable divr16u::return#3 to live range equivalence class [ divr16u::return#3 ]
@@ -3434,9 +3431,9 @@ Complete equivalence classes
 [ mul16s::$12 ]
 [ mul16s::return#1 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 [ divr16u::return#2 ]
 [ div32u16u::quotient_hi#0 ]
 [ divr16u::return#3 ]
@@ -3532,9 +3529,9 @@ Allocated zp[2]:145 [ mul16s::$9 ]
 Allocated zp[2]:147 [ mul16s::$12 ]
 Allocated zp[4]:149 [ mul16s::return#1 ]
 Allocated zp[2]:153 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:155 [ bitmap_plot::$0 ]
+Allocated zp[2]:155 [ bitmap_plot::$1 ]
 Allocated zp[2]:157 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:159 [ bitmap_plot::$1 ]
+Allocated zp[1]:159 [ bitmap_plot::$2 ]
 Allocated zp[2]:160 [ divr16u::return#2 ]
 Allocated zp[2]:162 [ div32u16u::quotient_hi#0 ]
 Allocated zp[2]:164 [ divr16u::return#3 ]
@@ -3631,9 +3628,9 @@ Statement [123] mul16s::$12 = mul16s::$9 - (word)mul16s::a#3 [ mul16s::m#5 mul16
 Statement [124] mul16s::m#2 = mul16s::m#5 word1= mul16s::$12 [ mul16s::m#2 ] ( main:3::mul16s:26 [ frame_cnt main::idx_x#3 main::idx_y#3 mul16s::m#2 ] { { mul16s::b#1 = mul16s::b#3 main::cos_x#0 } { mul16s::return#1 = mul16s::return#3 } }  main:3::mul16s:36 [ frame_cnt main::idx_x#3 main::idx_y#3 main::x#0 mul16s::m#2 ] { { mul16s::b#2 = mul16s::b#3 main::sin_y#0 } { mul16s::return#1 = mul16s::return#4 } }  main:3::sin16s_gen2:12::mul16s:65 [ frame_cnt sin16s_gen2::step#0 sin16s_gen2::i#2 sin16s_gen2::x#2 sin16s_gen2::sintab#2 mul16s::m#2 ] { { mul16s::a#0 = mul16s::a#3 sin16s::return#0 } { mul16s::return#0 = mul16s::return#1 } }  ) always clobbers reg byte a 
 Statement [126] mul16s::return#1 = (signed dword)mul16s::m#4 [ mul16s::return#1 ] ( main:3::mul16s:26 [ frame_cnt main::idx_x#3 main::idx_y#3 mul16s::return#1 ] { { mul16s::b#1 = mul16s::b#3 main::cos_x#0 } { mul16s::return#1 = mul16s::return#3 } }  main:3::mul16s:36 [ frame_cnt main::idx_x#3 main::idx_y#3 main::x#0 mul16s::return#1 ] { { mul16s::b#2 = mul16s::b#3 main::sin_y#0 } { mul16s::return#1 = mul16s::return#4 } }  main:3::sin16s_gen2:12::mul16s:65 [ frame_cnt sin16s_gen2::step#0 sin16s_gen2::i#2 sin16s_gen2::x#2 sin16s_gen2::sintab#2 mul16s::return#1 ] { { mul16s::a#0 = mul16s::a#3 sin16s::return#0 } { mul16s::return#0 = mul16s::return#1 } }  ) always clobbers reg byte a 
 Statement [128] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] [ bitmap_plot::x#0 bitmap_plot::plotter#0 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#0 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
-Statement [129] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
-Statement [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
-Statement [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [129] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
+Statement [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
+Statement [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a reg byte y 
 Statement [136] divr16u::return#2 = divr16u::return#0 [ divr16u::return#2 rem16u#14 ] ( main:3::sin16s_gen2:12::div32u16u:55 [ frame_cnt divr16u::return#2 rem16u#14 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  ) always clobbers reg byte a 
 Statement [137] div32u16u::quotient_hi#0 = divr16u::return#2 [ div32u16u::quotient_hi#0 rem16u#14 ] ( main:3::sin16s_gen2:12::div32u16u:55 [ frame_cnt div32u16u::quotient_hi#0 rem16u#14 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
 Statement [138] divr16u::rem#4 = rem16u#14 [ div32u16u::quotient_hi#0 divr16u::rem#4 ] ( main:3::sin16s_gen2:12::div32u16u:55 [ frame_cnt div32u16u::quotient_hi#0 divr16u::rem#4 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
@@ -3757,9 +3754,9 @@ Statement [123] mul16s::$12 = mul16s::$9 - (word)mul16s::a#3 [ mul16s::m#5 mul16
 Statement [124] mul16s::m#2 = mul16s::m#5 word1= mul16s::$12 [ mul16s::m#2 ] ( main:3::mul16s:26 [ frame_cnt main::idx_x#3 main::idx_y#3 mul16s::m#2 ] { { mul16s::b#1 = mul16s::b#3 main::cos_x#0 } { mul16s::return#1 = mul16s::return#3 } }  main:3::mul16s:36 [ frame_cnt main::idx_x#3 main::idx_y#3 main::x#0 mul16s::m#2 ] { { mul16s::b#2 = mul16s::b#3 main::sin_y#0 } { mul16s::return#1 = mul16s::return#4 } }  main:3::sin16s_gen2:12::mul16s:65 [ frame_cnt sin16s_gen2::step#0 sin16s_gen2::i#2 sin16s_gen2::x#2 sin16s_gen2::sintab#2 mul16s::m#2 ] { { mul16s::a#0 = mul16s::a#3 sin16s::return#0 } { mul16s::return#0 = mul16s::return#1 } }  ) always clobbers reg byte a 
 Statement [126] mul16s::return#1 = (signed dword)mul16s::m#4 [ mul16s::return#1 ] ( main:3::mul16s:26 [ frame_cnt main::idx_x#3 main::idx_y#3 mul16s::return#1 ] { { mul16s::b#1 = mul16s::b#3 main::cos_x#0 } { mul16s::return#1 = mul16s::return#3 } }  main:3::mul16s:36 [ frame_cnt main::idx_x#3 main::idx_y#3 main::x#0 mul16s::return#1 ] { { mul16s::b#2 = mul16s::b#3 main::sin_y#0 } { mul16s::return#1 = mul16s::return#4 } }  main:3::sin16s_gen2:12::mul16s:65 [ frame_cnt sin16s_gen2::step#0 sin16s_gen2::i#2 sin16s_gen2::x#2 sin16s_gen2::sintab#2 mul16s::return#1 ] { { mul16s::a#0 = mul16s::a#3 sin16s::return#0 } { mul16s::return#0 = mul16s::return#1 } }  ) always clobbers reg byte a 
 Statement [128] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] [ bitmap_plot::x#0 bitmap_plot::plotter#0 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#0 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
-Statement [129] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
-Statement [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
-Statement [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [129] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
+Statement [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a 
+Statement [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( main:3::bitmap_plot:44 [ frame_cnt main::idx_x#3 main::idx_y#3 ] { { bitmap_plot::x#0 = main::x#0 } }  ) always clobbers reg byte a reg byte y 
 Statement [136] divr16u::return#2 = divr16u::return#0 [ divr16u::return#2 rem16u#14 ] ( main:3::sin16s_gen2:12::div32u16u:55 [ frame_cnt divr16u::return#2 rem16u#14 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  ) always clobbers reg byte a 
 Statement [137] div32u16u::quotient_hi#0 = divr16u::return#2 [ div32u16u::quotient_hi#0 rem16u#14 ] ( main:3::sin16s_gen2:12::div32u16u:55 [ frame_cnt div32u16u::quotient_hi#0 rem16u#14 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
 Statement [138] divr16u::rem#4 = rem16u#14 [ div32u16u::quotient_hi#0 divr16u::rem#4 ] ( main:3::sin16s_gen2:12::div32u16u:55 [ frame_cnt div32u16u::quotient_hi#0 divr16u::rem#4 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
@@ -3881,9 +3878,9 @@ Potential registers zp[2]:145 [ mul16s::$9 ] : zp[2]:145 ,
 Potential registers zp[2]:147 [ mul16s::$12 ] : zp[2]:147 , 
 Potential registers zp[4]:149 [ mul16s::return#1 ] : zp[4]:149 , 
 Potential registers zp[2]:153 [ bitmap_plot::plotter#0 ] : zp[2]:153 , 
-Potential registers zp[2]:155 [ bitmap_plot::$0 ] : zp[2]:155 , 
+Potential registers zp[2]:155 [ bitmap_plot::$1 ] : zp[2]:155 , 
 Potential registers zp[2]:157 [ bitmap_plot::plotter#1 ] : zp[2]:157 , 
-Potential registers zp[1]:159 [ bitmap_plot::$1 ] : zp[1]:159 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:159 [ bitmap_plot::$2 ] : zp[1]:159 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:160 [ divr16u::return#2 ] : zp[2]:160 , 
 Potential registers zp[2]:162 [ div32u16u::quotient_hi#0 ] : zp[2]:162 , 
 Potential registers zp[2]:164 [ divr16u::return#3 ] : zp[2]:164 , 
@@ -3922,7 +3919,7 @@ Uplift Scope [sin16s] 110,511.5: zp[4]:28 [ sin16s::x#6 sin16s::x#4 sin16s::x#0
 Uplift Scope [mul16s] 82,508.25: zp[4]:23 [ mul16s::m#4 mul16s::m#5 mul16s::m#1 mul16s::m#0 mul16s::m#2 ] 20,002: zp[2]:141 [ mul16s::$6 ] 20,002: zp[2]:143 [ mul16s::$11 ] 20,002: zp[2]:145 [ mul16s::$9 ] 20,002: zp[2]:147 [ mul16s::$12 ] 2,848.31: zp[2]:19 [ mul16s::a#3 mul16s::a#0 ] 2,240.8: zp[4]:149 [ mul16s::return#1 ] 2,002: zp[4]:123 [ mul16s::return#0 ] 1,331.55: zp[2]:21 [ mul16s::b#3 mul16s::b#2 mul16s::b#1 ] 202: zp[4]:72 [ mul16s::return#3 ] 202: zp[4]:94 [ mul16s::return#4 ] 
 Uplift Scope [memset] 35,672.33: zp[2]:39 [ memset::dst#2 memset::dst#4 memset::dst#1 ] 1,833.67: zp[2]:204 [ memset::end#0 ] 1,250.12: zp[1]:38 [ memset::c#4 ] 1,001: zp[2]:34 [ memset::num#2 ] 0: zp[2]:36 [ memset::str#3 ] 
 Uplift Scope [bitmap_init] 3,628.62: zp[2]:17 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] 3,169.83: zp[1]:14 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] 2,002: zp[1]:15 [ bitmap_init::x#2 bitmap_init::x#1 ] 2,002: zp[1]:16 [ bitmap_init::y#2 bitmap_init::y#1 ] 2,002: zp[1]:134 [ bitmap_init::$4 ] 2,002: zp[1]:135 [ bitmap_init::$5 ] 2,002: zp[1]:136 [ bitmap_init::$6 ] 500.5: zp[1]:133 [ bitmap_init::$7 ] 
-Uplift Scope [bitmap_plot] 2,103: zp[1]:112 [ bitmap_plot::y#0 ] 2,002: zp[2]:155 [ bitmap_plot::$0 ] 2,002: zp[1]:159 [ bitmap_plot::$1 ] 1,501.5: zp[2]:157 [ bitmap_plot::plotter#1 ] 500.5: zp[2]:153 [ bitmap_plot::plotter#0 ] 420.6: zp[2]:110 [ bitmap_plot::x#0 ] 
+Uplift Scope [bitmap_plot] 2,103: zp[1]:112 [ bitmap_plot::y#0 ] 2,002: zp[2]:155 [ bitmap_plot::$1 ] 2,002: zp[1]:159 [ bitmap_plot::$2 ] 1,501.5: zp[2]:157 [ bitmap_plot::plotter#1 ] 500.5: zp[2]:153 [ bitmap_plot::plotter#0 ] 420.6: zp[2]:110 [ bitmap_plot::x#0 ] 
 Uplift Scope [sin16s_gen2] 2,233: zp[2]:6 [ sin16s_gen2::i#2 sin16s_gen2::i#1 ] 2,002: zp[4]:127 [ sin16s_gen2::$6 ] 1,251.25: zp[4]:8 [ sin16s_gen2::x#2 sin16s_gen2::x#1 ] 1,001: zp[2]:131 [ sin16s_gen2::$8 ] 940.33: zp[2]:12 [ sin16s_gen2::sintab#2 sin16s_gen2::sintab#0 ] 73.47: zp[4]:117 [ sin16s_gen2::step#0 ] 
 Uplift Scope [div32u16u] 2,002: zp[2]:166 [ div32u16u::quotient_lo#0 ] 400.4: zp[2]:162 [ div32u16u::quotient_hi#0 ] 367.33: zp[4]:168 [ div32u16u::return#1 ] 202: zp[4]:113 [ div32u16u::return#0 ] 
 Uplift Scope [main] 212.82: zp[2]:4 [ main::idx_y#3 main::idx_y#10 main::idx_y#1 ] 202: zp[2]:66 [ main::$19 ] 202: zp[2]:68 [ main::$21 ] 202: zp[2]:70 [ main::cos_x#0 ] 202: zp[4]:76 [ main::xpos#0 ] 202: zp[4]:80 [ main::$6 ] 202: zp[2]:84 [ main::$7 ] 202: zp[2]:88 [ main::$20 ] 202: zp[2]:90 [ main::$22 ] 202: zp[2]:92 [ main::sin_y#0 ] 202: zp[4]:98 [ main::ypos#0 ] 202: zp[4]:102 [ main::$10 ] 202: zp[2]:106 [ main::$11 ] 147.29: zp[2]:2 [ main::idx_x#3 main::idx_x#10 main::idx_x#1 ] 50.5: zp[2]:108 [ main::y#0 ] 18.36: zp[2]:86 [ main::x#0 ] 
@@ -3943,7 +3940,7 @@ Uplifting [mul16s] best 27206 combination zp[4]:23 [ mul16s::m#4 mul16s::m#5 mul
 Uplifting [memset] best 27190 combination zp[2]:39 [ memset::dst#2 memset::dst#4 memset::dst#1 ] zp[2]:204 [ memset::end#0 ] reg byte x [ memset::c#4 ] zp[2]:34 [ memset::num#2 ] zp[2]:36 [ memset::str#3 ] 
 Uplifting [bitmap_init] best 26740 combination zp[2]:17 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] reg byte a [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] reg byte x [ bitmap_init::x#2 bitmap_init::x#1 ] reg byte x [ bitmap_init::y#2 bitmap_init::y#1 ] reg byte a [ bitmap_init::$4 ] zp[1]:135 [ bitmap_init::$5 ] zp[1]:136 [ bitmap_init::$6 ] zp[1]:133 [ bitmap_init::$7 ] 
 Limited combination testing to 100 combinations of 15360 possible.
-Uplifting [bitmap_plot] best 26701 combination reg byte x [ bitmap_plot::y#0 ] zp[2]:155 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:157 [ bitmap_plot::plotter#1 ] zp[2]:153 [ bitmap_plot::plotter#0 ] zp[2]:110 [ bitmap_plot::x#0 ] 
+Uplifting [bitmap_plot] best 26701 combination reg byte x [ bitmap_plot::y#0 ] zp[2]:155 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:157 [ bitmap_plot::plotter#1 ] zp[2]:153 [ bitmap_plot::plotter#0 ] zp[2]:110 [ bitmap_plot::x#0 ] 
 Uplifting [sin16s_gen2] best 26701 combination zp[2]:6 [ sin16s_gen2::i#2 sin16s_gen2::i#1 ] zp[4]:127 [ sin16s_gen2::$6 ] zp[4]:8 [ sin16s_gen2::x#2 sin16s_gen2::x#1 ] zp[2]:131 [ sin16s_gen2::$8 ] zp[2]:12 [ sin16s_gen2::sintab#2 sin16s_gen2::sintab#0 ] zp[4]:117 [ sin16s_gen2::step#0 ] 
 Uplifting [div32u16u] best 26701 combination zp[2]:166 [ div32u16u::quotient_lo#0 ] zp[2]:162 [ div32u16u::quotient_hi#0 ] zp[4]:168 [ div32u16u::return#1 ] zp[4]:113 [ div32u16u::return#0 ] 
 Uplifting [main] best 26461 combination zp[2]:4 [ main::idx_y#3 main::idx_y#10 main::idx_y#1 ] zp[2]:66 [ main::$19 ] zp[2]:68 [ main::$21 ] zp[2]:70 [ main::cos_x#0 ] zp[4]:76 [ main::xpos#0 ] zp[4]:80 [ main::$6 ] reg byte alu [ main::$7 ] zp[2]:88 [ main::$20 ] zp[2]:90 [ main::$22 ] zp[2]:92 [ main::sin_y#0 ] zp[4]:98 [ main::ypos#0 ] zp[4]:102 [ main::$10 ] reg byte alu [ main::$11 ] zp[2]:2 [ main::idx_x#3 main::idx_x#10 main::idx_x#1 ] zp[2]:108 [ main::y#0 ] zp[2]:86 [ main::x#0 ] 
@@ -4017,13 +4014,13 @@ Coalescing zero page register [ zp[2]:53 [ divr16u::rem#5 divr16u::rem#10 divr16
 Coalescing zero page register [ zp[2]:55 [ divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ] ] with [ zp[2]:43 [ mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ] ]
 Coalescing zero page register [ zp[2]:60 [ mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 ] ] with [ zp[2]:57 [ divr16u::quotient#3 divr16u::return#0 divr16u::quotient#1 divr16u::quotient#2 divr16u::return#2 divr16u::return#3 div32u16u::quotient_lo#0 ] ]
 Coalescing zero page register [ zp[2]:153 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 ] ] with [ zp[2]:131 [ sin16s_gen2::$8 ] ]
-Coalescing zero page register [ zp[2]:155 [ bitmap_plot::$0 ] ] with [ zp[2]:141 [ mul16s::$6 mul16s::$11 ] ]
+Coalescing zero page register [ zp[2]:155 [ bitmap_plot::$1 ] ] with [ zp[2]:141 [ mul16s::$6 mul16s::$11 ] ]
 Coalescing zero page register [ zp[2]:162 [ div32u16u::quotient_hi#0 ] ] with [ zp[2]:145 [ mul16s::$9 ] ]
 Coalescing zero page register [ zp[4]:172 [ sin16s::$4 ] ] with [ zp[4]:49 [ mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ] ]
 Coalescing zero page register [ zp[2]:86 [ main::x#0 bitmap_plot::x#0 ] ] with [ zp[2]:17 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 sin16s_gen2::i#2 sin16s_gen2::i#1 ] ]
 Coalescing zero page register [ zp[2]:108 [ main::y#0 ] ] with [ zp[2]:34 [ memset::num#2 memset::end#0 sin16s_gen2::sintab#2 sin16s_gen2::sintab#0 ] ]
 Coalescing zero page register [ zp[2]:153 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sin16s_gen2::$8 ] ] with [ zp[2]:36 [ memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 mul16s::a#3 mul16s::a#0 sin16s::return#0 mul16s::$12 sin16s::return#1 sin16s::return#5 sin16s::sinx#1 sin16s::usinx#1 sin16s::usinx#0 ] ]
-Coalescing zero page register [ zp[2]:155 [ bitmap_plot::$0 mul16s::$6 mul16s::$11 ] ] with [ zp[2]:53 [ divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ] ]
+Coalescing zero page register [ zp[2]:155 [ bitmap_plot::$1 mul16s::$6 mul16s::$11 ] ] with [ zp[2]:53 [ divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ] ]
 Coalescing zero page register [ zp[2]:176 [ sin16s::x1#0 ] ] with [ zp[2]:162 [ div32u16u::quotient_hi#0 mul16s::$9 ] ]
 Coalescing zero page register [ zp[2]:178 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 ] ] with [ zp[2]:55 [ divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ] ]
 Allocated (was zp[4]:8) zp[4]:6 [ sin16s_gen2::x#2 sin16s_gen2::x#1 ]
@@ -4037,7 +4034,7 @@ Allocated (was zp[2]:108) zp[2]:25 [ main::y#0 memset::num#2 memset::end#0 sin16
 Allocated (was zp[4]:113) zp[4]:27 [ div32u16u::return#0 sin16s_gen2::step#0 div32u16u::return#1 ]
 Allocated (was zp[1]:133) zp[1]:31 [ bitmap_init::$7 ]
 Allocated (was zp[2]:153) zp[2]:32 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sin16s_gen2::$8 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 mul16s::a#3 mul16s::a#0 sin16s::return#0 mul16s::$12 sin16s::return#1 sin16s::return#5 sin16s::sinx#1 sin16s::usinx#1 sin16s::usinx#0 ]
-Allocated (was zp[2]:155) zp[2]:34 [ bitmap_plot::$0 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ]
+Allocated (was zp[2]:155) zp[2]:34 [ bitmap_plot::$1 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ]
 Allocated (was zp[4]:172) zp[4]:36 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 Allocated (was zp[2]:176) zp[2]:40 [ sin16s::x1#0 div32u16u::quotient_hi#0 mul16s::$9 ]
 Allocated (was zp[2]:178) zp[2]:42 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]
@@ -4939,7 +4936,7 @@ mul16s: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($17) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $22
+    .label __1 = $22
     .label plotter = $20
     .label x = $17
     // [128] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -4947,24 +4944,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [129] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [129] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [131] bitmap_plot::$1 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
+    // [131] bitmap_plot::$2 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -5962,8 +5959,8 @@ byte* bitmap_init::yoffs#1 yoffs zp[2]:23 2002.0
 byte* bitmap_init::yoffs#2 yoffs zp[2]:23 625.625
 byte* bitmap_init::yoffs#4 yoffs zp[2]:23 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:34 2002.0
-byte~ bitmap_plot::$1 reg byte x 2002.0
+word~ bitmap_plot::$1 zp[2]:34 2002.0
+byte~ bitmap_plot::$2 reg byte x 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:32 500.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:32 1501.5
@@ -6221,8 +6218,8 @@ reg byte a [ bitmap_init::$4 ]
 reg byte a [ bitmap_init::$5 ]
 reg byte a [ bitmap_init::$6 ]
 zp[2]:32 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sin16s_gen2::$8 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 mul16s::a#3 mul16s::a#0 sin16s::return#0 mul16s::$12 sin16s::return#1 sin16s::return#5 sin16s::sinx#1 sin16s::usinx#1 sin16s::usinx#0 ]
-zp[2]:34 [ bitmap_plot::$0 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:34 [ bitmap_plot::$1 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ]
+reg byte x [ bitmap_plot::$2 ]
 zp[4]:36 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 zp[2]:40 [ sin16s::x1#0 div32u16u::quotient_hi#0 mul16s::$9 ]
 zp[2]:42 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]
@@ -7091,37 +7088,37 @@ mul16s: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($17) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $22
+    .label __1 = $22
     .label plotter = $20
     .label x = $17
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [128] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [129] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [129] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [130] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [131] bitmap_plot::$1 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
+    // [131] bitmap_plot::$2 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [132] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -7180,7 +7177,7 @@ div32u16u: {
     // div32u16u::@2
     // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u)
     // [141] div32u16u::quotient_lo#0 = divr16u::return#3
-    // unsigned long quotient = { quotient_hi, quotient_lo}
+    // MAKEDWORD( quotient_hi, quotient_lo )
     // [142] div32u16u::return#1 = div32u16u::quotient_hi#0 dw= div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda.z quotient_hi
     sta.z return+2

src/test/ref/bitmap-plot-1.sym

@@ -55,8 +55,8 @@ byte* bitmap_init::yoffs#1 yoffs zp[2]:23 2002.0
 byte* bitmap_init::yoffs#2 yoffs zp[2]:23 625.625
 byte* bitmap_init::yoffs#4 yoffs zp[2]:23 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:34 2002.0
-byte~ bitmap_plot::$1 reg byte x 2002.0
+word~ bitmap_plot::$1 zp[2]:34 2002.0
+byte~ bitmap_plot::$2 reg byte x 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:32 500.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:32 1501.5
@@ -314,8 +314,8 @@ reg byte a [ bitmap_init::$4 ]
 reg byte a [ bitmap_init::$5 ]
 reg byte a [ bitmap_init::$6 ]
 zp[2]:32 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sin16s_gen2::$8 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 mul16s::a#3 mul16s::a#0 sin16s::return#0 mul16s::$12 sin16s::return#1 sin16s::return#5 sin16s::sinx#1 sin16s::usinx#1 sin16s::usinx#0 ]
-zp[2]:34 [ bitmap_plot::$0 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:34 [ bitmap_plot::$1 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ]
+reg byte x [ bitmap_plot::$2 ]
 zp[4]:36 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 zp[2]:40 [ sin16s::x1#0 div32u16u::quotient_hi#0 mul16s::$9 ]
 zp[2]:42 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]

src/test/ref/bitmap-plot-2.asm

@@ -654,10 +654,10 @@ mul16s: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($1c) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $2d
+    .label __1 = $2d
     .label plotter = $25
     .label x = $1c
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -665,17 +665,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x
@@ -720,7 +720,7 @@ div32u16u: {
     jsr divr16u
     // divr16u(WORD0(dividend), divisor, rem16u)
     // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u)
-    // unsigned long quotient = { quotient_hi, quotient_lo}
+    // MAKEDWORD( quotient_hi, quotient_lo )
     lda.z quotient_hi
     sta.z return+2
     lda.z quotient_hi+1

src/test/ref/bitmap-plot-2.cfg

@@ -271,10 +271,10 @@ mul16s::@return: scope:[mul16s]  from mul16s::@2
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@13
   [137] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0]
-  [138] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8
-  [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [140] bitmap_plot::$1 = byte0  bitmap_plot::x#0
-  [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [138] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8
+  [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [140] bitmap_plot::$2 = byte0  bitmap_plot::x#0
+  [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [142] return 

src/test/ref/bitmap-plot-2.log

@@ -363,7 +363,8 @@ div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   div32u16u::$3 = divr16u::return#6
   rem16u#5 = rem16u#16
   div32u16u::quotient_lo#0 = div32u16u::$3
-  div32u16u::quotient#0 = (dword){ div32u16u::quotient_hi#1, div32u16u::quotient_lo#0 }
+  div32u16u::$4 = div32u16u::quotient_hi#1 dw= div32u16u::quotient_lo#0
+  div32u16u::quotient#0 = div32u16u::$4
   div32u16u::return#1 = div32u16u::quotient#0
   to:div32u16u::@return
 div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
@@ -598,11 +599,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@17
   bitmap_plot::x#1 = phi( main::@17/bitmap_plot::x#0 )
   bitmap_plot::y#1 = phi( main::@17/bitmap_plot::y#0 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#1], bitmap_plot_ylo[bitmap_plot::y#1] }
-  bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#1
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#1] w= bitmap_plot_ylo[bitmap_plot::y#1]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#1
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -1104,8 +1106,9 @@ byte* bitmap_init::yoffs#2
 byte* bitmap_init::yoffs#3
 byte* bitmap_init::yoffs#4
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -1165,6 +1168,7 @@ word~ div32u16u::$0
 word~ div32u16u::$1
 word~ div32u16u::$2
 word~ div32u16u::$3
+dword~ div32u16u::$4
 dword div32u16u::dividend
 dword div32u16u::dividend#0
 dword div32u16u::dividend#1
@@ -1744,9 +1748,6 @@ dword sin16s_gen2::x#3
 dword sin16s_gen2::x#4
 dword sin16s_gen2::x#5
 
-Fixing inline constructor with div32u16u::$4 = (word)div32u16u::quotient_hi#1 dw= (word)div32u16u::quotient_lo#0
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#1] w= (byte)bitmap_plot_ylo[bitmap_plot::y#1]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (snumber) 1 in sin16s_gen2::$1 = sin16s_gen2::ampl#0 >> 1
 Adding number conversion cast (unumber) 1 in sin16s::isUpper#1 = 1
 Adding number conversion cast (unumber) 3 in sin16s::$4 = sin16s::x#6 << 3
@@ -1789,8 +1790,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#1 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#1 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#1 & (unumber)$fff8
 Adding number conversion cast (unumber) 0 in memset::$0 = memset::num#2 > 0
 Adding number conversion cast (unumber) $200 in sin16s_gen2::wavelength#0 = $200
 Adding number conversion cast (snumber) -$1001 in sin16s_gen2::min#0 = -$1001
@@ -1874,8 +1875,6 @@ Simplifying constant integer cast 1
 Simplifying constant integer cast 1
 Simplifying constant integer cast 1
 Simplifying constant integer cast 0
-Simplifying constant integer cast div32u16u::quotient_hi#1
-Simplifying constant integer cast div32u16u::quotient_lo#0
 Simplifying constant integer cast 0
 Simplifying constant integer cast 1
 Simplifying constant integer cast 0
@@ -1891,8 +1890,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#1]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#1]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast 0
 Simplifying constant integer cast $200
@@ -1984,7 +1981,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#1 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#1 & $fff8
 Inferred type updated to word in main::toD0181_$0 = main::toD0181_$7 & $3fff
 Inferred type updated to word in main::toD0181_$1 = main::toD0181_$0 * 4
 Inferred type updated to byte in main::toD0181_$4 = main::toD0181_$3 / 4
@@ -2415,7 +2412,7 @@ Successful SSA optimization Pass2ConstantRValueConsolidation
 Constant main::toD0181_return#0 = main::toD0181_$2|main::toD0181_$5
 Successful SSA optimization Pass2ConstantIdentification
 Inlining Noop Cast [13] sin16s_gen2::$8 = (signed word)sin16s_gen2::$7 keeping sin16s_gen2::$8
-Inlining Noop Cast [150] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [150] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Inlining Noop Cast [182] main::$28 = (signed word)main::$6 keeping main::$28
 Inlining Noop Cast [185] main::x#0 = (word)main::$8 keeping main::x#0
 Inlining Noop Cast [195] main::$29 = (signed word)main::$10 keeping main::$29
@@ -2993,10 +2990,10 @@ mul16s::@return: scope:[mul16s]  from mul16s::@2
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from main::@13
   [137] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0]
-  [138] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8
-  [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [140] bitmap_plot::$1 = byte0  bitmap_plot::x#0
-  [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [138] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8
+  [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [140] bitmap_plot::$2 = byte0  bitmap_plot::x#0
+  [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [142] return 
@@ -3234,8 +3231,8 @@ byte* bitmap_init::yoffs#1 2002.0
 byte* bitmap_init::yoffs#2 625.625
 byte* bitmap_init::yoffs#4 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 2002.0
-byte~ bitmap_plot::$1 2002.0
+word~ bitmap_plot::$1 2002.0
+byte~ bitmap_plot::$2 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 500.5
 byte* bitmap_plot::plotter#1 1501.5
@@ -3536,9 +3533,9 @@ Added variable mul16s::$9 to live range equivalence class [ mul16s::$9 ]
 Added variable mul16s::$12 to live range equivalence class [ mul16s::$12 ]
 Added variable mul16s::return#1 to live range equivalence class [ mul16s::return#1 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Added variable divr16u::return#2 to live range equivalence class [ divr16u::return#2 ]
 Added variable div32u16u::quotient_hi#0 to live range equivalence class [ div32u16u::quotient_hi#0 ]
 Added variable divr16u::return#3 to live range equivalence class [ divr16u::return#3 ]
@@ -3637,9 +3634,9 @@ Complete equivalence classes
 [ mul16s::$12 ]
 [ mul16s::return#1 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 [ divr16u::return#2 ]
 [ div32u16u::quotient_hi#0 ]
 [ divr16u::return#3 ]
@@ -3737,9 +3734,9 @@ Allocated zp[2]:144 [ mul16s::$9 ]
 Allocated zp[2]:146 [ mul16s::$12 ]
 Allocated zp[4]:148 [ mul16s::return#1 ]
 Allocated zp[2]:152 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:154 [ bitmap_plot::$0 ]
+Allocated zp[2]:154 [ bitmap_plot::$1 ]
 Allocated zp[2]:156 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:158 [ bitmap_plot::$1 ]
+Allocated zp[1]:158 [ bitmap_plot::$2 ]
 Allocated zp[2]:159 [ divr16u::return#2 ]
 Allocated zp[2]:161 [ div32u16u::quotient_hi#0 ]
 Allocated zp[2]:163 [ divr16u::return#3 ]
@@ -3847,9 +3844,9 @@ Statement [132] mul16s::$12 = mul16s::$9 - (word)mul16s::a#3 [ mul16s::m#5 mul16
 Statement [133] mul16s::m#2 = mul16s::m#5 word1= mul16s::$12 [ mul16s::m#2 ] ( main:3::mul16s:27 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 mul16s::m#2 ] { { mul16s::a#1 = mul16s::a#3 main::r#10 } { mul16s::b#1 = mul16s::b#3 main::cos_x#0 } { mul16s::return#1 = mul16s::return#3 } }  main:3::mul16s:38 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 main::x#0 mul16s::m#2 ] { { mul16s::a#2 = mul16s::a#3 main::r#10 } { mul16s::b#2 = mul16s::b#3 main::sin_y#0 } { mul16s::return#1 = mul16s::return#4 } }  main:3::sin16s_gen2:12::mul16s:74 [ frame_cnt sin16s_gen2::step#0 sin16s_gen2::i#2 sin16s_gen2::x#2 sin16s_gen2::sintab#2 mul16s::m#2 ] { { mul16s::a#0 = mul16s::a#3 sin16s::return#0 } { mul16s::return#0 = mul16s::return#1 } }  ) always clobbers reg byte a 
 Statement [135] mul16s::return#1 = (signed dword)mul16s::m#4 [ mul16s::return#1 ] ( main:3::mul16s:27 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 mul16s::return#1 ] { { mul16s::a#1 = mul16s::a#3 main::r#10 } { mul16s::b#1 = mul16s::b#3 main::cos_x#0 } { mul16s::return#1 = mul16s::return#3 } }  main:3::mul16s:38 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 main::x#0 mul16s::return#1 ] { { mul16s::a#2 = mul16s::a#3 main::r#10 } { mul16s::b#2 = mul16s::b#3 main::sin_y#0 } { mul16s::return#1 = mul16s::return#4 } }  main:3::sin16s_gen2:12::mul16s:74 [ frame_cnt sin16s_gen2::step#0 sin16s_gen2::i#2 sin16s_gen2::x#2 sin16s_gen2::sintab#2 mul16s::return#1 ] { { mul16s::a#0 = mul16s::a#3 sin16s::return#0 } { mul16s::return#0 = mul16s::return#1 } }  ) always clobbers reg byte a 
 Statement [137] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] [ bitmap_plot::x#0 bitmap_plot::plotter#0 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#0 ] { }  ) always clobbers reg byte a 
-Statement [138] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] { }  ) always clobbers reg byte a 
-Statement [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { }  ) always clobbers reg byte a 
-Statement [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 ] { }  ) always clobbers reg byte a reg byte y 
+Statement [138] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] { }  ) always clobbers reg byte a 
+Statement [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { }  ) always clobbers reg byte a 
+Statement [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 ] { }  ) always clobbers reg byte a reg byte y 
 Statement [145] divr16u::return#2 = divr16u::return#0 [ divr16u::return#2 rem16u#14 ] ( main:3::sin16s_gen2:12::div32u16u:64 [ frame_cnt divr16u::return#2 rem16u#14 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  ) always clobbers reg byte a 
 Statement [146] div32u16u::quotient_hi#0 = divr16u::return#2 [ div32u16u::quotient_hi#0 rem16u#14 ] ( main:3::sin16s_gen2:12::div32u16u:64 [ frame_cnt div32u16u::quotient_hi#0 rem16u#14 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
 Statement [147] divr16u::rem#4 = rem16u#14 [ div32u16u::quotient_hi#0 divr16u::rem#4 ] ( main:3::sin16s_gen2:12::div32u16u:64 [ frame_cnt div32u16u::quotient_hi#0 divr16u::rem#4 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
@@ -3983,9 +3980,9 @@ Statement [132] mul16s::$12 = mul16s::$9 - (word)mul16s::a#3 [ mul16s::m#5 mul16
 Statement [133] mul16s::m#2 = mul16s::m#5 word1= mul16s::$12 [ mul16s::m#2 ] ( main:3::mul16s:27 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 mul16s::m#2 ] { { mul16s::a#1 = mul16s::a#3 main::r#10 } { mul16s::b#1 = mul16s::b#3 main::cos_x#0 } { mul16s::return#1 = mul16s::return#3 } }  main:3::mul16s:38 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 main::x#0 mul16s::m#2 ] { { mul16s::a#2 = mul16s::a#3 main::r#10 } { mul16s::b#2 = mul16s::b#3 main::sin_y#0 } { mul16s::return#1 = mul16s::return#4 } }  main:3::sin16s_gen2:12::mul16s:74 [ frame_cnt sin16s_gen2::step#0 sin16s_gen2::i#2 sin16s_gen2::x#2 sin16s_gen2::sintab#2 mul16s::m#2 ] { { mul16s::a#0 = mul16s::a#3 sin16s::return#0 } { mul16s::return#0 = mul16s::return#1 } }  ) always clobbers reg byte a 
 Statement [135] mul16s::return#1 = (signed dword)mul16s::m#4 [ mul16s::return#1 ] ( main:3::mul16s:27 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 mul16s::return#1 ] { { mul16s::a#1 = mul16s::a#3 main::r#10 } { mul16s::b#1 = mul16s::b#3 main::cos_x#0 } { mul16s::return#1 = mul16s::return#3 } }  main:3::mul16s:38 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 main::x#0 mul16s::return#1 ] { { mul16s::a#2 = mul16s::a#3 main::r#10 } { mul16s::b#2 = mul16s::b#3 main::sin_y#0 } { mul16s::return#1 = mul16s::return#4 } }  main:3::sin16s_gen2:12::mul16s:74 [ frame_cnt sin16s_gen2::step#0 sin16s_gen2::i#2 sin16s_gen2::x#2 sin16s_gen2::sintab#2 mul16s::return#1 ] { { mul16s::a#0 = mul16s::a#3 sin16s::return#0 } { mul16s::return#0 = mul16s::return#1 } }  ) always clobbers reg byte a 
 Statement [137] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] [ bitmap_plot::x#0 bitmap_plot::plotter#0 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#0 ] { }  ) always clobbers reg byte a 
-Statement [138] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$0 ] { }  ) always clobbers reg byte a 
-Statement [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { }  ) always clobbers reg byte a 
-Statement [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 ] { }  ) always clobbers reg byte a reg byte y 
+Statement [138] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 [ bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#0 bitmap_plot::$1 ] { }  ) always clobbers reg byte a 
+Statement [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 bitmap_plot::x#0 bitmap_plot::plotter#1 ] { }  ) always clobbers reg byte a 
+Statement [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( main:3::bitmap_plot:46 [ frame_cnt main::idx_x#11 main::r#10 main::idx_y#3 main::r_add#10 ] { }  ) always clobbers reg byte a reg byte y 
 Statement [145] divr16u::return#2 = divr16u::return#0 [ divr16u::return#2 rem16u#14 ] ( main:3::sin16s_gen2:12::div32u16u:64 [ frame_cnt divr16u::return#2 rem16u#14 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  ) always clobbers reg byte a 
 Statement [146] div32u16u::quotient_hi#0 = divr16u::return#2 [ div32u16u::quotient_hi#0 rem16u#14 ] ( main:3::sin16s_gen2:12::div32u16u:64 [ frame_cnt div32u16u::quotient_hi#0 rem16u#14 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
 Statement [147] divr16u::rem#4 = rem16u#14 [ div32u16u::quotient_hi#0 divr16u::rem#4 ] ( main:3::sin16s_gen2:12::div32u16u:64 [ frame_cnt div32u16u::quotient_hi#0 divr16u::rem#4 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
@@ -4109,9 +4106,9 @@ Potential registers zp[2]:144 [ mul16s::$9 ] : zp[2]:144 ,
 Potential registers zp[2]:146 [ mul16s::$12 ] : zp[2]:146 , 
 Potential registers zp[4]:148 [ mul16s::return#1 ] : zp[4]:148 , 
 Potential registers zp[2]:152 [ bitmap_plot::plotter#0 ] : zp[2]:152 , 
-Potential registers zp[2]:154 [ bitmap_plot::$0 ] : zp[2]:154 , 
+Potential registers zp[2]:154 [ bitmap_plot::$1 ] : zp[2]:154 , 
 Potential registers zp[2]:156 [ bitmap_plot::plotter#1 ] : zp[2]:156 , 
-Potential registers zp[1]:158 [ bitmap_plot::$1 ] : zp[1]:158 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:158 [ bitmap_plot::$2 ] : zp[1]:158 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:159 [ divr16u::return#2 ] : zp[2]:159 , 
 Potential registers zp[2]:161 [ div32u16u::quotient_hi#0 ] : zp[2]:161 , 
 Potential registers zp[2]:163 [ divr16u::return#3 ] : zp[2]:163 , 
@@ -4150,7 +4147,7 @@ Uplift Scope [sin16s] 110,511.5: zp[4]:31 [ sin16s::x#6 sin16s::x#4 sin16s::x#0
 Uplift Scope [mul16s] 82,508.25: zp[4]:26 [ mul16s::m#4 mul16s::m#5 mul16s::m#1 mul16s::m#0 mul16s::m#2 ] 20,002: zp[2]:140 [ mul16s::$6 ] 20,002: zp[2]:142 [ mul16s::$11 ] 20,002: zp[2]:144 [ mul16s::$9 ] 20,002: zp[2]:146 [ mul16s::$12 ] 3,065.85: zp[2]:22 [ mul16s::a#3 mul16s::a#2 mul16s::a#1 mul16s::a#0 ] 2,240.8: zp[4]:148 [ mul16s::return#1 ] 2,002: zp[4]:122 [ mul16s::return#0 ] 1,331.55: zp[2]:24 [ mul16s::b#3 mul16s::b#2 mul16s::b#1 ] 202: zp[4]:75 [ mul16s::return#3 ] 202: zp[4]:95 [ mul16s::return#4 ] 
 Uplift Scope [memset] 35,672.33: zp[2]:42 [ memset::dst#2 memset::dst#4 memset::dst#1 ] 1,833.67: zp[2]:203 [ memset::end#0 ] 1,250.12: zp[1]:41 [ memset::c#4 ] 1,001: zp[2]:37 [ memset::num#2 ] 0: zp[2]:39 [ memset::str#3 ] 
 Uplift Scope [bitmap_init] 3,628.62: zp[2]:20 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] 3,169.83: zp[1]:17 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] 2,002: zp[1]:18 [ bitmap_init::x#2 bitmap_init::x#1 ] 2,002: zp[1]:19 [ bitmap_init::y#2 bitmap_init::y#1 ] 2,002: zp[1]:133 [ bitmap_init::$4 ] 2,002: zp[1]:134 [ bitmap_init::$5 ] 2,002: zp[1]:135 [ bitmap_init::$6 ] 500.5: zp[1]:132 [ bitmap_init::$7 ] 
-Uplift Scope [bitmap_plot] 2,103: zp[1]:111 [ bitmap_plot::y#0 ] 2,002: zp[2]:154 [ bitmap_plot::$0 ] 2,002: zp[1]:158 [ bitmap_plot::$1 ] 1,501.5: zp[2]:156 [ bitmap_plot::plotter#1 ] 500.5: zp[2]:152 [ bitmap_plot::plotter#0 ] 420.6: zp[2]:109 [ bitmap_plot::x#0 ] 
+Uplift Scope [bitmap_plot] 2,103: zp[1]:111 [ bitmap_plot::y#0 ] 2,002: zp[2]:154 [ bitmap_plot::$1 ] 2,002: zp[1]:158 [ bitmap_plot::$2 ] 1,501.5: zp[2]:156 [ bitmap_plot::plotter#1 ] 500.5: zp[2]:152 [ bitmap_plot::plotter#0 ] 420.6: zp[2]:109 [ bitmap_plot::x#0 ] 
 Uplift Scope [sin16s_gen2] 2,233: zp[2]:9 [ sin16s_gen2::i#2 sin16s_gen2::i#1 ] 2,002: zp[4]:126 [ sin16s_gen2::$6 ] 1,251.25: zp[4]:11 [ sin16s_gen2::x#2 sin16s_gen2::x#1 ] 1,001: zp[2]:130 [ sin16s_gen2::$8 ] 940.33: zp[2]:15 [ sin16s_gen2::sintab#2 sin16s_gen2::sintab#0 ] 73.47: zp[4]:116 [ sin16s_gen2::step#0 ] 
 Uplift Scope [div32u16u] 2,002: zp[2]:165 [ div32u16u::quotient_lo#0 ] 400.4: zp[2]:161 [ div32u16u::quotient_hi#0 ] 367.33: zp[4]:167 [ div32u16u::return#1 ] 202: zp[4]:112 [ div32u16u::return#0 ] 
 Uplift Scope [main] 372.11: zp[1]:8 [ main::r_add#10 main::r_add#12 main::r_add#1 ] 202: zp[2]:69 [ main::$26 ] 202: zp[2]:71 [ main::$30 ] 202: zp[4]:79 [ main::xpos#0 ] 202: zp[2]:85 [ main::$7 ] 202: zp[2]:89 [ main::$27 ] 202: zp[2]:91 [ main::$31 ] 202: zp[4]:99 [ main::ypos#0 ] 202: zp[2]:105 [ main::$11 ] 139.77: zp[2]:2 [ main::idx_x#11 main::idx_x#10 main::idx_x#1 ] 139.63: zp[2]:6 [ main::idx_y#3 main::idx_y#10 main::idx_y#1 ] 101: zp[2]:73 [ main::cos_x#0 ] 101: zp[2]:83 [ main::$28 ] 101: zp[2]:93 [ main::sin_y#0 ] 101: zp[2]:103 [ main::$29 ] 62.04: zp[2]:4 [ main::r#10 main::r#1 ] 50.5: zp[2]:107 [ main::y#0 ] 8.42: zp[2]:87 [ main::x#0 ] 
@@ -4171,7 +4168,7 @@ Uplifting [mul16s] best 27106 combination zp[4]:26 [ mul16s::m#4 mul16s::m#5 mul
 Uplifting [memset] best 27090 combination zp[2]:42 [ memset::dst#2 memset::dst#4 memset::dst#1 ] zp[2]:203 [ memset::end#0 ] reg byte x [ memset::c#4 ] zp[2]:37 [ memset::num#2 ] zp[2]:39 [ memset::str#3 ] 
 Uplifting [bitmap_init] best 26640 combination zp[2]:20 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] reg byte a [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] reg byte x [ bitmap_init::x#2 bitmap_init::x#1 ] reg byte x [ bitmap_init::y#2 bitmap_init::y#1 ] reg byte a [ bitmap_init::$4 ] zp[1]:134 [ bitmap_init::$5 ] zp[1]:135 [ bitmap_init::$6 ] zp[1]:132 [ bitmap_init::$7 ] 
 Limited combination testing to 100 combinations of 15360 possible.
-Uplifting [bitmap_plot] best 26601 combination reg byte x [ bitmap_plot::y#0 ] zp[2]:154 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:156 [ bitmap_plot::plotter#1 ] zp[2]:152 [ bitmap_plot::plotter#0 ] zp[2]:109 [ bitmap_plot::x#0 ] 
+Uplifting [bitmap_plot] best 26601 combination reg byte x [ bitmap_plot::y#0 ] zp[2]:154 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:156 [ bitmap_plot::plotter#1 ] zp[2]:152 [ bitmap_plot::plotter#0 ] zp[2]:109 [ bitmap_plot::x#0 ] 
 Uplifting [sin16s_gen2] best 26601 combination zp[2]:9 [ sin16s_gen2::i#2 sin16s_gen2::i#1 ] zp[4]:126 [ sin16s_gen2::$6 ] zp[4]:11 [ sin16s_gen2::x#2 sin16s_gen2::x#1 ] zp[2]:130 [ sin16s_gen2::$8 ] zp[2]:15 [ sin16s_gen2::sintab#2 sin16s_gen2::sintab#0 ] zp[4]:116 [ sin16s_gen2::step#0 ] 
 Uplifting [div32u16u] best 26601 combination zp[2]:165 [ div32u16u::quotient_lo#0 ] zp[2]:161 [ div32u16u::quotient_hi#0 ] zp[4]:167 [ div32u16u::return#1 ] zp[4]:112 [ div32u16u::return#0 ] 
 Uplifting [main] best 26601 combination zp[1]:8 [ main::r_add#10 main::r_add#12 main::r_add#1 ] zp[2]:69 [ main::$26 ] zp[2]:71 [ main::$30 ] zp[4]:79 [ main::xpos#0 ] zp[2]:85 [ main::$7 ] zp[2]:89 [ main::$27 ] zp[2]:91 [ main::$31 ] zp[4]:99 [ main::ypos#0 ] zp[2]:105 [ main::$11 ] zp[2]:2 [ main::idx_x#11 main::idx_x#10 main::idx_x#1 ] zp[2]:6 [ main::idx_y#3 main::idx_y#10 main::idx_y#1 ] zp[2]:73 [ main::cos_x#0 ] zp[2]:83 [ main::$28 ] zp[2]:93 [ main::sin_y#0 ] zp[2]:103 [ main::$29 ] zp[2]:4 [ main::r#10 main::r#1 ] zp[2]:107 [ main::y#0 ] zp[2]:87 [ main::x#0 ] 
@@ -4250,14 +4247,14 @@ Coalescing zero page register [ zp[2]:56 [ divr16u::rem#5 divr16u::rem#10 divr16
 Coalescing zero page register [ zp[2]:63 [ mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 ] ] with [ zp[2]:58 [ divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ] ]
 Coalescing zero page register [ zp[2]:83 [ main::$28 main::$7 main::x#0 bitmap_plot::x#0 ] ] with [ zp[2]:60 [ divr16u::quotient#3 divr16u::return#0 divr16u::quotient#1 divr16u::quotient#2 divr16u::return#2 divr16u::return#3 div32u16u::quotient_lo#0 ] ]
 Coalescing zero page register [ zp[2]:152 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 ] ] with [ zp[2]:130 [ sin16s_gen2::$8 ] ]
-Coalescing zero page register [ zp[2]:154 [ bitmap_plot::$0 ] ] with [ zp[2]:140 [ mul16s::$6 mul16s::$11 ] ]
+Coalescing zero page register [ zp[2]:154 [ bitmap_plot::$1 ] ] with [ zp[2]:140 [ mul16s::$6 mul16s::$11 ] ]
 Coalescing zero page register [ zp[2]:161 [ div32u16u::quotient_hi#0 ] ] with [ zp[2]:144 [ mul16s::$9 mul16s::$12 ] ]
 Coalescing zero page register [ zp[4]:171 [ sin16s::$4 ] ] with [ zp[4]:52 [ mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ] ]
 Coalescing zero page register [ zp[2]:103 [ main::$29 main::$11 main::y#0 ] ] with [ zp[2]:20 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 sin16s_gen2::i#2 sin16s_gen2::i#1 ] ]
 Coalescing zero page register [ zp[2]:152 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sin16s_gen2::$8 ] ] with [ zp[2]:44 [ mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ] ]
-Coalescing zero page register [ zp[2]:154 [ bitmap_plot::$0 mul16s::$6 mul16s::$11 ] ] with [ zp[2]:56 [ divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ] ]
+Coalescing zero page register [ zp[2]:154 [ bitmap_plot::$1 mul16s::$6 mul16s::$11 ] ] with [ zp[2]:56 [ divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ] ]
 Coalescing zero page register [ zp[2]:175 [ sin16s::x1#0 ] ] with [ zp[2]:161 [ div32u16u::quotient_hi#0 mul16s::$9 mul16s::$12 ] ]
-Coalescing zero page register [ zp[2]:177 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 ] ] with [ zp[2]:154 [ bitmap_plot::$0 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ] ]
+Coalescing zero page register [ zp[2]:177 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 ] ] with [ zp[2]:154 [ bitmap_plot::$1 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ] ]
 Allocated (was zp[4]:11) zp[4]:9 [ sin16s_gen2::x#2 sin16s_gen2::x#1 ]
 Allocated (was zp[2]:24) zp[2]:13 [ mul16s::b#3 mul16s::b#2 mul16s::b#1 main::cos_x#0 main::sin_y#0 main::$26 main::$30 main::$27 main::$31 ]
 Allocated (was zp[4]:26) zp[4]:15 [ mul16s::m#4 mul16s::m#5 mul16s::m#1 mul16s::m#0 mul16s::m#2 mul16u::return#3 mul16s::return#1 mul16u::res#2 mul16u::res#6 mul16u::res#1 mul16u::return#0 mul16s::return#3 main::xpos#0 mul16s::return#4 main::ypos#0 mul16s::return#0 sin16s_gen2::$6 mulu16_sel::$0 mulu16_sel::$1 ]
@@ -4272,7 +4269,7 @@ Allocated (was zp[1]:132) zp[1]:36 [ bitmap_init::$7 ]
 Allocated (was zp[2]:152) zp[2]:37 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sin16s_gen2::$8 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ]
 Allocated (was zp[4]:171) zp[4]:39 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 Allocated (was zp[2]:175) zp[2]:43 [ sin16s::x1#0 div32u16u::quotient_hi#0 mul16s::$9 mul16s::$12 ]
-Allocated (was zp[2]:177) zp[2]:45 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 bitmap_plot::$0 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]
+Allocated (was zp[2]:177) zp[2]:45 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 bitmap_plot::$1 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]
 Allocated (was zp[2]:208) zp[2]:47 [ rem16u#14 ]
 Interrupt procedure irq clobbers AnzP
 
@@ -5231,7 +5228,7 @@ mul16s: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($1c) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $2d
+    .label __1 = $2d
     .label plotter = $25
     .label x = $1c
     // [137] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -5239,24 +5236,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [138] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [138] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [140] bitmap_plot::$1 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
+    // [140] bitmap_plot::$2 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -6271,8 +6268,8 @@ byte* bitmap_init::yoffs#1 yoffs zp[2]:30 2002.0
 byte* bitmap_init::yoffs#2 yoffs zp[2]:30 625.625
 byte* bitmap_init::yoffs#4 yoffs zp[2]:30 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:45 2002.0
-byte~ bitmap_plot::$1 reg byte x 2002.0
+word~ bitmap_plot::$1 zp[2]:45 2002.0
+byte~ bitmap_plot::$2 reg byte x 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:37 500.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:37 1501.5
@@ -6540,10 +6537,10 @@ reg byte a [ bitmap_init::$4 ]
 reg byte a [ bitmap_init::$5 ]
 reg byte a [ bitmap_init::$6 ]
 zp[2]:37 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sin16s_gen2::$8 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ]
-reg byte x [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]
 zp[4]:39 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 zp[2]:43 [ sin16s::x1#0 div32u16u::quotient_hi#0 mul16s::$9 mul16s::$12 ]
-zp[2]:45 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 bitmap_plot::$0 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]
+zp[2]:45 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 bitmap_plot::$1 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]
 reg byte a [ mul16u::$1 ]
 reg byte a [ divr16u::$1 ]
 reg byte a [ divr16u::$2 ]
@@ -7465,37 +7462,37 @@ mul16s: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp($1c) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $2d
+    .label __1 = $2d
     .label plotter = $25
     .label x = $1c
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [137] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#0] w= bitmap_plot_ylo[bitmap_plot::y#0] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [138] bitmap_plot::$0 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [138] bitmap_plot::$1 = bitmap_plot::x#0 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [139] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [140] bitmap_plot::$1 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
+    // [140] bitmap_plot::$2 = byte0  bitmap_plot::x#0 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [141] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -7554,7 +7551,7 @@ div32u16u: {
     // div32u16u::@2
     // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u)
     // [150] div32u16u::quotient_lo#0 = divr16u::return#3
-    // unsigned long quotient = { quotient_hi, quotient_lo}
+    // MAKEDWORD( quotient_hi, quotient_lo )
     // [151] div32u16u::return#1 = div32u16u::quotient_hi#0 dw= div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda.z quotient_hi
     sta.z return+2

src/test/ref/bitmap-plot-2.sym

@@ -56,8 +56,8 @@ byte* bitmap_init::yoffs#1 yoffs zp[2]:30 2002.0
 byte* bitmap_init::yoffs#2 yoffs zp[2]:30 625.625
 byte* bitmap_init::yoffs#4 yoffs zp[2]:30 1001.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:45 2002.0
-byte~ bitmap_plot::$1 reg byte x 2002.0
+word~ bitmap_plot::$1 zp[2]:45 2002.0
+byte~ bitmap_plot::$2 reg byte x 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:37 500.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:37 1501.5
@@ -325,10 +325,10 @@ reg byte a [ bitmap_init::$4 ]
 reg byte a [ bitmap_init::$5 ]
 reg byte a [ bitmap_init::$6 ]
 zp[2]:37 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sin16s_gen2::$8 mul16u::b#2 mul16u::b#1 mul16u::b#0 mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ]
-reg byte x [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]
 zp[4]:39 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 zp[2]:43 [ sin16s::x1#0 div32u16u::quotient_hi#0 mul16s::$9 mul16s::$12 ]
-zp[2]:45 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 bitmap_plot::$0 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]
+zp[2]:45 [ mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 bitmap_plot::$1 mul16s::$6 mul16s::$11 divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 mul16u::a#3 mul16u::a#6 mul16u::a#2 mul16u::a#0 mul16u::a#1 ]
 reg byte a [ mul16u::$1 ]
 reg byte a [ divr16u::$1 ]
 reg byte a [ divr16u::$2 ]

src/test/ref/bitmap-plot-3.asm

@@ -514,10 +514,10 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(6) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $1b
+    .label __1 = $1b
     .label plotter = $19
     .label x = 6
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -525,17 +525,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x

src/test/ref/bitmap-plot-3.cfg

@@ -252,10 +252,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [120] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [120] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [121] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [122] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [124] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [122] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [124] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [126] return 

src/test/ref/bitmap-plot-3.log

@@ -123,11 +123,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_line::@6 bitmap_line::@9
   bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#4], bitmap_plot_ylo[bitmap_plot::y#4] }
-  bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -893,8 +894,9 @@ word bitmap_line::y2#7
 word bitmap_line::y2#8
 word bitmap_line::y2#9
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -1045,8 +1047,6 @@ word sgn_u16::w#0
 word sgn_u16::w#1
 word sgn_u16::w#2
 
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#4] w= (byte)bitmap_plot_ylo[bitmap_plot::y#4]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) $40 in 
 Adding number conversion cast (unumber) 1 in bitmap_init::bits#1 = bitmap_init::bits#3 >> 1
 Adding number conversion cast (unumber) 0 in bitmap_init::$0 = bitmap_init::bits#1 == 0
@@ -1062,8 +1062,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#1 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#4 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#4 & (unumber)$fff8
 Adding number conversion cast (unumber) 0 in bitmap_line::$4 = bitmap_line::dx#1 == 0
 Adding number conversion cast (unumber) 0 in bitmap_line::$5 = bitmap_line::dy#0 == 0
 Adding number conversion cast (unumber) 2 in bitmap_line::$20 = bitmap_line::dy#2 / 2
@@ -1122,8 +1122,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#4]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#4]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast 0
 Simplifying constant integer cast 0
@@ -1189,7 +1187,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
 Inferred type updated to word in bitmap_line::$20 = bitmap_line::dy#2 / 2
 Inferred type updated to word in bitmap_line::$15 = bitmap_line::dx#3 / 2
 Inferred type updated to byte in abs_u16::$1 = abs_u16::$0 & $80
@@ -1475,7 +1473,7 @@ Constant right-side identified [107] main::toD0181_return#0 = main::toD0181_$2 |
 Successful SSA optimization Pass2ConstantRValueConsolidation
 Constant main::toD0181_return#0 = main::toD0181_$2|main::toD0181_$5
 Successful SSA optimization Pass2ConstantIdentification
-Inlining Noop Cast [25] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [25] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Successful SSA optimization Pass2NopCastInlining
 Inlining Noop Cast [83] memset::$4 = (byte*)memset::str#3 keeping memset::str#3
 Inlining Noop Cast [85] memset::dst#0 = (byte*)memset::str#3 keeping memset::str#3
@@ -1925,10 +1923,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [120] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [120] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [121] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [122] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [124] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [122] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [124] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [126] return 
@@ -2018,8 +2016,8 @@ word bitmap_line::y1#0 17.291666666666664
 word bitmap_line::y2
 word bitmap_line::y2#0 319.1875
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 200002.0
-byte~ bitmap_plot::$1 200002.0
+word~ bitmap_plot::$1 200002.0
+byte~ bitmap_plot::$2 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 50000.5
 byte* bitmap_plot::plotter#1 150001.5
@@ -2116,9 +2114,9 @@ Added variable abs_u16::$1 to live range equivalence class [ abs_u16::$1 ]
 Added variable sgn_u16::$0 to live range equivalence class [ sgn_u16::$0 ]
 Added variable sgn_u16::$1 to live range equivalence class [ sgn_u16::$1 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Complete equivalence classes
 [ main::i#2 main::i#1 ]
 [ main::a#2 main::a#1 ]
@@ -2161,9 +2159,9 @@ Complete equivalence classes
 [ sgn_u16::$0 ]
 [ sgn_u16::$1 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 Allocated zp[1]:2 [ main::i#2 main::i#1 ]
 Allocated zp[1]:3 [ main::a#2 main::a#1 ]
 Allocated zp[1]:4 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ]
@@ -2205,9 +2203,9 @@ Allocated zp[1]:64 [ abs_u16::$1 ]
 Allocated zp[1]:65 [ sgn_u16::$0 ]
 Allocated zp[1]:66 [ sgn_u16::$1 ]
 Allocated zp[2]:67 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:69 [ bitmap_plot::$0 ]
+Allocated zp[2]:69 [ bitmap_plot::$1 ]
 Allocated zp[2]:71 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:73 [ bitmap_plot::$1 ]
+Allocated zp[1]:73 [ bitmap_plot::$2 ]
 REGISTER UPLIFT POTENTIAL REGISTERS
 Equivalence Class zp[1]:42 [ bitmap_init::$4 ] has ALU potential.
 Statement [4] *D011 = VICII_BMM|VICII_DEN|VICII_RSEL|3 [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -2265,9 +2263,9 @@ Statement [104] *memset::dst#2 = memset::c#4 [ memset::c#4 memset::end#0 memset:
 Removing always clobbered register reg byte y as potential for zp[1]:21 [ memset::c#4 ]
 Statement [110] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( bitmap_line:16::abs_u16:47 [ main::i#2 main::a#2 bitmap_line::x1#0 bitmap_line::x2#0 bitmap_line::y1#0 bitmap_line::y2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 } { abs_u16::return#0 = abs_u16::return#4 } }  bitmap_line:16::abs_u16:51 [ main::i#2 main::a#2 bitmap_line::x1#0 bitmap_line::x2#0 bitmap_line::y1#0 bitmap_line::y2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { abs_u16::w#1 = abs_u16::w#2 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [121] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [122] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [122] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte y as potential for zp[1]:2 [ main::i#2 main::i#1 ]
 Removing always clobbered register reg byte y as potential for zp[1]:3 [ main::a#2 main::a#1 ]
 Statement [4] *D011 = VICII_BMM|VICII_DEN|VICII_RSEL|3 [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -2322,9 +2320,9 @@ Statement [102] if(memset::dst#2!=memset::end#0) goto memset::@3 [ memset::c#4 m
 Statement [104] *memset::dst#2 = memset::c#4 [ memset::c#4 memset::end#0 memset::dst#2 ] ( bitmap_clear:3::memset:42 [ memset::c#4 memset::end#0 memset::dst#2 ] { }  bitmap_clear:3::memset:44 [ memset::c#4 memset::end#0 memset::dst#2 ] { }  ) always clobbers reg byte a reg byte y 
 Statement [110] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( bitmap_line:16::abs_u16:47 [ main::i#2 main::a#2 bitmap_line::x1#0 bitmap_line::x2#0 bitmap_line::y1#0 bitmap_line::y2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 } { abs_u16::return#0 = abs_u16::return#4 } }  bitmap_line:16::abs_u16:51 [ main::i#2 main::a#2 bitmap_line::x1#0 bitmap_line::x2#0 bitmap_line::y1#0 bitmap_line::y2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { abs_u16::w#1 = abs_u16::w#2 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [121] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [122] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [122] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
 Statement [4] *D011 = VICII_BMM|VICII_DEN|VICII_RSEL|3 [ ] (  [ ] { }  ) always clobbers reg byte a 
 Statement [6] *D018 = main::toD0181_return#0 [ ] (  [ ] { }  ) always clobbers reg byte a 
 Statement [8] if(main::i#2!=8) goto main::@2 [ main::i#2 main::a#2 ] (  [ main::i#2 main::a#2 ] { }  ) always clobbers reg byte a 
@@ -2377,9 +2375,9 @@ Statement [102] if(memset::dst#2!=memset::end#0) goto memset::@3 [ memset::c#4 m
 Statement [104] *memset::dst#2 = memset::c#4 [ memset::c#4 memset::end#0 memset::dst#2 ] ( bitmap_clear:3::memset:42 [ memset::c#4 memset::end#0 memset::dst#2 ] { }  bitmap_clear:3::memset:44 [ memset::c#4 memset::end#0 memset::dst#2 ] { }  ) always clobbers reg byte a reg byte y 
 Statement [110] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( bitmap_line:16::abs_u16:47 [ main::i#2 main::a#2 bitmap_line::x1#0 bitmap_line::x2#0 bitmap_line::y1#0 bitmap_line::y2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 } { abs_u16::return#0 = abs_u16::return#4 } }  bitmap_line:16::abs_u16:51 [ main::i#2 main::a#2 bitmap_line::x1#0 bitmap_line::x2#0 bitmap_line::y1#0 bitmap_line::y2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { abs_u16::w#1 = abs_u16::w#2 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [121] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [122] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [122] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( bitmap_line:16::bitmap_plot:69 [ main::i#2 main::a#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  bitmap_line:16::bitmap_plot:80 [ main::i#2 main::a#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  bitmap_line:16::bitmap_plot:86 [ main::i#2 main::a#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  bitmap_line:16::bitmap_plot:96 [ main::i#2 main::a#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
 Potential registers zp[1]:2 [ main::i#2 main::i#1 ] : zp[1]:2 , 
 Potential registers zp[1]:3 [ main::a#2 main::a#1 ] : zp[1]:3 , reg byte x , 
 Potential registers zp[1]:4 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] : zp[1]:4 , reg byte a , reg byte x , reg byte y , 
@@ -2421,12 +2419,12 @@ Potential registers zp[1]:64 [ abs_u16::$1 ] : zp[1]:64 , reg byte a , reg byte
 Potential registers zp[1]:65 [ sgn_u16::$0 ] : zp[1]:65 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:66 [ sgn_u16::$1 ] : zp[1]:66 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:67 [ bitmap_plot::plotter#0 ] : zp[2]:67 , 
-Potential registers zp[2]:69 [ bitmap_plot::$0 ] : zp[2]:69 , 
+Potential registers zp[2]:69 [ bitmap_plot::$1 ] : zp[2]:69 , 
 Potential registers zp[2]:71 [ bitmap_plot::plotter#1 ] : zp[2]:71 , 
-Potential registers zp[1]:73 [ bitmap_plot::$1 ] : zp[1]:73 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:73 [ bitmap_plot::$2 ] : zp[1]:73 , reg byte a , reg byte x , reg byte y , 
 
 REGISTER UPLIFT SCOPES
-Uplift Scope [bitmap_plot] 260,614: zp[1]:30 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] 200,002: zp[2]:69 [ bitmap_plot::$0 ] 200,002: zp[1]:73 [ bitmap_plot::$1 ] 150,001.5: zp[2]:71 [ bitmap_plot::plotter#1 ] 75,255.5: zp[2]:31 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] 50,000.5: zp[2]:67 [ bitmap_plot::plotter#0 ] 
+Uplift Scope [bitmap_plot] 260,614: zp[1]:30 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] 200,002: zp[2]:69 [ bitmap_plot::$1 ] 200,002: zp[1]:73 [ bitmap_plot::$2 ] 150,001.5: zp[2]:71 [ bitmap_plot::plotter#1 ] 75,255.5: zp[2]:31 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] 50,000.5: zp[2]:67 [ bitmap_plot::plotter#0 ] 
 Uplift Scope [bitmap_line] 69,095.99: zp[2]:11 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x1#0 bitmap_line::x#12 bitmap_line::x#1 ] 55,062.47: zp[2]:13 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y1#0 bitmap_line::y#1 bitmap_line::y#2 ] 52,560.77: zp[2]:9 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] 52,560.77: zp[2]:15 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] 844.64: zp[2]:51 [ bitmap_line::dy#0 ] 773.19: zp[2]:59 [ bitmap_line::sy#0 ] 760.17: zp[2]:47 [ bitmap_line::dx#0 ] 670.1: zp[2]:55 [ bitmap_line::sx#0 ] 319.19: zp[2]:39 [ bitmap_line::y2#0 ] 300.41: zp[2]:37 [ bitmap_line::x2#0 ] 
 Uplift Scope [abs_u16] 3,758.25: zp[2]:24 [ abs_u16::return#4 abs_u16::return#2 abs_u16::w#2 abs_u16::w#0 abs_u16::w#1 ] 2,002: zp[1]:63 [ abs_u16::$0 ] 2,002: zp[1]:64 [ abs_u16::$1 ] 202: zp[2]:45 [ abs_u16::return#0 ] 202: zp[2]:49 [ abs_u16::return#1 ] 
 Uplift Scope [sgn_u16] 2,002: zp[1]:65 [ sgn_u16::$0 ] 2,002: zp[1]:66 [ sgn_u16::$1 ] 1,607: zp[2]:26 [ sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ] 202: zp[2]:53 [ sgn_u16::return#0 ] 202: zp[2]:57 [ sgn_u16::return#1 ] 50.5: zp[2]:28 [ sgn_u16::return#4 ] 
@@ -2440,7 +2438,7 @@ Uplift Scope [bitmap_clear]
 Uplift Scope [RADIX] 
 Uplift Scope [] 
 
-Uplifting [bitmap_plot] best 32982 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:69 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:71 [ bitmap_plot::plotter#1 ] zp[2]:31 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:67 [ bitmap_plot::plotter#0 ] 
+Uplifting [bitmap_plot] best 32982 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:69 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:71 [ bitmap_plot::plotter#1 ] zp[2]:31 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:67 [ bitmap_plot::plotter#0 ] 
 Uplifting [bitmap_line] best 32982 combination zp[2]:11 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x1#0 bitmap_line::x#12 bitmap_line::x#1 ] zp[2]:13 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y1#0 bitmap_line::y#1 bitmap_line::y#2 ] zp[2]:9 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] zp[2]:15 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] zp[2]:51 [ bitmap_line::dy#0 ] zp[2]:59 [ bitmap_line::sy#0 ] zp[2]:47 [ bitmap_line::dx#0 ] zp[2]:55 [ bitmap_line::sx#0 ] zp[2]:39 [ bitmap_line::y2#0 ] zp[2]:37 [ bitmap_line::x2#0 ] 
 Uplifting [abs_u16] best 32972 combination zp[2]:24 [ abs_u16::return#4 abs_u16::return#2 abs_u16::w#2 abs_u16::w#0 abs_u16::w#1 ] reg byte a [ abs_u16::$0 ] reg byte a [ abs_u16::$1 ] zp[2]:45 [ abs_u16::return#0 ] zp[2]:49 [ abs_u16::return#1 ] 
 Uplifting [sgn_u16] best 32962 combination reg byte a [ sgn_u16::$0 ] reg byte a [ sgn_u16::$1 ] zp[2]:26 [ sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ] zp[2]:53 [ sgn_u16::return#0 ] zp[2]:57 [ sgn_u16::return#1 ] zp[2]:28 [ sgn_u16::return#4 ] 
@@ -2492,7 +2490,7 @@ Allocated (was zp[1]:41) zp[1]:20 [ bitmap_init::$7 ]
 Allocated (was zp[2]:47) zp[2]:21 [ bitmap_line::dx#0 ]
 Allocated (was zp[2]:55) zp[2]:23 [ bitmap_line::sx#0 ]
 Allocated (was zp[2]:67) zp[2]:25 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-Allocated (was zp[2]:69) zp[2]:27 [ bitmap_plot::$0 ]
+Allocated (was zp[2]:69) zp[2]:27 [ bitmap_plot::$1 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
@@ -3281,7 +3279,7 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(6) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $1b
+    .label __1 = $1b
     .label plotter = $19
     .label x = 6
     // [121] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -3289,24 +3287,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [122] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [122] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [124] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [124] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -3572,8 +3570,8 @@ word bitmap_line::y1#0 y1 zp[2]:8 17.291666666666664
 word bitmap_line::y2
 word bitmap_line::y2#0 y2 zp[2]:18 319.1875
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:27 200002.0
-byte~ bitmap_plot::$1 reg byte x 200002.0
+word~ bitmap_plot::$1 zp[2]:27 200002.0
+byte~ bitmap_plot::$2 reg byte x 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:25 50000.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:25 150001.5
@@ -3658,8 +3656,8 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:25 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-zp[2]:27 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:27 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]
 
 
 FINAL ASSEMBLER
@@ -4416,37 +4414,37 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(6) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $1b
+    .label __1 = $1b
     .label plotter = $19
     .label x = 6
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [121] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [122] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [122] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [123] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [124] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [124] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [125] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y

src/test/ref/bitmap-plot-3.sym

@@ -95,8 +95,8 @@ word bitmap_line::y1#0 y1 zp[2]:8 17.291666666666664
 word bitmap_line::y2
 word bitmap_line::y2#0 y2 zp[2]:18 319.1875
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:27 200002.0
-byte~ bitmap_plot::$1 reg byte x 200002.0
+word~ bitmap_plot::$1 zp[2]:27 200002.0
+byte~ bitmap_plot::$2 reg byte x 200002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:25 50000.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:25 150001.5
@@ -181,5 +181,5 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:25 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-zp[2]:27 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:27 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]

src/test/ref/c64dtv-gfxmodes.asm

@@ -2997,10 +2997,10 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(9) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $23
+    .label __1 = $23
     .label plotter = $21
     .label x = 9
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -3008,17 +3008,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x

src/test/ref/c64dtv-gfxmodes.cfg

@@ -1502,10 +1502,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [822] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [822] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [823] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [824] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [826] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [824] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [826] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [828] return 

src/test/ref/c64dtv-gfxmodes.log

@@ -358,11 +358,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_line::@6 bitmap_line::@9
   bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#4], bitmap_plot_ylo[bitmap_plot::y#4] }
-  bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -3398,8 +3399,9 @@ word bitmap_line::y2#7
 word bitmap_line::y2#8
 word bitmap_line::y2#9
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -5061,8 +5063,6 @@ word sgn_u16::w#0
 word sgn_u16::w#1
 word sgn_u16::w#2
 
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#4] w= (byte)bitmap_plot_ylo[bitmap_plot::y#4]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) 0 in print_str_lines::$3 = 0 != *print_str_lines::str#2
 Adding number conversion cast (unumber) 0 in print_str_lines::$5 = 0 != print_str_lines::ch#0
 Adding number conversion cast (unumber) 0 in print_str_lines::$4 = 0 != print_str_lines::ch#1
@@ -5086,8 +5086,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#2 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#4 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#4 & (unumber)$fff8
 Adding number conversion cast (unumber) 0 in bitmap_line::$4 = bitmap_line::dx#1 == 0
 Adding number conversion cast (unumber) 0 in bitmap_line::$5 = bitmap_line::dy#0 == 0
 Adding number conversion cast (unumber) 2 in bitmap_line::$20 = bitmap_line::dy#2 / 2
@@ -5619,8 +5619,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#4]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#4]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast 0
 Simplifying constant integer cast 0
@@ -6179,7 +6177,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
 Inferred type updated to word in bitmap_line::$20 = bitmap_line::dy#2 / 2
 Inferred type updated to word in bitmap_line::$15 = bitmap_line::dx#3 / 2
 Inferred type updated to byte in abs_u16::$1 = abs_u16::$0 & $80
@@ -7472,7 +7470,7 @@ Successful SSA optimization Pass2ConstantIdentification
 Inlining Noop Cast [28] memset::$4 = (byte*)memset::str#4 keeping memset::str#4
 Inlining Noop Cast [30] memset::dst#0 = (byte*)memset::str#4 keeping memset::str#4
 Successful SSA optimization Pass2NopCastInlining
-Inlining Noop Cast [73] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [73] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Successful SSA optimization Pass2NopCastInlining
 Rewriting division to use shift [101] bitmap_line::e1#0 = bitmap_line::dy#0 / 2
 Rewriting division to use shift [102] bitmap_line::e#0 = bitmap_line::dx#0 / 2
@@ -10022,10 +10020,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [822] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [822] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [823] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [824] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [826] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [824] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [826] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [828] return 
@@ -10149,8 +10147,8 @@ word bitmap_line::y1#0 164000.2
 word bitmap_line::y2
 word bitmap_line::y2#0 3.1315625125E7
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 2.0000000002E10
-byte~ bitmap_plot::$1 2.0000000002E10
+word~ bitmap_plot::$1 2.0000000002E10
+byte~ bitmap_plot::$2 2.0000000002E10
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 5.0000000005E9
 byte* bitmap_plot::plotter#1 1.50000000015E10
@@ -10902,9 +10900,9 @@ Added variable abs_u16::$1 to live range equivalence class [ abs_u16::$1 ]
 Added variable sgn_u16::$0 to live range equivalence class [ sgn_u16::$0 ]
 Added variable sgn_u16::$1 to live range equivalence class [ sgn_u16::$1 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Complete equivalence classes
 [ bitmap_gfx#14 bitmap_gfx#15 ]
 [ bitmap_screen#14 bitmap_screen#15 ]
@@ -11142,9 +11140,9 @@ Complete equivalence classes
 [ sgn_u16::$0 ]
 [ sgn_u16::$1 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 Allocated zp[2]:2 [ bitmap_gfx#14 bitmap_gfx#15 ]
 Allocated zp[2]:4 [ bitmap_screen#14 bitmap_screen#15 ]
 Allocated zp[1]:6 [ menu::i#2 menu::i#1 ]
@@ -11381,9 +11379,9 @@ Allocated zp[1]:291 [ abs_u16::$1 ]
 Allocated zp[1]:292 [ sgn_u16::$0 ]
 Allocated zp[1]:293 [ sgn_u16::$1 ]
 Allocated zp[2]:294 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:296 [ bitmap_plot::$0 ]
+Allocated zp[2]:296 [ bitmap_plot::$1 ]
 Allocated zp[2]:298 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:300 [ bitmap_plot::$1 ]
+Allocated zp[1]:300 [ bitmap_plot::$2 ]
 REGISTER UPLIFT POTENTIAL REGISTERS
 Equivalence Class zp[1]:271 [ bitmap_init::$4 ] has ALU potential.
 Statement [1] *PROCPORT_DDR = PROCPORT_DDR_MEMORY_MASK [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -11805,9 +11803,9 @@ Statement [801] bitmap_plot::x#0 = bitmap_line::x1#0 [ bitmap_line::y1#0 bitmap_
 Statement asm { .byte$32,$dd lda$ff .byte$32,$00  } always clobbers reg byte a 
 Statement [812] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::abs_u16:754 [ mode_stdbitmap::l#2 bitmap_line::x1#0 bitmap_line::y1#0 bitmap_line::x2#0 bitmap_line::y2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 } { abs_u16::return#0 = abs_u16::return#4 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::abs_u16:758 [ mode_stdbitmap::l#2 bitmap_line::x1#0 bitmap_line::y1#0 bitmap_line::x2#0 bitmap_line::y2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { abs_u16::w#1 = abs_u16::w#2 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [823] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [824] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [824] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte y as potential for zp[1]:40 [ mode_stdbitmap::l#2 mode_stdbitmap::l#1 ]
 Statement [1] *PROCPORT_DDR = PROCPORT_DDR_MEMORY_MASK [ ] (  [ ] { }  ) always clobbers reg byte a 
 Statement [2] *PROCPORT = PROCPORT_RAM_IO [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -12129,9 +12127,9 @@ Statement [801] bitmap_plot::x#0 = bitmap_line::x1#0 [ bitmap_line::y1#0 bitmap_
 Statement asm { .byte$32,$dd lda$ff .byte$32,$00  } always clobbers reg byte a 
 Statement [812] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::abs_u16:754 [ mode_stdbitmap::l#2 bitmap_line::x1#0 bitmap_line::y1#0 bitmap_line::x2#0 bitmap_line::y2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 } { abs_u16::return#0 = abs_u16::return#4 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::abs_u16:758 [ mode_stdbitmap::l#2 bitmap_line::x1#0 bitmap_line::y1#0 bitmap_line::x2#0 bitmap_line::y2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { abs_u16::w#1 = abs_u16::w#2 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [823] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [824] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [824] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:776 [ mode_stdbitmap::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:787 [ mode_stdbitmap::l#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:793 [ mode_stdbitmap::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  menu:6::mode_stdbitmap:57::bitmap_line:288::bitmap_plot:803 [ mode_stdbitmap::l#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
 Potential registers zp[2]:2 [ bitmap_gfx#14 bitmap_gfx#15 ] : zp[2]:2 , 
 Potential registers zp[2]:4 [ bitmap_screen#14 bitmap_screen#15 ] : zp[2]:4 , 
 Potential registers zp[1]:6 [ menu::i#2 menu::i#1 ] : zp[1]:6 , reg byte x , reg byte y , 
@@ -12368,12 +12366,12 @@ Potential registers zp[1]:291 [ abs_u16::$1 ] : zp[1]:291 , reg byte a , reg byt
 Potential registers zp[1]:292 [ sgn_u16::$0 ] : zp[1]:292 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:293 [ sgn_u16::$1 ] : zp[1]:293 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:294 [ bitmap_plot::plotter#0 ] : zp[2]:294 , 
-Potential registers zp[2]:296 [ bitmap_plot::$0 ] : zp[2]:296 , 
+Potential registers zp[2]:296 [ bitmap_plot::$1 ] : zp[2]:296 , 
 Potential registers zp[2]:298 [ bitmap_plot::plotter#1 ] : zp[2]:298 , 
-Potential registers zp[1]:300 [ bitmap_plot::$1 ] : zp[1]:300 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:300 [ bitmap_plot::$2 ] : zp[1]:300 , reg byte a , reg byte x , reg byte y , 
 
 REGISTER UPLIFT SCOPES
-Uplift Scope [bitmap_plot] 26,006,000,014: zp[1]:154 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] 20,000,000,002: zp[2]:296 [ bitmap_plot::$0 ] 20,000,000,002: zp[1]:300 [ bitmap_plot::$1 ] 15,000,000,001.5: zp[2]:298 [ bitmap_plot::plotter#1 ] 7,502,500,005.5: zp[2]:155 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] 5,000,000,000.5: zp[2]:294 [ bitmap_plot::plotter#0 ] 
+Uplift Scope [bitmap_plot] 26,006,000,014: zp[1]:154 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] 20,000,000,002: zp[2]:296 [ bitmap_plot::$1 ] 20,000,000,002: zp[1]:300 [ bitmap_plot::$2 ] 15,000,000,001.5: zp[2]:298 [ bitmap_plot::plotter#1 ] 7,502,500,005.5: zp[2]:155 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] 5,000,000,000.5: zp[2]:294 [ bitmap_plot::plotter#0 ] 
 Uplift Scope [bitmap_line] 6,894,454,008.53: zp[2]:141 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x1#0 bitmap_line::x#12 bitmap_line::x#1 ] 5,500,556,863.24: zp[2]:143 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y1#0 bitmap_line::y#1 bitmap_line::y#2 ] 5,235,533,340.77: zp[2]:139 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] 5,235,533,340.77: zp[2]:145 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] 83,444,444.64: zp[2]:280 [ bitmap_line::dy#0 ] 76,961,538.58: zp[2]:288 [ bitmap_line::sy#0 ] 75,100,000.17: zp[2]:276 [ bitmap_line::dx#0 ] 66,700,000.1: zp[2]:284 [ bitmap_line::sx#0 ] 31,315,625.12: zp[2]:214 [ bitmap_line::y2#0 ] 30,366,666.79: zp[2]:212 [ bitmap_line::x2#0 ] 
 Uplift Scope [] 2,601,131,670.83: zp[2]:130 [ print_line_cursor#19 print_line_cursor#1 print_line_cursor#2 ] 150,935,719.36: zp[2]:11 [ print_char_cursor#37 print_char_cursor#2 print_char_cursor#103 print_char_cursor#38 print_char_cursor#26 ] 1,480,786.1: zp[1]:132 [ dtv_control#116 dtv_control#146 dtv_control#16 ] 384.49: zp[2]:2 [ bitmap_gfx#14 bitmap_gfx#15 ] 384.49: zp[2]:4 [ bitmap_screen#14 bitmap_screen#15 ] 
 Uplift Scope [keyboard_matrix_read] 1,100,000,002: zp[1]:185 [ keyboard_matrix_read::rowid#0 ] 366,666,667.33: zp[1]:253 [ keyboard_matrix_read::return#0 ] 200,000,002: zp[1]:186 [ keyboard_matrix_read::return#2 ] 
@@ -12408,7 +12406,7 @@ Uplift Scope [RADIX]
 Uplift Scope [bitmap_clear] 
 Uplift Scope [main] 
 
-Uplifting [bitmap_plot] best 3630008 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:296 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:298 [ bitmap_plot::plotter#1 ] zp[2]:155 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:294 [ bitmap_plot::plotter#0 ] 
+Uplifting [bitmap_plot] best 3630008 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:296 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:298 [ bitmap_plot::plotter#1 ] zp[2]:155 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:294 [ bitmap_plot::plotter#0 ] 
 Uplifting [bitmap_line] best 3630008 combination zp[2]:141 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x1#0 bitmap_line::x#12 bitmap_line::x#1 ] zp[2]:143 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y1#0 bitmap_line::y#1 bitmap_line::y#2 ] zp[2]:139 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] zp[2]:145 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] zp[2]:280 [ bitmap_line::dy#0 ] zp[2]:288 [ bitmap_line::sy#0 ] zp[2]:276 [ bitmap_line::dx#0 ] zp[2]:284 [ bitmap_line::sx#0 ] zp[2]:214 [ bitmap_line::y2#0 ] zp[2]:212 [ bitmap_line::x2#0 ] 
 Uplifting [] best 3623672 combination zp[2]:130 [ print_line_cursor#19 print_line_cursor#1 print_line_cursor#2 ] zp[2]:11 [ print_char_cursor#37 print_char_cursor#2 print_char_cursor#103 print_char_cursor#38 print_char_cursor#26 ] reg byte x [ dtv_control#116 dtv_control#146 dtv_control#16 ] zp[2]:2 [ bitmap_gfx#14 bitmap_gfx#15 ] zp[2]:4 [ bitmap_screen#14 bitmap_screen#15 ] 
 Uplifting [keyboard_matrix_read] best 3623660 combination reg byte y [ keyboard_matrix_read::rowid#0 ] reg byte a [ keyboard_matrix_read::return#0 ] zp[1]:186 [ keyboard_matrix_read::return#2 ] 
@@ -12814,7 +12812,7 @@ Allocated (was zp[1]:270) zp[1]:28 [ bitmap_init::$7 mode_8bpppixelcell::$3 mode
 Allocated (was zp[2]:276) zp[2]:29 [ bitmap_line::dx#0 ]
 Allocated (was zp[2]:284) zp[2]:31 [ bitmap_line::sx#0 ]
 Allocated (was zp[2]:294) zp[2]:33 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-Allocated (was zp[2]:296) zp[2]:35 [ bitmap_plot::$0 ]
+Allocated (was zp[2]:296) zp[2]:35 [ bitmap_plot::$1 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
@@ -17520,7 +17518,7 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(9) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $23
+    .label __1 = $23
     .label plotter = $21
     .label x = 9
     // [823] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -17528,24 +17526,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [824] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [824] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [826] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [826] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -18633,8 +18631,8 @@ word bitmap_line::y1#0 y1 zp[2]:11 164000.2
 word bitmap_line::y2
 word bitmap_line::y2#0 y2 zp[2]:21 3.1315625125E7
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:35 2.0000000002E10
-byte~ bitmap_plot::$1 reg byte x 2.0000000002E10
+word~ bitmap_plot::$1 zp[2]:35 2.0000000002E10
+byte~ bitmap_plot::$2 reg byte x 2.0000000002E10
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:33 5.0000000005E9
 byte* bitmap_plot::plotter#1 plotter zp[2]:33 1.50000000015E10
@@ -19357,8 +19355,8 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:33 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-zp[2]:35 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:35 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]
 
 
 FINAL ASSEMBLER
@@ -23908,37 +23906,37 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(9) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $23
+    .label __1 = $23
     .label plotter = $21
     .label x = 9
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [823] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [824] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [824] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [825] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [826] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [826] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [827] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y

src/test/ref/c64dtv-gfxmodes.sym

@@ -163,8 +163,8 @@ word bitmap_line::y1#0 y1 zp[2]:11 164000.2
 word bitmap_line::y2
 word bitmap_line::y2#0 y2 zp[2]:21 3.1315625125E7
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:35 2.0000000002E10
-byte~ bitmap_plot::$1 reg byte x 2.0000000002E10
+word~ bitmap_plot::$1 zp[2]:35 2.0000000002E10
+byte~ bitmap_plot::$2 reg byte x 2.0000000002E10
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:33 5.0000000005E9
 byte* bitmap_plot::plotter#1 plotter zp[2]:33 1.50000000015E10
@@ -887,5 +887,5 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:33 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-zp[2]:35 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:35 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]

src/test/ref/call-parameter-autocast.asm

@@ -24,7 +24,7 @@ main: {
     lda #>w
     sta.z print.w+1
     jsr print
-    // print( {0x12,0x34} )
+    // print( MAKEWORD(0x12,0x34) )
     lda #<$12*$100+$34
     sta.z print.w
     lda #>$12*$100+$34

src/test/ref/call-parameter-autocast.cfg

@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@2
 
 void print(word print::w)
 print: scope:[print]  from main main::@1 main::@2
-  [7] print::w#3 = phi( main/$1234, main::@1/main::w, main::@2/$12*$100+$34 )
+  [7] print::w#3 = phi( main/$1234, main::@1/main::w, main::@2/$12w=$34 )
   [7] idx#13 = phi( main/0, main::@1/idx#14, main::@2/idx#14 )
   [8] print::$0 = idx#13 << 1
   [9] SCREEN[print::$0] = print::w#3

src/test/ref/call-parameter-autocast.log

@@ -17,7 +17,7 @@ main::@1: scope:[main]  from main
 main::@2: scope:[main]  from main::@1
   idx#10 = phi( main::@1/idx#5 )
   idx#1 = idx#10
-  print::w#2 = (word){ $12, $34 }
+  print::w#2 = $12w=$34
   call print 
   to:main::@3
 main::@3: scope:[main]  from main::@2
@@ -98,22 +98,17 @@ word print::w#1
 word print::w#2
 word print::w#3
 
-Fixing inline constructor with main::$3 = (byte)$12 w= (byte)$34
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) $1234 in print::w#0 = $1234
 Successful SSA optimization PassNAddNumberTypeConversions
 Inlining cast print::w#0 = (unumber)$1234
 Successful SSA optimization Pass2InlineCast
 Simplifying constant pointer cast (word*) 1024
 Simplifying constant integer cast $1234
-Simplifying constant integer cast $12
-Simplifying constant integer cast $34
 Successful SSA optimization PassNCastSimplification
 Finalized unsigned number type (word) $1234
 Successful SSA optimization PassNFinalizeNumberTypeConversions
 Alias idx#0 = idx#9 
 Alias idx#1 = idx#10 
-Alias print::w#2 = main::$3 
 Alias idx#11 = idx#2 idx#12 idx#3 
 Alias idx#14 = idx#4 idx#5 
 Alias idx#18 = idx#6 
@@ -125,10 +120,9 @@ Identical Phi Values idx#1 idx#14
 Identical Phi Values idx#11 idx#14
 Identical Phi Values idx#15 idx#11
 Successful SSA optimization Pass2IdenticalPhiElimination
-Constant right-side identified [7] print::w#2 = $12 w= $34
-Successful SSA optimization Pass2ConstantRValueConsolidation
 Constant print::w#0 = $1234
 Constant print::w#1 = main::w
+Constant print::w#2 = $12w=$34
 Constant idx#18 = 0
 Successful SSA optimization Pass2ConstantIdentification
 Removing unused procedure __start
@@ -138,20 +132,6 @@ Removing unused procedure block __start::@1
 Removing unused procedure block __start::@2
 Removing unused procedure block __start::@return
 Successful SSA optimization PassNEliminateEmptyStart
-Adding number conversion cast (unumber) $12*$100+$34 in [2] print::w#2 = $12*$100+$34
-Adding number conversion cast (unumber) $12*$100 in [2] print::w#2 = ((unumber)) $12*$100+$34
-Adding number conversion cast (unumber) $100 in [2] print::w#2 = ((unumber)) (unumber)$12*$100+$34
-Successful SSA optimization PassNAddNumberTypeConversions
-Inlining cast [2] print::w#2 = (unumber)(unumber)$12*(unumber)$100+$34
-Successful SSA optimization Pass2InlineCast
-Simplifying constant integer cast (unumber)$12*(unumber)$100+$34
-Simplifying constant integer cast $12*(unumber)$100
-Simplifying constant integer cast $100
-Successful SSA optimization PassNCastSimplification
-Finalized unsigned number type (word) $100
-Successful SSA optimization PassNFinalizeNumberTypeConversions
-Constant print::w#2 = $12*$100+$34
-Successful SSA optimization Pass2ConstantIdentification
 Rewriting multiplication to use shift [5] print::$0 = idx#13 * SIZEOF_WORD
 Successful SSA optimization Pass2MultiplyToShiftRewriting
 Inlining constant with var siblings print::w#0
@@ -159,12 +139,15 @@ Inlining constant with var siblings print::w#1
 Inlining constant with var siblings print::w#2
 Inlining constant with var siblings idx#18
 Constant inlined idx#18 = 0
-Constant inlined print::w#2 = $12*$100+$34
+Constant inlined print::w#2 = $12w=$34
 Constant inlined print::w#1 = main::w
 Constant inlined print::w#0 = $1234
 Successful SSA optimization Pass2ConstantInlining
 Eliminating unused constant SIZEOF_WORD
 Successful SSA optimization PassNEliminateUnusedVars
+Finalized unsigned number type (byte) $12
+Finalized unsigned number type (byte) $34
+Successful SSA optimization PassNFinalizeNumberTypeConversions
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@3
 CALL GRAPH
@@ -200,7 +183,7 @@ main::@return: scope:[main]  from main::@2
 
 void print(word print::w)
 print: scope:[print]  from main main::@1 main::@2
-  [7] print::w#3 = phi( main/$1234, main::@1/main::w, main::@2/$12*$100+$34 )
+  [7] print::w#3 = phi( main/$1234, main::@1/main::w, main::@2/$12w=$34 )
   [7] idx#13 = phi( main/0, main::@1/idx#14, main::@2/idx#14 )
   [8] print::$0 = idx#13 << 1
   [9] SCREEN[print::$0] = print::w#3
@@ -304,7 +287,7 @@ main: {
     // [5] call print 
     // [7] phi from main::@2 to print [phi:main::@2->print]
   print_from___b2:
-    // [7] phi print::w#3 = $12*$100+$34 [phi:main::@2->print#0] -- vwuz1=vwuc1 
+    // [7] phi print::w#3 = $12w=$34 [phi:main::@2->print#0] -- vwuz1=vwuc1 
     lda #<$12*$100+$34
     sta.z print.w
     lda #>$12*$100+$34
@@ -420,10 +403,10 @@ main: {
     jsr print
     // [4] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
     // main::@2
-    // print( {0x12,0x34} )
+    // print( MAKEWORD(0x12,0x34) )
     // [5] call print 
     // [7] phi from main::@2 to print [phi:main::@2->print]
-    // [7] phi print::w#3 = $12*$100+$34 [phi:main::@2->print#0] -- vwuz1=vwuc1 
+    // [7] phi print::w#3 = $12w=$34 [phi:main::@2->print#0] -- vwuz1=vwuc1 
     lda #<$12*$100+$34
     sta.z print.w
     lda #>$12*$100+$34

src/test/ref/cordic-atan2-16.asm

@@ -21,7 +21,7 @@
 main: {
     .const toD0181_return = (>(SCREEN&$3fff)*4)|(>CHARSET)/4&$f
     .label col00 = COLS+$c*$28+$13
-    .label __3 = $d
+    .label __5 = $d
     .label xw = $13
     .label yw = $15
     .label angle_w = $d
@@ -43,12 +43,12 @@ main: {
     lda #-$13
     sta.z x
   __b2:
-    // signed word xw = (signed word)(word){ (byte)x, 0 }
+    // MAKEWORD( (byte)x, 0 )
     lda #0
     ldy.z x
     sty.z xw+1
     sta.z xw
-    // signed word yw = (signed word)(word){ (byte)y, 0 }
+    // MAKEWORD( (byte)y, 0 )
     ldy.z y
     sty.z yw+1
     sta.z yw
@@ -58,13 +58,13 @@ main: {
     // angle_w+0x0080
     lda #$80
     clc
-    adc.z __3
-    sta.z __3
+    adc.z __5
+    sta.z __5
     bcc !+
-    inc.z __3+1
+    inc.z __5+1
   !:
     // byte ang_w = BYTE1(angle_w+0x0080)
-    lda.z __3+1
+    lda.z __5+1
     // *screen++ = ang_w
     ldy #0
     sta (screen),y

src/test/ref/cordic-atan2-16.cfg

@@ -26,8 +26,8 @@ main::@2: scope:[main]  from main::@1 main::@6
   to:main::@6
 main::@6: scope:[main]  from main::@2
   [12] main::angle_w#0 = atan2_16::return#2
-  [13] main::$3 = main::angle_w#0 + $80
-  [14] main::ang_w#0 = byte1  main::$3
+  [13] main::$5 = main::angle_w#0 + $80
+  [14] main::ang_w#0 = byte1  main::$5
   [15] *main::screen#2 = main::ang_w#0
   [16] main::screen#1 = ++ main::screen#2
   [17] main::x#1 = ++ main::x#2

src/test/ref/cordic-atan2-16.log

@@ -329,8 +329,12 @@ main::@2: scope:[main]  from main::@1 main::@8
   main::screen#3 = phi( main::@1/main::screen#4, main::@8/main::screen#1 )
   main::y#2 = phi( main::@1/main::y#4, main::@8/main::y#5 )
   main::x#2 = phi( main::@1/main::x#0, main::@8/main::x#1 )
-  main::xw#0 = (signed word)(word){ (byte)main::x#2, 0 }
-  main::yw#0 = (signed word)(word){ (byte)main::y#2, 0 }
+  main::$10 = (byte)main::x#2
+  main::$2 = main::$10 w= 0
+  main::xw#0 = (signed word)main::$2
+  main::$11 = (byte)main::y#2
+  main::$3 = main::$11 w= 0
+  main::yw#0 = (signed word)main::$3
   atan2_16::x#0 = main::xw#0
   atan2_16::y#0 = main::yw#0
   call atan2_16 
@@ -341,23 +345,23 @@ main::@8: scope:[main]  from main::@2
   main::x#3 = phi( main::@2/main::x#2 )
   main::screen#2 = phi( main::@2/main::screen#3 )
   atan2_16::return#4 = phi( main::@2/atan2_16::return#2 )
-  main::$2 = atan2_16::return#4
-  main::angle_w#0 = main::$2
-  main::$3 = main::angle_w#0 + $80
-  main::$4 = byte1  main::$3
-  main::ang_w#0 = main::$4
+  main::$4 = atan2_16::return#4
+  main::angle_w#0 = main::$4
+  main::$5 = main::angle_w#0 + $80
+  main::$6 = byte1  main::$5
+  main::ang_w#0 = main::$6
   *main::screen#2 = main::ang_w#0
   main::screen#1 = ++ main::screen#2
   main::x#1 = main::x#3 + rangenext(-$13,$14)
-  main::$5 = main::x#1 != rangelast(-$13,$14)
-  if(main::$5) goto main::@2
+  main::$7 = main::x#1 != rangelast(-$13,$14)
+  if(main::$7) goto main::@2
   to:main::@3
 main::@3: scope:[main]  from main::@8
   main::screen#5 = phi( main::@8/main::screen#1 )
   main::y#3 = phi( main::@8/main::y#5 )
   main::y#1 = main::y#3 + rangenext(-$c,$c)
-  main::$6 = main::y#1 != rangelast(-$c,$c)
-  if(main::$6) goto main::@1
+  main::$8 = main::y#1 != rangelast(-$c,$c)
+  if(main::$8) goto main::@1
   to:main::@4
 main::@4: scope:[main]  from main::@3 main::@5
   if(true) goto main::@5
@@ -617,11 +621,15 @@ byte* init_font_hex::proto_lo#3
 byte* init_font_hex::proto_lo#4
 void main()
 byte~ main::$1
+byte~ main::$10
+byte~ main::$11
 word~ main::$2
-number~ main::$3
-byte~ main::$4
-bool~ main::$5
-bool~ main::$6
+word~ main::$3
+word~ main::$4
+number~ main::$5
+byte~ main::$6
+bool~ main::$7
+bool~ main::$8
 byte main::ang_w
 byte main::ang_w#0
 word main::angle_w
@@ -670,9 +678,6 @@ signed byte main::y#5
 signed word main::yw
 signed word main::yw#0
 
-Fixing inline constructor with main::$8 = (byte)(byte)main::x#2 w= (byte)0
-Fixing inline constructor with main::$9 = (byte)(byte)main::y#2 w= (byte)0
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) $13 in 
 Adding number conversion cast (unumber) $c*$28 in 
 Adding number conversion cast (unumber) 0 in init_font_hex::charset#2[init_font_hex::idx#0] = 0
@@ -709,8 +714,10 @@ Adding number conversion cast (unumber) main::toD0181_$4 in main::toD0181_$4 = m
 Adding number conversion cast (unumber) $f in main::toD0181_$5 = main::toD0181_$4 & $f
 Adding number conversion cast (unumber) main::toD0181_$5 in main::toD0181_$5 = main::toD0181_$4 & (unumber)$f
 Adding number conversion cast (unumber) main::toD0181_$6 in main::toD0181_$6 = main::toD0181_$2 | main::toD0181_$5
-Adding number conversion cast (unumber) $80 in main::$3 = main::angle_w#0 + $80
-Adding number conversion cast (unumber) main::$3 in main::$3 = main::angle_w#0 + (unumber)$80
+Adding number conversion cast (unumber) 0 in main::$2 = main::$10 w= 0
+Adding number conversion cast (unumber) 0 in main::$3 = main::$11 w= 0
+Adding number conversion cast (unumber) $80 in main::$5 = main::angle_w#0 + $80
+Adding number conversion cast (unumber) main::$5 in main::$5 = main::angle_w#0 + (unumber)$80
 Successful SSA optimization PassNAddNumberTypeConversions
 Inlining cast init_font_hex::charset#2[init_font_hex::idx#0] = (unumber)0
 Inlining cast init_font_hex::charset#4[init_font_hex::idx#6] = (unumber)0
@@ -749,9 +756,7 @@ Simplifying constant integer cast $3fff
 Simplifying constant integer cast 4
 Simplifying constant integer cast 4
 Simplifying constant integer cast $f
-Simplifying constant integer cast (byte)main::x#2
 Simplifying constant integer cast 0
-Simplifying constant integer cast (byte)main::y#2
 Simplifying constant integer cast 0
 Simplifying constant integer cast $80
 Successful SSA optimization PassNCastSimplification
@@ -784,6 +789,8 @@ Finalized unsigned number type (word) $3fff
 Finalized unsigned number type (byte) 4
 Finalized unsigned number type (byte) 4
 Finalized unsigned number type (byte) $f
+Finalized unsigned number type (byte) 0
+Finalized unsigned number type (byte) 0
 Finalized unsigned number type (byte) $80
 Successful SSA optimization PassNFinalizeNumberTypeConversions
 Inferred type updated to word in atan2_16::$12 = $8000 - atan2_16::angle#9
@@ -792,7 +799,7 @@ Inferred type updated to word in main::toD0181_$1 = main::toD0181_$0 * 4
 Inferred type updated to byte in main::toD0181_$4 = main::toD0181_$3 / 4
 Inferred type updated to byte in main::toD0181_$5 = main::toD0181_$4 & $f
 Inferred type updated to byte in main::toD0181_$6 = main::toD0181_$2 | main::toD0181_$5
-Inferred type updated to word in main::$3 = main::angle_w#0 + $80
+Inferred type updated to word in main::$5 = main::angle_w#0 + $80
 Inversing boolean not [59] atan2_16::$17 = atan2_16::yi#3 != 0 from [58] atan2_16::$16 = atan2_16::yi#3 == 0
 Inversing boolean not [68] atan2_16::$11 = atan2_16::x#4 >= 0 from [67] atan2_16::$10 = atan2_16::x#4 < 0
 Inversing boolean not [79] atan2_16::$19 = 0 == atan2_16::shift#4 from [78] atan2_16::$24 = 0 != atan2_16::shift#4
@@ -849,8 +856,8 @@ Alias atan2_16::return#2 = atan2_16::return#4
 Alias main::screen#2 = main::screen#3 
 Alias main::x#2 = main::x#3 
 Alias main::y#2 = main::y#5 main::y#3 
-Alias main::angle_w#0 = main::$2 
-Alias main::ang_w#0 = main::$4 
+Alias main::angle_w#0 = main::$4 
+Alias main::ang_w#0 = main::$6 
 Alias main::screen#1 = main::screen#5 
 Successful SSA optimization Pass2AliasElimination
 Alias atan2_16::x#1 = atan2_16::x#5 atan2_16::x#10 
@@ -899,8 +906,8 @@ Simple Condition atan2_16::$19 [59] if(0==atan2_16::shift#2) goto atan2_16::@17
 Simple Condition atan2_16::$20 [62] if(atan2_16::yi#3>=0) goto atan2_16::@18
 Simple Condition atan2_16::$21 [76] if(atan2_16::i#1!=rangelast(0,CORDIC_ITERATIONS_16-1)) goto atan2_16::@10
 Simple Condition atan2_16::$14 [79] if(atan2_16::y#0>=0) goto atan2_16::@8
-Simple Condition main::$5 [117] if(main::x#1!=rangelast(-$13,$14)) goto main::@2
-Simple Condition main::$6 [120] if(main::y#1!=rangelast(-$c,$c)) goto main::@1
+Simple Condition main::$7 [119] if(main::x#1!=rangelast(-$13,$14)) goto main::@2
+Simple Condition main::$8 [122] if(main::y#1!=rangelast(-$c,$c)) goto main::@1
 Successful SSA optimization Pass2ConditionalJumpSimplification
 Negating conditional jump and destination [76] if(atan2_16::i#1==rangelast(0,CORDIC_ITERATIONS_16-1)) goto atan2_16::@12
 Successful SSA optimization Pass2ConditionalJumpSequenceImprovement
@@ -923,7 +930,7 @@ Constant main::toD0181_$7 = (word)main::toD0181_screen#0
 Successful SSA optimization Pass2ConstantIdentification
 Constant value identified (word)main::toD0181_gfx#0 in [92] main::toD0181_$3 = byte1  (word)main::toD0181_gfx#0
 Successful SSA optimization Pass2ConstantValues
-if() condition always true - replacing block destination [121] if(true) goto main::@5
+if() condition always true - replacing block destination [123] if(true) goto main::@5
 Successful SSA optimization Pass2ConstantIfs
 Resolved ranged next value [17] init_font_hex::i#1 = ++ init_font_hex::i#2 to ++
 Resolved ranged comparison value [19] if(init_font_hex::i#1!=rangelast(0,4)) goto init_font_hex::@3 to 5
@@ -933,10 +940,10 @@ Resolved ranged next value [30] init_font_hex::c#1 = ++ init_font_hex::c#6 to ++
 Resolved ranged comparison value [32] if(init_font_hex::c#1!=rangelast(0,$f)) goto init_font_hex::@1 to $10
 Resolved ranged next value [74] atan2_16::i#1 = ++ atan2_16::i#2 to ++
 Resolved ranged comparison value [76] if(atan2_16::i#1==rangelast(0,CORDIC_ITERATIONS_16-1)) goto atan2_16::@12 to CORDIC_ITERATIONS_16-1+1
-Resolved ranged next value [115] main::x#1 = ++ main::x#2 to ++
-Resolved ranged comparison value [117] if(main::x#1!=rangelast(-$13,$14)) goto main::@2 to $15
-Resolved ranged next value [118] main::y#1 = ++ main::y#4 to ++
-Resolved ranged comparison value [120] if(main::y#1!=rangelast(-$c,$c)) goto main::@1 to $d
+Resolved ranged next value [117] main::x#1 = ++ main::x#2 to ++
+Resolved ranged comparison value [119] if(main::x#1!=rangelast(-$13,$14)) goto main::@2 to $15
+Resolved ranged next value [120] main::y#1 = ++ main::y#4 to ++
+Resolved ranged comparison value [122] if(main::y#1!=rangelast(-$c,$c)) goto main::@1 to $d
 Simplifying expression containing zero init_font_hex::charset#2 in [8] init_font_hex::charset#2[init_font_hex::idx#0] = 0
 Successful SSA optimization PassNSimplifyExpressionWithZero
 Removing unused block main::@return
@@ -953,8 +960,8 @@ Adding number conversion cast (unumber) $10 in [18] if(init_font_hex::c1#1!=$10)
 Adding number conversion cast (unumber) $10 in [21] if(init_font_hex::c#1!=$10) goto init_font_hex::@1
 Adding number conversion cast (unumber) CORDIC_ITERATIONS_16-1+1 in [54] if(atan2_16::i#1==CORDIC_ITERATIONS_16-1+1) goto atan2_16::@12
 Adding number conversion cast (unumber) 1 in [54] if(atan2_16::i#1==(unumber)CORDIC_ITERATIONS_16-1+1) goto atan2_16::@12
-Adding number conversion cast (snumber) $15 in [86] if(main::x#1!=$15) goto main::@2
-Adding number conversion cast (snumber) $d in [88] if(main::y#1!=$d) goto main::@1
+Adding number conversion cast (snumber) $15 in [88] if(main::x#1!=$15) goto main::@2
+Adding number conversion cast (snumber) $d in [90] if(main::y#1!=$d) goto main::@1
 Successful SSA optimization PassNAddNumberTypeConversions
 Simplifying constant integer cast 5
 Simplifying constant integer cast $10
@@ -995,8 +1002,11 @@ Constant right-side identified [61] main::toD0181_return#0 = main::toD0181_$2 |
 Successful SSA optimization Pass2ConstantRValueConsolidation
 Constant main::toD0181_return#0 = main::toD0181_$2|main::toD0181_$5
 Successful SSA optimization Pass2ConstantIdentification
-Inlining Noop Cast [65] main::xw#0 = (signed word)main::$8 keeping main::xw#0
-Inlining Noop Cast [67] main::yw#0 = (signed word)main::$9 keeping main::yw#0
+Inlining Noop Cast [64] main::$10 = (byte)main::x#2 keeping main::x#2
+Inlining Noop Cast [67] main::$11 = (byte)main::y#4 keeping main::y#4
+Successful SSA optimization Pass2NopCastInlining
+Inlining Noop Cast [66] main::xw#0 = (signed word)main::$2 keeping main::xw#0
+Inlining Noop Cast [69] main::yw#0 = (signed word)main::$3 keeping main::yw#0
 Successful SSA optimization Pass2NopCastInlining
 Rewriting division to use shift [31] atan2_16::angle#1 = atan2_16::angle#6 / 2
 Rewriting multiplication to use shift [45] atan2_16::$22 = atan2_16::i#2 * SIZEOF_WORD
@@ -1163,8 +1173,8 @@ main::@2: scope:[main]  from main::@1 main::@6
   to:main::@6
 main::@6: scope:[main]  from main::@2
   [12] main::angle_w#0 = atan2_16::return#2
-  [13] main::$3 = main::angle_w#0 + $80
-  [14] main::ang_w#0 = byte1  main::$3
+  [13] main::$5 = main::angle_w#0 + $80
+  [14] main::ang_w#0 = byte1  main::$5
   [15] *main::screen#2 = main::ang_w#0
   [16] main::screen#1 = ++ main::screen#2
   [17] main::x#1 = ++ main::x#2
@@ -1406,7 +1416,7 @@ byte* init_font_hex::proto_lo
 byte* init_font_hex::proto_lo#1 500.5
 byte* init_font_hex::proto_lo#4 923.3076923076923
 void main()
-word~ main::$3 202.0
+word~ main::$5 202.0
 byte main::ang_w
 byte main::ang_w#0 202.0
 word main::angle_w
@@ -1454,7 +1464,7 @@ Added variable atan2_16::x#0 to live range equivalence class [ atan2_16::x#0 ]
 Added variable atan2_16::y#0 to live range equivalence class [ atan2_16::y#0 ]
 Added variable atan2_16::return#2 to live range equivalence class [ atan2_16::return#2 ]
 Added variable main::angle_w#0 to live range equivalence class [ main::angle_w#0 ]
-Added variable main::$3 to live range equivalence class [ main::$3 ]
+Added variable main::$5 to live range equivalence class [ main::$5 ]
 Added variable main::ang_w#0 to live range equivalence class [ main::ang_w#0 ]
 Added variable init_font_hex::$0 to live range equivalence class [ init_font_hex::$0 ]
 Added variable init_font_hex::$1 to live range equivalence class [ init_font_hex::$1 ]
@@ -1487,7 +1497,7 @@ Complete equivalence classes
 [ atan2_16::y#0 ]
 [ atan2_16::return#2 ]
 [ main::angle_w#0 ]
-[ main::$3 ]
+[ main::$5 ]
 [ main::ang_w#0 ]
 [ init_font_hex::$0 ]
 [ init_font_hex::$1 ]
@@ -1519,7 +1529,7 @@ Allocated zp[2]:34 [ atan2_16::x#0 ]
 Allocated zp[2]:36 [ atan2_16::y#0 ]
 Allocated zp[2]:38 [ atan2_16::return#2 ]
 Allocated zp[2]:40 [ main::angle_w#0 ]
-Allocated zp[2]:42 [ main::$3 ]
+Allocated zp[2]:42 [ main::$5 ]
 Allocated zp[1]:44 [ main::ang_w#0 ]
 Allocated zp[1]:45 [ init_font_hex::$0 ]
 Allocated zp[1]:46 [ init_font_hex::$1 ]
@@ -1535,7 +1545,7 @@ Removing always clobbered register reg byte a as potential for zp[1]:3 [ main::x
 Statement [9] atan2_16::y#0 = (signed word)main::yw#0 [ main::y#4 main::x#2 main::screen#2 atan2_16::x#0 atan2_16::y#0 ] (  [ main::y#4 main::x#2 main::screen#2 atan2_16::x#0 atan2_16::y#0 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [11] atan2_16::return#2 = atan2_16::return#0 [ main::y#4 main::x#2 main::screen#2 atan2_16::return#2 ] (  [ main::y#4 main::x#2 main::screen#2 atan2_16::return#2 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [12] main::angle_w#0 = atan2_16::return#2 [ main::y#4 main::x#2 main::screen#2 main::angle_w#0 ] (  [ main::y#4 main::x#2 main::screen#2 main::angle_w#0 ] { }  ) always clobbers reg byte a 
-Statement [13] main::$3 = main::angle_w#0 + $80 [ main::y#4 main::x#2 main::screen#2 main::$3 ] (  [ main::y#4 main::x#2 main::screen#2 main::$3 ] { }  ) always clobbers reg byte a 
+Statement [13] main::$5 = main::angle_w#0 + $80 [ main::y#4 main::x#2 main::screen#2 main::$5 ] (  [ main::y#4 main::x#2 main::screen#2 main::$5 ] { }  ) always clobbers reg byte a 
 Statement [15] *main::screen#2 = main::ang_w#0 [ main::y#4 main::x#2 main::screen#2 ] (  [ main::y#4 main::x#2 main::screen#2 ] { }  ) always clobbers reg byte y 
 Removing always clobbered register reg byte y as potential for zp[1]:2 [ main::y#4 main::y#1 ]
 Removing always clobbered register reg byte y as potential for zp[1]:3 [ main::x#2 main::x#1 ]
@@ -1590,7 +1600,7 @@ Statement [8] atan2_16::x#0 = (signed word)main::xw#0 [ main::y#4 main::x#2 main
 Statement [9] atan2_16::y#0 = (signed word)main::yw#0 [ main::y#4 main::x#2 main::screen#2 atan2_16::x#0 atan2_16::y#0 ] (  [ main::y#4 main::x#2 main::screen#2 atan2_16::x#0 atan2_16::y#0 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [11] atan2_16::return#2 = atan2_16::return#0 [ main::y#4 main::x#2 main::screen#2 atan2_16::return#2 ] (  [ main::y#4 main::x#2 main::screen#2 atan2_16::return#2 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [12] main::angle_w#0 = atan2_16::return#2 [ main::y#4 main::x#2 main::screen#2 main::angle_w#0 ] (  [ main::y#4 main::x#2 main::screen#2 main::angle_w#0 ] { }  ) always clobbers reg byte a 
-Statement [13] main::$3 = main::angle_w#0 + $80 [ main::y#4 main::x#2 main::screen#2 main::$3 ] (  [ main::y#4 main::x#2 main::screen#2 main::$3 ] { }  ) always clobbers reg byte a 
+Statement [13] main::$5 = main::angle_w#0 + $80 [ main::y#4 main::x#2 main::screen#2 main::$5 ] (  [ main::y#4 main::x#2 main::screen#2 main::$5 ] { }  ) always clobbers reg byte a 
 Statement [15] *main::screen#2 = main::ang_w#0 [ main::y#4 main::x#2 main::screen#2 ] (  [ main::y#4 main::x#2 main::screen#2 ] { }  ) always clobbers reg byte y 
 Statement [25] *init_font_hex::charset#2 = 0 [ init_font_hex::proto_hi#6 init_font_hex::c#6 init_font_hex::charset#2 init_font_hex::proto_lo#4 init_font_hex::c1#4 ] ( init_font_hex:1 [ init_font_hex::proto_hi#6 init_font_hex::c#6 init_font_hex::charset#2 init_font_hex::proto_lo#4 init_font_hex::c1#4 ] { }  ) always clobbers reg byte a reg byte y 
 Statement [27] init_font_hex::$0 = init_font_hex::proto_hi#6[init_font_hex::i#2] << 4 [ init_font_hex::proto_hi#6 init_font_hex::c#6 init_font_hex::charset#2 init_font_hex::proto_lo#4 init_font_hex::c1#4 init_font_hex::i#2 init_font_hex::idx#5 init_font_hex::$0 ] ( init_font_hex:1 [ init_font_hex::proto_hi#6 init_font_hex::c#6 init_font_hex::charset#2 init_font_hex::proto_lo#4 init_font_hex::c1#4 init_font_hex::i#2 init_font_hex::idx#5 init_font_hex::$0 ] { }  ) always clobbers reg byte a 
@@ -1651,7 +1661,7 @@ Potential registers zp[2]:34 [ atan2_16::x#0 ] : zp[2]:34 ,
 Potential registers zp[2]:36 [ atan2_16::y#0 ] : zp[2]:36 , 
 Potential registers zp[2]:38 [ atan2_16::return#2 ] : zp[2]:38 , 
 Potential registers zp[2]:40 [ main::angle_w#0 ] : zp[2]:40 , 
-Potential registers zp[2]:42 [ main::$3 ] : zp[2]:42 , 
+Potential registers zp[2]:42 [ main::$5 ] : zp[2]:42 , 
 Potential registers zp[1]:44 [ main::ang_w#0 ] : zp[1]:44 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:45 [ init_font_hex::$0 ] : zp[1]:45 , reg byte x , reg byte y , 
 Potential registers zp[1]:46 [ init_font_hex::$1 ] : zp[1]:46 , reg byte a , reg byte x , reg byte y , 
@@ -1663,7 +1673,7 @@ Potential registers zp[1]:50 [ atan2_16::$22 ] : zp[1]:50 , reg byte a , reg byt
 REGISTER UPLIFT SCOPES
 Uplift Scope [atan2_16] 28,666,670.58: zp[1]:25 [ atan2_16::shift#2 atan2_16::shift#5 atan2_16::shift#1 ] 20,600,008: zp[2]:26 [ atan2_16::yd#5 atan2_16::yd#3 atan2_16::yd#10 atan2_16::yd#1 atan2_16::yd#2 ] 17,333,338.67: zp[2]:28 [ atan2_16::xd#5 atan2_16::xd#3 atan2_16::xd#10 atan2_16::xd#1 atan2_16::xd#2 ] 7,524,818.05: zp[2]:21 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 ] 2,690,940.68: zp[2]:16 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 ] 2,273,742.67: zp[2]:18 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 ] 2,000,002: zp[1]:49 [ atan2_16::$23 ] 2,000,002: zp[1]:50 [ atan2_16::$22 ] 1,708,335.04: zp[1]:20 [ atan2_16::i#2 atan2_16::i#1 ] 8,208.5: zp[2]:23 [ atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 ] 202: zp[2]:38 [ atan2_16::return#2 ] 108.03: zp[2]:34 [ atan2_16::x#0 ] 102.62: zp[2]:36 [ atan2_16::y#0 ] 
 Uplift Scope [init_font_hex] 21,668.83: zp[1]:14 [ init_font_hex::i#2 init_font_hex::i#1 ] 20,002: zp[1]:46 [ init_font_hex::$1 ] 20,002: zp[1]:47 [ init_font_hex::$2 ] 11,501.6: zp[1]:15 [ init_font_hex::idx#5 init_font_hex::idx#2 ] 10,001: zp[1]:45 [ init_font_hex::$0 ] 2,002: zp[1]:48 [ init_font_hex::idx#3 ] 1,634.97: zp[1]:13 [ init_font_hex::c1#4 init_font_hex::c1#1 ] 1,631.57: zp[2]:9 [ init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ] 1,423.81: zp[2]:11 [ init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ] 634.17: zp[2]:6 [ init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ] 162.13: zp[1]:8 [ init_font_hex::c#6 init_font_hex::c#1 ] 
-Uplift Scope [main] 202: zp[2]:40 [ main::angle_w#0 ] 202: zp[2]:42 [ main::$3 ] 202: zp[1]:44 [ main::ang_w#0 ] 168.33: zp[1]:3 [ main::x#2 main::x#1 ] 93.15: zp[2]:4 [ main::screen#2 main::screen#4 main::screen#1 ] 50.5: zp[2]:30 [ main::xw#0 ] 50.5: zp[2]:32 [ main::yw#0 ] 17.97: zp[1]:2 [ main::y#4 main::y#1 ] 
+Uplift Scope [main] 202: zp[2]:40 [ main::angle_w#0 ] 202: zp[2]:42 [ main::$5 ] 202: zp[1]:44 [ main::ang_w#0 ] 168.33: zp[1]:3 [ main::x#2 main::x#1 ] 93.15: zp[2]:4 [ main::screen#2 main::screen#4 main::screen#1 ] 50.5: zp[2]:30 [ main::xw#0 ] 50.5: zp[2]:32 [ main::yw#0 ] 17.97: zp[1]:2 [ main::y#4 main::y#1 ] 
 Uplift Scope [MOS6526_CIA] 
 Uplift Scope [MOS6569_VICII] 
 Uplift Scope [MOS6581_SID] 
@@ -1673,7 +1683,7 @@ Uplifting [atan2_16] best 1147297 combination reg byte y [ atan2_16::shift#2 ata
 Limited combination testing to 100 combinations of 144 possible.
 Uplifting [init_font_hex] best 1128297 combination reg byte x [ init_font_hex::i#2 init_font_hex::i#1 ] reg byte a [ init_font_hex::$1 ] reg byte a [ init_font_hex::$2 ] zp[1]:15 [ init_font_hex::idx#5 init_font_hex::idx#2 ] zp[1]:45 [ init_font_hex::$0 ] zp[1]:48 [ init_font_hex::idx#3 ] zp[1]:13 [ init_font_hex::c1#4 init_font_hex::c1#1 ] zp[2]:9 [ init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ] zp[2]:11 [ init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ] zp[2]:6 [ init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ] zp[1]:8 [ init_font_hex::c#6 init_font_hex::c#1 ] 
 Limited combination testing to 100 combinations of 6912 possible.
-Uplifting [main] best 1127697 combination zp[2]:40 [ main::angle_w#0 ] zp[2]:42 [ main::$3 ] reg byte a [ main::ang_w#0 ] zp[1]:3 [ main::x#2 main::x#1 ] zp[2]:4 [ main::screen#2 main::screen#4 main::screen#1 ] zp[2]:30 [ main::xw#0 ] zp[2]:32 [ main::yw#0 ] zp[1]:2 [ main::y#4 main::y#1 ] 
+Uplifting [main] best 1127697 combination zp[2]:40 [ main::angle_w#0 ] zp[2]:42 [ main::$5 ] reg byte a [ main::ang_w#0 ] zp[1]:3 [ main::x#2 main::x#1 ] zp[2]:4 [ main::screen#2 main::screen#4 main::screen#1 ] zp[2]:30 [ main::xw#0 ] zp[2]:32 [ main::yw#0 ] zp[1]:2 [ main::y#4 main::y#1 ] 
 Uplifting [MOS6526_CIA] best 1127697 combination 
 Uplifting [MOS6569_VICII] best 1127697 combination 
 Uplifting [MOS6581_SID] best 1127697 combination 
@@ -1697,16 +1707,16 @@ Coalescing zero page register [ zp[2]:30 [ main::xw#0 ] ] with [ zp[2]:34 [ atan
 Coalescing zero page register [ zp[2]:32 [ main::yw#0 ] ] with [ zp[2]:36 [ atan2_16::y#0 ] ] - score: 1
 Coalescing zero page register [ zp[2]:38 [ atan2_16::return#2 ] ] with [ zp[2]:40 [ main::angle_w#0 ] ] - score: 1
 Coalescing zero page register [ zp[2]:21 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 ] ] with [ zp[2]:38 [ atan2_16::return#2 main::angle_w#0 ] ] - score: 1
-Coalescing zero page register [ zp[2]:21 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 ] ] with [ zp[2]:42 [ main::$3 ] ] - score: 1
+Coalescing zero page register [ zp[2]:21 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 ] ] with [ zp[2]:42 [ main::$5 ] ] - score: 1
 Coalescing zero page register [ zp[2]:16 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 ] ] with [ zp[2]:6 [ init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ] ]
 Coalescing zero page register [ zp[2]:18 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 ] ] with [ zp[2]:9 [ init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ] ]
-Coalescing zero page register [ zp[2]:21 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 main::$3 ] ] with [ zp[2]:11 [ init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ] ]
+Coalescing zero page register [ zp[2]:21 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 main::$5 ] ] with [ zp[2]:11 [ init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ] ]
 Allocated (was zp[1]:8) zp[1]:6 [ init_font_hex::c#6 init_font_hex::c#1 ]
 Allocated (was zp[1]:13) zp[1]:7 [ init_font_hex::c1#4 init_font_hex::c1#1 ]
 Allocated (was zp[1]:15) zp[1]:8 [ init_font_hex::idx#5 init_font_hex::idx#2 ]
 Allocated (was zp[2]:16) zp[2]:9 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ]
 Allocated (was zp[2]:18) zp[2]:11 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ]
-Allocated (was zp[2]:21) zp[2]:13 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 main::$3 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
+Allocated (was zp[2]:21) zp[2]:13 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 main::$5 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
 Allocated (was zp[2]:26) zp[2]:15 [ atan2_16::yd#5 atan2_16::yd#3 atan2_16::yd#10 atan2_16::yd#1 atan2_16::yd#2 ]
 Allocated (was zp[2]:28) zp[2]:17 [ atan2_16::xd#5 atan2_16::xd#3 atan2_16::xd#10 atan2_16::xd#1 atan2_16::xd#2 ]
 Allocated (was zp[2]:30) zp[2]:19 [ main::xw#0 atan2_16::x#0 ]
@@ -1741,7 +1751,7 @@ ASSEMBLER BEFORE OPTIMIZATION
 main: {
     .const toD0181_return = (>(SCREEN&$3fff)*4)|(>CHARSET)/4&$f
     .label col00 = COLS+$c*$28+$13
-    .label __3 = $d
+    .label __5 = $d
     .label xw = $13
     .label yw = $15
     .label angle_w = $d
@@ -1814,16 +1824,16 @@ main: {
     // main::@6
   __b6:
     // [12] main::angle_w#0 = atan2_16::return#2
-    // [13] main::$3 = main::angle_w#0 + $80 -- vwuz1=vwuz1_plus_vbuc1 
+    // [13] main::$5 = main::angle_w#0 + $80 -- vwuz1=vwuz1_plus_vbuc1 
     lda #$80
     clc
-    adc.z __3
-    sta.z __3
+    adc.z __5
+    sta.z __5
     bcc !+
-    inc.z __3+1
+    inc.z __5+1
   !:
-    // [14] main::ang_w#0 = byte1  main::$3 -- vbuaa=_byte1_vwuz1 
-    lda.z __3+1
+    // [14] main::ang_w#0 = byte1  main::$5 -- vbuaa=_byte1_vwuz1 
+    lda.z __5+1
     // [15] *main::screen#2 = main::ang_w#0 -- _deref_pbuz1=vbuaa 
     ldy #0
     sta (screen),y
@@ -2538,7 +2548,7 @@ byte* init_font_hex::proto_lo
 byte* init_font_hex::proto_lo#1 proto_lo zp[2]:13 500.5
 byte* init_font_hex::proto_lo#4 proto_lo zp[2]:13 923.3076923076923
 void main()
-word~ main::$3 zp[2]:13 202.0
+word~ main::$5 zp[2]:13 202.0
 byte main::ang_w
 byte main::ang_w#0 reg byte a 202.0
 word main::angle_w
@@ -2573,7 +2583,7 @@ zp[1]:8 [ init_font_hex::idx#5 init_font_hex::idx#2 ]
 zp[2]:9 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ]
 zp[2]:11 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ]
 reg byte x [ atan2_16::i#2 atan2_16::i#1 ]
-zp[2]:13 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 main::$3 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
+zp[2]:13 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 main::$5 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
 reg byte y [ atan2_16::shift#2 atan2_16::shift#5 atan2_16::shift#1 ]
 zp[2]:15 [ atan2_16::yd#5 atan2_16::yd#3 atan2_16::yd#10 atan2_16::yd#1 atan2_16::yd#2 ]
 zp[2]:17 [ atan2_16::xd#5 atan2_16::xd#3 atan2_16::xd#10 atan2_16::xd#1 atan2_16::xd#2 ]
@@ -2618,7 +2628,7 @@ Score: 1036177
 main: {
     .const toD0181_return = (>(SCREEN&$3fff)*4)|(>CHARSET)/4&$f
     .label col00 = COLS+$c*$28+$13
-    .label __3 = $d
+    .label __5 = $d
     .label xw = $13
     .label yw = $15
     .label angle_w = $d
@@ -2660,13 +2670,13 @@ main: {
     // [5] phi main::x#2 = main::x#1 [phi:main::@6->main::@2#1] -- register_copy 
     // main::@2
   __b2:
-    // signed word xw = (signed word)(word){ (byte)x, 0 }
+    // MAKEWORD( (byte)x, 0 )
     // [6] main::xw#0 = (byte)main::x#2 w= 0 -- vwuz1=vbuz2_word_vbuc1 
     lda #0
     ldy.z x
     sty.z xw+1
     sta.z xw
-    // signed word yw = (signed word)(word){ (byte)y, 0 }
+    // MAKEWORD( (byte)y, 0 )
     // [7] main::yw#0 = (byte)main::y#4 w= 0 -- vwuz1=vbuz2_word_vbuc1 
     ldy.z y
     sty.z yw+1
@@ -2681,17 +2691,17 @@ main: {
     // word angle_w = atan2_16(xw, yw)
     // [12] main::angle_w#0 = atan2_16::return#2
     // angle_w+0x0080
-    // [13] main::$3 = main::angle_w#0 + $80 -- vwuz1=vwuz1_plus_vbuc1 
+    // [13] main::$5 = main::angle_w#0 + $80 -- vwuz1=vwuz1_plus_vbuc1 
     lda #$80
     clc
-    adc.z __3
-    sta.z __3
+    adc.z __5
+    sta.z __5
     bcc !+
-    inc.z __3+1
+    inc.z __5+1
   !:
     // byte ang_w = BYTE1(angle_w+0x0080)
-    // [14] main::ang_w#0 = byte1  main::$3 -- vbuaa=_byte1_vwuz1 
-    lda.z __3+1
+    // [14] main::ang_w#0 = byte1  main::$5 -- vbuaa=_byte1_vwuz1 
+    lda.z __5+1
     // *screen++ = ang_w
     // [15] *main::screen#2 = main::ang_w#0 -- _deref_pbuz1=vbuaa 
     ldy #0

src/test/ref/cordic-atan2-16.sym

@@ -90,7 +90,7 @@ byte* init_font_hex::proto_lo
 byte* init_font_hex::proto_lo#1 proto_lo zp[2]:13 500.5
 byte* init_font_hex::proto_lo#4 proto_lo zp[2]:13 923.3076923076923
 void main()
-word~ main::$3 zp[2]:13 202.0
+word~ main::$5 zp[2]:13 202.0
 byte main::ang_w
 byte main::ang_w#0 reg byte a 202.0
 word main::angle_w
@@ -125,7 +125,7 @@ zp[1]:8 [ init_font_hex::idx#5 init_font_hex::idx#2 ]
 zp[2]:9 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ]
 zp[2]:11 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ]
 reg byte x [ atan2_16::i#2 atan2_16::i#1 ]
-zp[2]:13 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 main::$3 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
+zp[2]:13 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 main::angle_w#0 main::$5 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
 reg byte y [ atan2_16::shift#2 atan2_16::shift#5 atan2_16::shift#1 ]
 zp[2]:15 [ atan2_16::yd#5 atan2_16::yd#3 atan2_16::yd#10 atan2_16::yd#1 atan2_16::yd#2 ]
 zp[2]:17 [ atan2_16::xd#5 atan2_16::xd#3 atan2_16::xd#10 atan2_16::xd#1 atan2_16::xd#2 ]

src/test/ref/cordic-atan2-clear.asm

@@ -168,7 +168,7 @@ init_font_hex: {
 // Populates 1000 bytes (a screen) with values representing the angle to the center.
 // Utilizes symmetry around the  center
 init_angle_screen: {
-    .label __7 = $f
+    .label __9 = $f
     .label xw = $15
     .label yw = $17
     .label angle_w = $f
@@ -229,14 +229,14 @@ init_angle_screen: {
     eor #$ff
     sec
     adc #$27
-    // signed word xw = (signed word)(word){ 39-x*2, 0 }
+    // MAKEWORD( 39-x*2, 0 )
     ldy #0
     sta.z xw+1
     sty.z xw
     // y*2
     lda.z y
     asl
-    // signed word yw = (signed word)(word){ y*2, 0 }
+    // MAKEWORD( y*2, 0 )
     sta.z yw+1
     sty.z yw
     // atan2_16(xw, yw)
@@ -245,13 +245,13 @@ init_angle_screen: {
     // angle_w+0x0080
     lda #$80
     clc
-    adc.z __7
-    sta.z __7
+    adc.z __9
+    sta.z __9
     bcc !+
-    inc.z __7+1
+    inc.z __9+1
   !:
     // byte ang_w = BYTE1(angle_w+0x0080)
-    lda.z __7+1
+    lda.z __9+1
     sta.z ang_w
     // 0x80+ang_w
     lda #$80

src/test/ref/cordic-atan2-clear.cfg

@@ -96,8 +96,8 @@ init_angle_screen::@3: scope:[init_angle_screen]  from init_angle_screen::@2
   [42] init_angle_screen::$3 = init_angle_screen::x#2 << 1
   [43] init_angle_screen::$4 = $27 - init_angle_screen::$3
   [44] init_angle_screen::xw#0 = init_angle_screen::$4 w= 0
-  [45] init_angle_screen::$5 = init_angle_screen::y#5 << 1
-  [46] init_angle_screen::yw#0 = init_angle_screen::$5 w= 0
+  [45] init_angle_screen::$6 = init_angle_screen::y#5 << 1
+  [46] init_angle_screen::yw#0 = init_angle_screen::$6 w= 0
   [47] atan2_16::x#0 = (signed word)init_angle_screen::xw#0
   [48] atan2_16::y#0 = (signed word)init_angle_screen::yw#0
   [49] call atan2_16 
@@ -105,14 +105,14 @@ init_angle_screen::@3: scope:[init_angle_screen]  from init_angle_screen::@2
   to:init_angle_screen::@5
 init_angle_screen::@5: scope:[init_angle_screen]  from init_angle_screen::@3
   [51] init_angle_screen::angle_w#0 = atan2_16::return#2
-  [52] init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80
-  [53] init_angle_screen::ang_w#0 = byte1  init_angle_screen::$7
-  [54] init_angle_screen::$9 = $80 + init_angle_screen::ang_w#0
-  [55] init_angle_screen::screen_topline#6[init_angle_screen::x#2] = init_angle_screen::$9
-  [56] init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0
-  [57] init_angle_screen::screen_bottomline#6[init_angle_screen::x#2] = init_angle_screen::$10
-  [58] init_angle_screen::$11 = - init_angle_screen::ang_w#0
-  [59] init_angle_screen::screen_topline#6[init_angle_screen::xb#2] = init_angle_screen::$11
+  [52] init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80
+  [53] init_angle_screen::ang_w#0 = byte1  init_angle_screen::$9
+  [54] init_angle_screen::$11 = $80 + init_angle_screen::ang_w#0
+  [55] init_angle_screen::screen_topline#6[init_angle_screen::x#2] = init_angle_screen::$11
+  [56] init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0
+  [57] init_angle_screen::screen_bottomline#6[init_angle_screen::x#2] = init_angle_screen::$12
+  [58] init_angle_screen::$13 = - init_angle_screen::ang_w#0
+  [59] init_angle_screen::screen_topline#6[init_angle_screen::xb#2] = init_angle_screen::$13
   [60] init_angle_screen::screen_bottomline#6[init_angle_screen::xb#2] = init_angle_screen::ang_w#0
   [61] init_angle_screen::x#1 = ++ init_angle_screen::x#2
   [62] init_angle_screen::xb#1 = -- init_angle_screen::xb#2

src/test/ref/cordic-atan2-clear.log

@@ -380,9 +380,11 @@ init_angle_screen::@3: scope:[init_angle_screen]  from init_angle_screen::@2
   init_angle_screen::x#3 = phi( init_angle_screen::@2/init_angle_screen::x#2 )
   init_angle_screen::$3 = init_angle_screen::x#3 * 2
   init_angle_screen::$4 = $27 - init_angle_screen::$3
-  init_angle_screen::xw#0 = (signed word)(word){ init_angle_screen::$4, 0 }
-  init_angle_screen::$5 = init_angle_screen::y#2 * 2
-  init_angle_screen::yw#0 = (signed word)(word){ init_angle_screen::$5, 0 }
+  init_angle_screen::$5 = init_angle_screen::$4 w= 0
+  init_angle_screen::xw#0 = (signed word)init_angle_screen::$5
+  init_angle_screen::$6 = init_angle_screen::y#2 * 2
+  init_angle_screen::$7 = init_angle_screen::$6 w= 0
+  init_angle_screen::yw#0 = (signed word)init_angle_screen::$7
   atan2_16::x#0 = init_angle_screen::xw#0
   atan2_16::y#0 = init_angle_screen::yw#0
   call atan2_16 
@@ -395,17 +397,17 @@ init_angle_screen::@5: scope:[init_angle_screen]  from init_angle_screen::@3
   init_angle_screen::x#4 = phi( init_angle_screen::@3/init_angle_screen::x#3 )
   init_angle_screen::screen_topline#2 = phi( init_angle_screen::@3/init_angle_screen::screen_topline#4 )
   atan2_16::return#4 = phi( init_angle_screen::@3/atan2_16::return#2 )
-  init_angle_screen::$6 = atan2_16::return#4
-  init_angle_screen::angle_w#0 = init_angle_screen::$6
-  init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80
-  init_angle_screen::$8 = byte1  init_angle_screen::$7
-  init_angle_screen::ang_w#0 = init_angle_screen::$8
-  init_angle_screen::$9 = $80 + init_angle_screen::ang_w#0
-  init_angle_screen::screen_topline#2[init_angle_screen::x#4] = init_angle_screen::$9
-  init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0
-  init_angle_screen::screen_bottomline#2[init_angle_screen::x#4] = init_angle_screen::$10
-  init_angle_screen::$11 = - init_angle_screen::ang_w#0
-  init_angle_screen::screen_topline#2[init_angle_screen::xb#2] = init_angle_screen::$11
+  init_angle_screen::$8 = atan2_16::return#4
+  init_angle_screen::angle_w#0 = init_angle_screen::$8
+  init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80
+  init_angle_screen::$10 = byte1  init_angle_screen::$9
+  init_angle_screen::ang_w#0 = init_angle_screen::$10
+  init_angle_screen::$11 = $80 + init_angle_screen::ang_w#0
+  init_angle_screen::screen_topline#2[init_angle_screen::x#4] = init_angle_screen::$11
+  init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0
+  init_angle_screen::screen_bottomline#2[init_angle_screen::x#4] = init_angle_screen::$12
+  init_angle_screen::$13 = - init_angle_screen::ang_w#0
+  init_angle_screen::screen_topline#2[init_angle_screen::xb#2] = init_angle_screen::$13
   init_angle_screen::screen_bottomline#2[init_angle_screen::xb#2] = init_angle_screen::ang_w#0
   init_angle_screen::x#1 = ++ init_angle_screen::x#4
   init_angle_screen::xb#1 = -- init_angle_screen::xb#2
@@ -417,8 +419,8 @@ init_angle_screen::@4: scope:[init_angle_screen]  from init_angle_screen::@2
   init_angle_screen::screen_topline#1 = init_angle_screen::screen_topline#3 - $28
   init_angle_screen::screen_bottomline#1 = init_angle_screen::screen_bottomline#3 + $28
   init_angle_screen::y#1 = init_angle_screen::y#3 + rangenext(0,$c)
-  init_angle_screen::$12 = init_angle_screen::y#1 != rangelast(0,$c)
-  if(init_angle_screen::$12) goto init_angle_screen::@1
+  init_angle_screen::$14 = init_angle_screen::y#1 != rangelast(0,$c)
+  if(init_angle_screen::$14) goto init_angle_screen::@1
   to:init_angle_screen::@return
 init_angle_screen::@return: scope:[init_angle_screen]  from init_angle_screen::@4
   return 
@@ -617,16 +619,18 @@ signed word atan2_16::yi#9
 void init_angle_screen(byte* init_angle_screen::screen)
 byte*~ init_angle_screen::$0
 byte*~ init_angle_screen::$1
-number~ init_angle_screen::$10
-byte~ init_angle_screen::$11
-bool~ init_angle_screen::$12
+byte~ init_angle_screen::$10
+number~ init_angle_screen::$11
+number~ init_angle_screen::$12
+byte~ init_angle_screen::$13
+bool~ init_angle_screen::$14
 bool~ init_angle_screen::$2
 number~ init_angle_screen::$3
 number~ init_angle_screen::$4
-number~ init_angle_screen::$5
-word~ init_angle_screen::$6
-number~ init_angle_screen::$7
-byte~ init_angle_screen::$8
+word~ init_angle_screen::$5
+number~ init_angle_screen::$6
+word~ init_angle_screen::$7
+word~ init_angle_screen::$8
 number~ init_angle_screen::$9
 byte init_angle_screen::ang_w
 byte init_angle_screen::ang_w#0
@@ -763,9 +767,6 @@ byte* main::toD0181_screen
 byte* main::toD0181_screen#0
 byte* main::toD0181_screen#1
 
-Fixing inline constructor with init_angle_screen::$13 = (byte)init_angle_screen::$4 w= (byte)0
-Fixing inline constructor with init_angle_screen::$14 = (byte)init_angle_screen::$5 w= (byte)0
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) 0 in init_font_hex::charset#2[init_font_hex::idx#0] = 0
 Adding number conversion cast (unumber) 4 in init_font_hex::$0 = init_font_hex::proto_hi#2[init_font_hex::i#2] << 4
 Adding number conversion cast (unumber) 1 in init_font_hex::$1 = init_font_hex::proto_lo#2[init_font_hex::i#2] << 1
@@ -810,14 +811,16 @@ Adding number conversion cast (unumber) 2 in init_angle_screen::$3 = init_angle_
 Adding number conversion cast (unumber) init_angle_screen::$3 in init_angle_screen::$3 = init_angle_screen::x#3 * (unumber)2
 Adding number conversion cast (unumber) $27 in init_angle_screen::$4 = $27 - init_angle_screen::$3
 Adding number conversion cast (unumber) init_angle_screen::$4 in init_angle_screen::$4 = (unumber)$27 - init_angle_screen::$3
-Adding number conversion cast (unumber) 2 in init_angle_screen::$5 = init_angle_screen::y#2 * 2
-Adding number conversion cast (unumber) init_angle_screen::$5 in init_angle_screen::$5 = init_angle_screen::y#2 * (unumber)2
-Adding number conversion cast (unumber) $80 in init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80
-Adding number conversion cast (unumber) init_angle_screen::$7 in init_angle_screen::$7 = init_angle_screen::angle_w#0 + (unumber)$80
-Adding number conversion cast (unumber) $80 in init_angle_screen::$9 = $80 + init_angle_screen::ang_w#0
-Adding number conversion cast (unumber) init_angle_screen::$9 in init_angle_screen::$9 = (unumber)$80 + init_angle_screen::ang_w#0
-Adding number conversion cast (unumber) $80 in init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0
-Adding number conversion cast (unumber) init_angle_screen::$10 in init_angle_screen::$10 = (unumber)$80 - init_angle_screen::ang_w#0
+Adding number conversion cast (unumber) 0 in init_angle_screen::$5 = init_angle_screen::$4 w= 0
+Adding number conversion cast (unumber) 2 in init_angle_screen::$6 = init_angle_screen::y#2 * 2
+Adding number conversion cast (unumber) init_angle_screen::$6 in init_angle_screen::$6 = init_angle_screen::y#2 * (unumber)2
+Adding number conversion cast (unumber) 0 in init_angle_screen::$7 = init_angle_screen::$6 w= 0
+Adding number conversion cast (unumber) $80 in init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80
+Adding number conversion cast (unumber) init_angle_screen::$9 in init_angle_screen::$9 = init_angle_screen::angle_w#0 + (unumber)$80
+Adding number conversion cast (unumber) $80 in init_angle_screen::$11 = $80 + init_angle_screen::ang_w#0
+Adding number conversion cast (unumber) init_angle_screen::$11 in init_angle_screen::$11 = (unumber)$80 + init_angle_screen::ang_w#0
+Adding number conversion cast (unumber) $80 in init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0
+Adding number conversion cast (unumber) init_angle_screen::$12 in init_angle_screen::$12 = (unumber)$80 - init_angle_screen::ang_w#0
 Adding number conversion cast (unumber) $28 in init_angle_screen::screen_topline#1 = init_angle_screen::screen_topline#3 - $28
 Adding number conversion cast (unumber) $28 in init_angle_screen::screen_bottomline#1 = init_angle_screen::screen_bottomline#3 + $28
 Successful SSA optimization PassNAddNumberTypeConversions
@@ -907,7 +910,9 @@ Finalized unsigned number type (byte) 0
 Finalized unsigned number type (byte) $13
 Finalized unsigned number type (byte) 2
 Finalized unsigned number type (byte) $27
+Finalized unsigned number type (byte) 0
 Finalized unsigned number type (byte) 2
+Finalized unsigned number type (byte) 0
 Finalized unsigned number type (byte) $80
 Finalized unsigned number type (byte) $80
 Finalized unsigned number type (byte) $80
@@ -922,10 +927,10 @@ Inferred type updated to byte in main::toD0181_$5 = main::toD0181_$4 & $f
 Inferred type updated to byte in main::toD0181_$6 = main::toD0181_$2 | main::toD0181_$5
 Inferred type updated to byte in init_angle_screen::$3 = init_angle_screen::x#3 * 2
 Inferred type updated to byte in init_angle_screen::$4 = $27 - init_angle_screen::$3
-Inferred type updated to byte in init_angle_screen::$5 = init_angle_screen::y#2 * 2
-Inferred type updated to word in init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80
-Inferred type updated to byte in init_angle_screen::$9 = $80 + init_angle_screen::ang_w#0
-Inferred type updated to byte in init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0
+Inferred type updated to byte in init_angle_screen::$6 = init_angle_screen::y#2 * 2
+Inferred type updated to word in init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80
+Inferred type updated to byte in init_angle_screen::$11 = $80 + init_angle_screen::ang_w#0
+Inferred type updated to byte in init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0
 Inversing boolean not [59] atan2_16::$17 = atan2_16::yi#3 != 0 from [58] atan2_16::$16 = atan2_16::yi#3 == 0
 Inversing boolean not [68] atan2_16::$11 = atan2_16::x#4 >= 0 from [67] atan2_16::$10 = atan2_16::x#4 < 0
 Inversing boolean not [79] atan2_16::$19 = 0 == atan2_16::shift#4 from [78] atan2_16::$24 = 0 != atan2_16::shift#4
@@ -988,8 +993,8 @@ Alias init_angle_screen::screen_topline#2 = init_angle_screen::screen_topline#4
 Alias init_angle_screen::screen_bottomline#2 = init_angle_screen::screen_bottomline#4 init_angle_screen::screen_bottomline#5 init_angle_screen::screen_bottomline#3 
 Alias init_angle_screen::xb#2 = init_angle_screen::xb#3 init_angle_screen::xb#4 
 Alias atan2_16::return#2 = atan2_16::return#4 
-Alias init_angle_screen::angle_w#0 = init_angle_screen::$6 
-Alias init_angle_screen::ang_w#0 = init_angle_screen::$8 
+Alias init_angle_screen::angle_w#0 = init_angle_screen::$8 
+Alias init_angle_screen::ang_w#0 = init_angle_screen::$10 
 Successful SSA optimization Pass2AliasElimination
 Alias atan2_16::x#1 = atan2_16::x#5 atan2_16::x#10 
 Alias atan2_16::y#1 = atan2_16::y#12 atan2_16::y#9 
@@ -1046,7 +1051,7 @@ Simple Condition atan2_16::$14 [79] if(atan2_16::y#0>=0) goto atan2_16::@8
 Simple Condition main::$3 [104] if(*RASTER!=$ff) goto main::@2
 Simple Condition main::$5 [106] if(main::clear_char#5>=CHARSET+$800) goto main::@1
 Simple Condition init_angle_screen::$2 [119] if(init_angle_screen::x#2<=$13) goto init_angle_screen::@3
-Simple Condition init_angle_screen::$12 [147] if(init_angle_screen::y#1!=rangelast(0,$c)) goto init_angle_screen::@1
+Simple Condition init_angle_screen::$14 [147] if(init_angle_screen::y#1!=rangelast(0,$c)) goto init_angle_screen::@1
 Successful SSA optimization Pass2ConditionalJumpSimplification
 Negating conditional jump and destination [76] if(atan2_16::i#1==rangelast(0,CORDIC_ITERATIONS_16-1)) goto atan2_16::@12
 Successful SSA optimization Pass2ConditionalJumpSequenceImprovement
@@ -1111,8 +1116,6 @@ Simplifying constant integer cast CORDIC_ITERATIONS_16-1+(unumber)1
 Simplifying constant integer cast 1
 Simplifying constant integer cast $13+(unumber)1
 Simplifying constant integer cast 1
-Simplifying constant integer cast init_angle_screen::$4
-Simplifying constant integer cast init_angle_screen::$5
 Simplifying constant integer cast $d
 Successful SSA optimization PassNCastSimplification
 Finalized unsigned number type (byte) 5
@@ -1150,14 +1153,14 @@ Constant right-side identified [61] main::toD0181_return#0 = main::toD0181_$2 |
 Successful SSA optimization Pass2ConstantRValueConsolidation
 Constant main::toD0181_return#0 = main::toD0181_$2|main::toD0181_$5
 Successful SSA optimization Pass2ConstantIdentification
-Inlining Noop Cast [74] init_angle_screen::xw#0 = (signed word)init_angle_screen::$13 keeping init_angle_screen::xw#0
-Inlining Noop Cast [77] init_angle_screen::yw#0 = (signed word)init_angle_screen::$14 keeping init_angle_screen::yw#0
+Inlining Noop Cast [74] init_angle_screen::xw#0 = (signed word)init_angle_screen::$5 keeping init_angle_screen::xw#0
+Inlining Noop Cast [77] init_angle_screen::yw#0 = (signed word)init_angle_screen::$7 keeping init_angle_screen::yw#0
 Successful SSA optimization Pass2NopCastInlining
 Rewriting division to use shift [31] atan2_16::angle#1 = atan2_16::angle#6 / 2
 Rewriting multiplication to use shift [45] atan2_16::$22 = atan2_16::i#2 * SIZEOF_WORD
 Rewriting multiplication to use shift [49] atan2_16::$23 = atan2_16::i#2 * SIZEOF_WORD
 Rewriting multiplication to use shift [71] init_angle_screen::$3 = init_angle_screen::x#2 * 2
-Rewriting multiplication to use shift [75] init_angle_screen::$5 = init_angle_screen::y#5 * 2
+Rewriting multiplication to use shift [75] init_angle_screen::$6 = init_angle_screen::y#5 * 2
 Successful SSA optimization Pass2MultiplyToShiftRewriting
 Inlining constant with var siblings init_font_hex::proto_hi#0
 Inlining constant with var siblings init_font_hex::c#0
@@ -1397,8 +1400,8 @@ init_angle_screen::@3: scope:[init_angle_screen]  from init_angle_screen::@2
   [42] init_angle_screen::$3 = init_angle_screen::x#2 << 1
   [43] init_angle_screen::$4 = $27 - init_angle_screen::$3
   [44] init_angle_screen::xw#0 = init_angle_screen::$4 w= 0
-  [45] init_angle_screen::$5 = init_angle_screen::y#5 << 1
-  [46] init_angle_screen::yw#0 = init_angle_screen::$5 w= 0
+  [45] init_angle_screen::$6 = init_angle_screen::y#5 << 1
+  [46] init_angle_screen::yw#0 = init_angle_screen::$6 w= 0
   [47] atan2_16::x#0 = (signed word)init_angle_screen::xw#0
   [48] atan2_16::y#0 = (signed word)init_angle_screen::yw#0
   [49] call atan2_16 
@@ -1406,14 +1409,14 @@ init_angle_screen::@3: scope:[init_angle_screen]  from init_angle_screen::@2
   to:init_angle_screen::@5
 init_angle_screen::@5: scope:[init_angle_screen]  from init_angle_screen::@3
   [51] init_angle_screen::angle_w#0 = atan2_16::return#2
-  [52] init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80
-  [53] init_angle_screen::ang_w#0 = byte1  init_angle_screen::$7
-  [54] init_angle_screen::$9 = $80 + init_angle_screen::ang_w#0
-  [55] init_angle_screen::screen_topline#6[init_angle_screen::x#2] = init_angle_screen::$9
-  [56] init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0
-  [57] init_angle_screen::screen_bottomline#6[init_angle_screen::x#2] = init_angle_screen::$10
-  [58] init_angle_screen::$11 = - init_angle_screen::ang_w#0
-  [59] init_angle_screen::screen_topline#6[init_angle_screen::xb#2] = init_angle_screen::$11
+  [52] init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80
+  [53] init_angle_screen::ang_w#0 = byte1  init_angle_screen::$9
+  [54] init_angle_screen::$11 = $80 + init_angle_screen::ang_w#0
+  [55] init_angle_screen::screen_topline#6[init_angle_screen::x#2] = init_angle_screen::$11
+  [56] init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0
+  [57] init_angle_screen::screen_bottomline#6[init_angle_screen::x#2] = init_angle_screen::$12
+  [58] init_angle_screen::$13 = - init_angle_screen::ang_w#0
+  [59] init_angle_screen::screen_topline#6[init_angle_screen::xb#2] = init_angle_screen::$13
   [60] init_angle_screen::screen_bottomline#6[init_angle_screen::xb#2] = init_angle_screen::ang_w#0
   [61] init_angle_screen::x#1 = ++ init_angle_screen::x#2
   [62] init_angle_screen::xb#1 = -- init_angle_screen::xb#2
@@ -1576,13 +1579,13 @@ signed word atan2_16::yi#2 6666667.333333333
 signed word atan2_16::yi#3 3530000.4117647056
 signed word atan2_16::yi#8 1.0000001E7
 void init_angle_screen(byte* init_angle_screen::screen)
-byte~ init_angle_screen::$10 2002.0
 byte~ init_angle_screen::$11 2002.0
+byte~ init_angle_screen::$12 2002.0
+byte~ init_angle_screen::$13 2002.0
 byte~ init_angle_screen::$3 2002.0
 byte~ init_angle_screen::$4 2002.0
-byte~ init_angle_screen::$5 2002.0
-word~ init_angle_screen::$7 2002.0
-byte~ init_angle_screen::$9 2002.0
+byte~ init_angle_screen::$6 2002.0
+word~ init_angle_screen::$9 2002.0
 byte init_angle_screen::ang_w
 byte init_angle_screen::ang_w#0 715.0
 word init_angle_screen::angle_w
@@ -1671,17 +1674,17 @@ Added variable init_font_hex::idx#3 to live range equivalence class [ init_font_
 Added variable init_angle_screen::$3 to live range equivalence class [ init_angle_screen::$3 ]
 Added variable init_angle_screen::$4 to live range equivalence class [ init_angle_screen::$4 ]
 Added variable init_angle_screen::xw#0 to live range equivalence class [ init_angle_screen::xw#0 ]
-Added variable init_angle_screen::$5 to live range equivalence class [ init_angle_screen::$5 ]
+Added variable init_angle_screen::$6 to live range equivalence class [ init_angle_screen::$6 ]
 Added variable init_angle_screen::yw#0 to live range equivalence class [ init_angle_screen::yw#0 ]
 Added variable atan2_16::x#0 to live range equivalence class [ atan2_16::x#0 ]
 Added variable atan2_16::y#0 to live range equivalence class [ atan2_16::y#0 ]
 Added variable atan2_16::return#2 to live range equivalence class [ atan2_16::return#2 ]
 Added variable init_angle_screen::angle_w#0 to live range equivalence class [ init_angle_screen::angle_w#0 ]
-Added variable init_angle_screen::$7 to live range equivalence class [ init_angle_screen::$7 ]
-Added variable init_angle_screen::ang_w#0 to live range equivalence class [ init_angle_screen::ang_w#0 ]
 Added variable init_angle_screen::$9 to live range equivalence class [ init_angle_screen::$9 ]
-Added variable init_angle_screen::$10 to live range equivalence class [ init_angle_screen::$10 ]
+Added variable init_angle_screen::ang_w#0 to live range equivalence class [ init_angle_screen::ang_w#0 ]
 Added variable init_angle_screen::$11 to live range equivalence class [ init_angle_screen::$11 ]
+Added variable init_angle_screen::$12 to live range equivalence class [ init_angle_screen::$12 ]
+Added variable init_angle_screen::$13 to live range equivalence class [ init_angle_screen::$13 ]
 Added variable atan2_16::$23 to live range equivalence class [ atan2_16::$23 ]
 Added variable atan2_16::$22 to live range equivalence class [ atan2_16::$22 ]
 Complete equivalence classes
@@ -1713,17 +1716,17 @@ Complete equivalence classes
 [ init_angle_screen::$3 ]
 [ init_angle_screen::$4 ]
 [ init_angle_screen::xw#0 ]
-[ init_angle_screen::$5 ]
+[ init_angle_screen::$6 ]
 [ init_angle_screen::yw#0 ]
 [ atan2_16::x#0 ]
 [ atan2_16::y#0 ]
 [ atan2_16::return#2 ]
 [ init_angle_screen::angle_w#0 ]
-[ init_angle_screen::$7 ]
-[ init_angle_screen::ang_w#0 ]
 [ init_angle_screen::$9 ]
-[ init_angle_screen::$10 ]
+[ init_angle_screen::ang_w#0 ]
 [ init_angle_screen::$11 ]
+[ init_angle_screen::$12 ]
+[ init_angle_screen::$13 ]
 [ atan2_16::$23 ]
 [ atan2_16::$22 ]
 Allocated zp[2]:2 [ main::clear_char#5 main::clear_char#1 ]
@@ -1754,17 +1757,17 @@ Allocated zp[1]:38 [ init_font_hex::idx#3 ]
 Allocated zp[1]:39 [ init_angle_screen::$3 ]
 Allocated zp[1]:40 [ init_angle_screen::$4 ]
 Allocated zp[2]:41 [ init_angle_screen::xw#0 ]
-Allocated zp[1]:43 [ init_angle_screen::$5 ]
+Allocated zp[1]:43 [ init_angle_screen::$6 ]
 Allocated zp[2]:44 [ init_angle_screen::yw#0 ]
 Allocated zp[2]:46 [ atan2_16::x#0 ]
 Allocated zp[2]:48 [ atan2_16::y#0 ]
 Allocated zp[2]:50 [ atan2_16::return#2 ]
 Allocated zp[2]:52 [ init_angle_screen::angle_w#0 ]
-Allocated zp[2]:54 [ init_angle_screen::$7 ]
+Allocated zp[2]:54 [ init_angle_screen::$9 ]
 Allocated zp[1]:56 [ init_angle_screen::ang_w#0 ]
-Allocated zp[1]:57 [ init_angle_screen::$9 ]
-Allocated zp[1]:58 [ init_angle_screen::$10 ]
-Allocated zp[1]:59 [ init_angle_screen::$11 ]
+Allocated zp[1]:57 [ init_angle_screen::$11 ]
+Allocated zp[1]:58 [ init_angle_screen::$12 ]
+Allocated zp[1]:59 [ init_angle_screen::$13 ]
 Allocated zp[1]:60 [ atan2_16::$23 ]
 Allocated zp[1]:61 [ atan2_16::$22 ]
 REGISTER UPLIFT POTENTIAL REGISTERS
@@ -1794,15 +1797,15 @@ Statement [42] init_angle_screen::$3 = init_angle_screen::x#2 << 1 [ init_angle_
 Removing always clobbered register reg byte a as potential for zp[1]:19 [ init_angle_screen::x#2 init_angle_screen::x#1 ]
 Removing always clobbered register reg byte a as potential for zp[1]:20 [ init_angle_screen::xb#2 init_angle_screen::xb#1 ]
 Statement [43] init_angle_screen::$4 = $27 - init_angle_screen::$3 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$4 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$4 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
-Statement [45] init_angle_screen::$5 = init_angle_screen::y#5 << 1 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::xw#0 init_angle_screen::$5 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::xw#0 init_angle_screen::$5 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
+Statement [45] init_angle_screen::$6 = init_angle_screen::y#5 << 1 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::xw#0 init_angle_screen::$6 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::xw#0 init_angle_screen::$6 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [47] atan2_16::x#0 = (signed word)init_angle_screen::xw#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::yw#0 atan2_16::x#0 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::yw#0 atan2_16::x#0 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [48] atan2_16::y#0 = (signed word)init_angle_screen::yw#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::x#0 atan2_16::y#0 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::x#0 atan2_16::y#0 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [50] atan2_16::return#2 = atan2_16::return#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::return#2 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::return#2 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [51] init_angle_screen::angle_w#0 = atan2_16::return#2 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::angle_w#0 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::angle_w#0 ] { }  ) always clobbers reg byte a 
-Statement [52] init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$7 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$7 ] { }  ) always clobbers reg byte a 
-Statement [56] init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$10 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$10 ] { }  ) always clobbers reg byte a 
+Statement [52] init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$9 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$9 ] { }  ) always clobbers reg byte a 
+Statement [56] init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$12 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$12 ] { }  ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp[1]:56 [ init_angle_screen::ang_w#0 ]
-Statement [58] init_angle_screen::$11 = - init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$11 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$11 ] { }  ) always clobbers reg byte a 
+Statement [58] init_angle_screen::$13 = - init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$13 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$13 ] { }  ) always clobbers reg byte a 
 Statement [60] init_angle_screen::screen_bottomline#6[init_angle_screen::xb#2] = init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 ] { }  ) always clobbers reg byte a 
 Statement [63] if(atan2_16::y#0>=0) goto atan2_16::@1 [ atan2_16::x#0 atan2_16::y#0 ] ( init_angle_screen:4::atan2_16:49 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::x#0 atan2_16::y#0 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [64] atan2_16::$2 = - atan2_16::y#0 [ atan2_16::x#0 atan2_16::y#0 atan2_16::$2 ] ( init_angle_screen:4::atan2_16:49 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::x#0 atan2_16::y#0 atan2_16::$2 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
@@ -1849,15 +1852,15 @@ Statement [37] init_angle_screen::screen_topline#1 = init_angle_screen::screen_t
 Statement [38] init_angle_screen::screen_bottomline#1 = init_angle_screen::screen_bottomline#6 + $28 [ init_angle_screen::y#5 init_angle_screen::screen_topline#1 init_angle_screen::screen_bottomline#1 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#1 init_angle_screen::screen_bottomline#1 ] { }  ) always clobbers reg byte a 
 Statement [42] init_angle_screen::$3 = init_angle_screen::x#2 << 1 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$3 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$3 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [43] init_angle_screen::$4 = $27 - init_angle_screen::$3 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$4 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$4 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
-Statement [45] init_angle_screen::$5 = init_angle_screen::y#5 << 1 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::xw#0 init_angle_screen::$5 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::xw#0 init_angle_screen::$5 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
+Statement [45] init_angle_screen::$6 = init_angle_screen::y#5 << 1 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::xw#0 init_angle_screen::$6 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::xw#0 init_angle_screen::$6 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [47] atan2_16::x#0 = (signed word)init_angle_screen::xw#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::yw#0 atan2_16::x#0 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::yw#0 atan2_16::x#0 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [48] atan2_16::y#0 = (signed word)init_angle_screen::yw#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::x#0 atan2_16::y#0 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::x#0 atan2_16::y#0 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [50] atan2_16::return#2 = atan2_16::return#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::return#2 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::return#2 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [51] init_angle_screen::angle_w#0 = atan2_16::return#2 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::angle_w#0 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::angle_w#0 ] { }  ) always clobbers reg byte a 
-Statement [52] init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$7 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$7 ] { }  ) always clobbers reg byte a 
-Statement [54] init_angle_screen::$9 = $80 + init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$9 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$9 ] { }  ) always clobbers reg byte a 
-Statement [56] init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$10 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$10 ] { }  ) always clobbers reg byte a 
-Statement [58] init_angle_screen::$11 = - init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$11 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$11 ] { }  ) always clobbers reg byte a 
+Statement [52] init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$9 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::$9 ] { }  ) always clobbers reg byte a 
+Statement [54] init_angle_screen::$11 = $80 + init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$11 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$11 ] { }  ) always clobbers reg byte a 
+Statement [56] init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$12 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$12 ] { }  ) always clobbers reg byte a 
+Statement [58] init_angle_screen::$13 = - init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$13 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 init_angle_screen::ang_w#0 init_angle_screen::$13 ] { }  ) always clobbers reg byte a 
 Statement [60] init_angle_screen::screen_bottomline#6[init_angle_screen::xb#2] = init_angle_screen::ang_w#0 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 ] ( init_angle_screen:4 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 ] { }  ) always clobbers reg byte a 
 Statement [63] if(atan2_16::y#0>=0) goto atan2_16::@1 [ atan2_16::x#0 atan2_16::y#0 ] ( init_angle_screen:4::atan2_16:49 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::x#0 atan2_16::y#0 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
 Statement [64] atan2_16::$2 = - atan2_16::y#0 [ atan2_16::x#0 atan2_16::y#0 atan2_16::$2 ] ( init_angle_screen:4::atan2_16:49 [ init_angle_screen::y#5 init_angle_screen::screen_topline#6 init_angle_screen::screen_bottomline#6 init_angle_screen::x#2 init_angle_screen::xb#2 atan2_16::x#0 atan2_16::y#0 atan2_16::$2 ] { { atan2_16::return#0 = atan2_16::return#2 } }  ) always clobbers reg byte a 
@@ -1914,24 +1917,24 @@ Potential registers zp[1]:38 [ init_font_hex::idx#3 ] : zp[1]:38 , reg byte a ,
 Potential registers zp[1]:39 [ init_angle_screen::$3 ] : zp[1]:39 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:40 [ init_angle_screen::$4 ] : zp[1]:40 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:41 [ init_angle_screen::xw#0 ] : zp[2]:41 , 
-Potential registers zp[1]:43 [ init_angle_screen::$5 ] : zp[1]:43 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:43 [ init_angle_screen::$6 ] : zp[1]:43 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:44 [ init_angle_screen::yw#0 ] : zp[2]:44 , 
 Potential registers zp[2]:46 [ atan2_16::x#0 ] : zp[2]:46 , 
 Potential registers zp[2]:48 [ atan2_16::y#0 ] : zp[2]:48 , 
 Potential registers zp[2]:50 [ atan2_16::return#2 ] : zp[2]:50 , 
 Potential registers zp[2]:52 [ init_angle_screen::angle_w#0 ] : zp[2]:52 , 
-Potential registers zp[2]:54 [ init_angle_screen::$7 ] : zp[2]:54 , 
+Potential registers zp[2]:54 [ init_angle_screen::$9 ] : zp[2]:54 , 
 Potential registers zp[1]:56 [ init_angle_screen::ang_w#0 ] : zp[1]:56 , reg byte x , reg byte y , 
-Potential registers zp[1]:57 [ init_angle_screen::$9 ] : zp[1]:57 , reg byte a , reg byte x , reg byte y , 
-Potential registers zp[1]:58 [ init_angle_screen::$10 ] : zp[1]:58 , reg byte a , reg byte x , reg byte y , 
-Potential registers zp[1]:59 [ init_angle_screen::$11 ] : zp[1]:59 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:57 [ init_angle_screen::$11 ] : zp[1]:57 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:58 [ init_angle_screen::$12 ] : zp[1]:58 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:59 [ init_angle_screen::$13 ] : zp[1]:59 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:60 [ atan2_16::$23 ] : zp[1]:60 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:61 [ atan2_16::$22 ] : zp[1]:61 , reg byte a , reg byte x , reg byte y , 
 
 REGISTER UPLIFT SCOPES
 Uplift Scope [atan2_16] 286,666,670.58: zp[1]:30 [ atan2_16::shift#2 atan2_16::shift#5 atan2_16::shift#1 ] 206,000,008: zp[2]:31 [ atan2_16::yd#5 atan2_16::yd#3 atan2_16::yd#10 atan2_16::yd#1 atan2_16::yd#2 ] 173,333,338.67: zp[2]:33 [ atan2_16::xd#5 atan2_16::xd#3 atan2_16::xd#10 atan2_16::xd#1 atan2_16::xd#2 ] 75,248,103.76: zp[2]:26 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 ] 26,909,340.68: zp[2]:21 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 ] 22,737,342.67: zp[2]:23 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 ] 20,000,002: zp[1]:60 [ atan2_16::$23 ] 20,000,002: zp[1]:61 [ atan2_16::$22 ] 17,083,335.04: zp[1]:25 [ atan2_16::i#2 atan2_16::i#1 ] 82,008.5: zp[2]:28 [ atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 ] 2,002: zp[2]:50 [ atan2_16::return#2 ] 1,079.08: zp[2]:46 [ atan2_16::x#0 ] 1,025.12: zp[2]:48 [ atan2_16::y#0 ] 
 Uplift Scope [init_font_hex] 21,668.83: zp[1]:12 [ init_font_hex::i#2 init_font_hex::i#1 ] 20,002: zp[1]:36 [ init_font_hex::$1 ] 20,002: zp[1]:37 [ init_font_hex::$2 ] 11,501.6: zp[1]:13 [ init_font_hex::idx#5 init_font_hex::idx#2 ] 10,001: zp[1]:35 [ init_font_hex::$0 ] 2,002: zp[1]:38 [ init_font_hex::idx#3 ] 1,634.97: zp[1]:11 [ init_font_hex::c1#4 init_font_hex::c1#1 ] 1,631.57: zp[2]:7 [ init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ] 1,423.81: zp[2]:9 [ init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ] 634.17: zp[2]:4 [ init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ] 162.13: zp[1]:6 [ init_font_hex::c#6 init_font_hex::c#1 ] 
-Uplift Scope [init_angle_screen] 2,184: zp[1]:20 [ init_angle_screen::xb#2 init_angle_screen::xb#1 ] 2,002: zp[1]:39 [ init_angle_screen::$3 ] 2,002: zp[1]:40 [ init_angle_screen::$4 ] 2,002: zp[1]:43 [ init_angle_screen::$5 ] 2,002: zp[2]:52 [ init_angle_screen::angle_w#0 ] 2,002: zp[2]:54 [ init_angle_screen::$7 ] 2,002: zp[1]:57 [ init_angle_screen::$9 ] 2,002: zp[1]:58 [ init_angle_screen::$10 ] 2,002: zp[1]:59 [ init_angle_screen::$11 ] 1,287: zp[1]:19 [ init_angle_screen::x#2 init_angle_screen::x#1 ] 715: zp[1]:56 [ init_angle_screen::ang_w#0 ] 500.5: zp[2]:44 [ init_angle_screen::yw#0 ] 333.67: zp[2]:41 [ init_angle_screen::xw#0 ] 197.77: zp[1]:14 [ init_angle_screen::y#5 init_angle_screen::y#1 ] 155.49: zp[2]:17 [ init_angle_screen::screen_bottomline#6 init_angle_screen::screen_bottomline#1 ] 142.33: zp[2]:15 [ init_angle_screen::screen_topline#6 init_angle_screen::screen_topline#1 ] 
+Uplift Scope [init_angle_screen] 2,184: zp[1]:20 [ init_angle_screen::xb#2 init_angle_screen::xb#1 ] 2,002: zp[1]:39 [ init_angle_screen::$3 ] 2,002: zp[1]:40 [ init_angle_screen::$4 ] 2,002: zp[1]:43 [ init_angle_screen::$6 ] 2,002: zp[2]:52 [ init_angle_screen::angle_w#0 ] 2,002: zp[2]:54 [ init_angle_screen::$9 ] 2,002: zp[1]:57 [ init_angle_screen::$11 ] 2,002: zp[1]:58 [ init_angle_screen::$12 ] 2,002: zp[1]:59 [ init_angle_screen::$13 ] 1,287: zp[1]:19 [ init_angle_screen::x#2 init_angle_screen::x#1 ] 715: zp[1]:56 [ init_angle_screen::ang_w#0 ] 500.5: zp[2]:44 [ init_angle_screen::yw#0 ] 333.67: zp[2]:41 [ init_angle_screen::xw#0 ] 197.77: zp[1]:14 [ init_angle_screen::y#5 init_angle_screen::y#1 ] 155.49: zp[2]:17 [ init_angle_screen::screen_bottomline#6 init_angle_screen::screen_bottomline#1 ] 142.33: zp[2]:15 [ init_angle_screen::screen_topline#6 init_angle_screen::screen_topline#1 ] 
 Uplift Scope [main] 106: zp[2]:2 [ main::clear_char#5 main::clear_char#1 ] 
 Uplift Scope [MOS6526_CIA] 
 Uplift Scope [MOS6569_VICII] 
@@ -1942,7 +1945,7 @@ Uplifting [atan2_16] best 1172159 combination reg byte y [ atan2_16::shift#2 ata
 Limited combination testing to 100 combinations of 144 possible.
 Uplifting [init_font_hex] best 1153159 combination reg byte x [ init_font_hex::i#2 init_font_hex::i#1 ] reg byte a [ init_font_hex::$1 ] reg byte a [ init_font_hex::$2 ] zp[1]:13 [ init_font_hex::idx#5 init_font_hex::idx#2 ] zp[1]:35 [ init_font_hex::$0 ] zp[1]:38 [ init_font_hex::idx#3 ] zp[1]:11 [ init_font_hex::c1#4 init_font_hex::c1#1 ] zp[2]:7 [ init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ] zp[2]:9 [ init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ] zp[2]:4 [ init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ] zp[1]:6 [ init_font_hex::c#6 init_font_hex::c#1 ] 
 Limited combination testing to 100 combinations of 6912 possible.
-Uplifting [init_angle_screen] best 1151559 combination zp[1]:20 [ init_angle_screen::xb#2 init_angle_screen::xb#1 ] reg byte a [ init_angle_screen::$3 ] reg byte a [ init_angle_screen::$4 ] reg byte a [ init_angle_screen::$5 ] zp[2]:52 [ init_angle_screen::angle_w#0 ] zp[2]:54 [ init_angle_screen::$7 ] zp[1]:57 [ init_angle_screen::$9 ] zp[1]:58 [ init_angle_screen::$10 ] zp[1]:59 [ init_angle_screen::$11 ] zp[1]:19 [ init_angle_screen::x#2 init_angle_screen::x#1 ] zp[1]:56 [ init_angle_screen::ang_w#0 ] zp[2]:44 [ init_angle_screen::yw#0 ] zp[2]:41 [ init_angle_screen::xw#0 ] zp[1]:14 [ init_angle_screen::y#5 init_angle_screen::y#1 ] zp[2]:17 [ init_angle_screen::screen_bottomline#6 init_angle_screen::screen_bottomline#1 ] zp[2]:15 [ init_angle_screen::screen_topline#6 init_angle_screen::screen_topline#1 ] 
+Uplifting [init_angle_screen] best 1151559 combination zp[1]:20 [ init_angle_screen::xb#2 init_angle_screen::xb#1 ] reg byte a [ init_angle_screen::$3 ] reg byte a [ init_angle_screen::$4 ] reg byte a [ init_angle_screen::$6 ] zp[2]:52 [ init_angle_screen::angle_w#0 ] zp[2]:54 [ init_angle_screen::$9 ] zp[1]:57 [ init_angle_screen::$11 ] zp[1]:58 [ init_angle_screen::$12 ] zp[1]:59 [ init_angle_screen::$13 ] zp[1]:19 [ init_angle_screen::x#2 init_angle_screen::x#1 ] zp[1]:56 [ init_angle_screen::ang_w#0 ] zp[2]:44 [ init_angle_screen::yw#0 ] zp[2]:41 [ init_angle_screen::xw#0 ] zp[1]:14 [ init_angle_screen::y#5 init_angle_screen::y#1 ] zp[2]:17 [ init_angle_screen::screen_bottomline#6 init_angle_screen::screen_bottomline#1 ] zp[2]:15 [ init_angle_screen::screen_topline#6 init_angle_screen::screen_topline#1 ] 
 Limited combination testing to 100 combinations of 331776 possible.
 Uplifting [main] best 1151559 combination zp[2]:2 [ main::clear_char#5 main::clear_char#1 ] 
 Uplifting [MOS6526_CIA] best 1151559 combination 
@@ -1957,12 +1960,12 @@ Attempting to uplift remaining variables inzp[1]:20 [ init_angle_screen::xb#2 in
 Uplifting [init_angle_screen] best 1151559 combination zp[1]:20 [ init_angle_screen::xb#2 init_angle_screen::xb#1 ] 
 Attempting to uplift remaining variables inzp[1]:38 [ init_font_hex::idx#3 ]
 Uplifting [init_font_hex] best 1150959 combination reg byte y [ init_font_hex::idx#3 ] 
-Attempting to uplift remaining variables inzp[1]:57 [ init_angle_screen::$9 ]
-Uplifting [init_angle_screen] best 1150559 combination reg byte a [ init_angle_screen::$9 ] 
-Attempting to uplift remaining variables inzp[1]:58 [ init_angle_screen::$10 ]
-Uplifting [init_angle_screen] best 1149959 combination reg byte a [ init_angle_screen::$10 ] 
-Attempting to uplift remaining variables inzp[1]:59 [ init_angle_screen::$11 ]
-Uplifting [init_angle_screen] best 1149359 combination reg byte a [ init_angle_screen::$11 ] 
+Attempting to uplift remaining variables inzp[1]:57 [ init_angle_screen::$11 ]
+Uplifting [init_angle_screen] best 1150559 combination reg byte a [ init_angle_screen::$11 ] 
+Attempting to uplift remaining variables inzp[1]:58 [ init_angle_screen::$12 ]
+Uplifting [init_angle_screen] best 1149959 combination reg byte a [ init_angle_screen::$12 ] 
+Attempting to uplift remaining variables inzp[1]:59 [ init_angle_screen::$13 ]
+Uplifting [init_angle_screen] best 1149359 combination reg byte a [ init_angle_screen::$13 ] 
 Attempting to uplift remaining variables inzp[1]:11 [ init_font_hex::c1#4 init_font_hex::c1#1 ]
 Uplifting [init_font_hex] best 1149359 combination zp[1]:11 [ init_font_hex::c1#4 init_font_hex::c1#1 ] 
 Attempting to uplift remaining variables inzp[1]:19 [ init_angle_screen::x#2 init_angle_screen::x#1 ]
@@ -1978,7 +1981,7 @@ Coalescing zero page register [ zp[2]:41 [ init_angle_screen::xw#0 ] ] with [ zp
 Coalescing zero page register [ zp[2]:44 [ init_angle_screen::yw#0 ] ] with [ zp[2]:48 [ atan2_16::y#0 ] ] - score: 1
 Coalescing zero page register [ zp[2]:50 [ atan2_16::return#2 ] ] with [ zp[2]:52 [ init_angle_screen::angle_w#0 ] ] - score: 1
 Coalescing zero page register [ zp[2]:26 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 ] ] with [ zp[2]:50 [ atan2_16::return#2 init_angle_screen::angle_w#0 ] ] - score: 1
-Coalescing zero page register [ zp[2]:26 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 init_angle_screen::angle_w#0 ] ] with [ zp[2]:54 [ init_angle_screen::$7 ] ] - score: 1
+Coalescing zero page register [ zp[2]:26 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 init_angle_screen::angle_w#0 ] ] with [ zp[2]:54 [ init_angle_screen::$9 ] ] - score: 1
 Coalescing zero page register [ zp[1]:14 [ init_angle_screen::y#5 init_angle_screen::y#1 ] ] with [ zp[1]:6 [ init_font_hex::c#6 init_font_hex::c#1 ] ]
 Coalescing zero page register [ zp[2]:15 [ init_angle_screen::screen_topline#6 init_angle_screen::screen_topline#1 ] ] with [ zp[2]:4 [ init_font_hex::proto_hi#6 init_font_hex::proto_hi#1 ] ]
 Coalescing zero page register [ zp[2]:17 [ init_angle_screen::screen_bottomline#6 init_angle_screen::screen_bottomline#1 ] ] with [ zp[2]:7 [ init_font_hex::charset#2 init_font_hex::charset#5 init_font_hex::charset#0 ] ]
@@ -1993,7 +1996,7 @@ Allocated (was zp[1]:19) zp[1]:9 [ init_angle_screen::x#2 init_angle_screen::x#1
 Allocated (was zp[1]:20) zp[1]:10 [ init_angle_screen::xb#2 init_angle_screen::xb#1 init_font_hex::idx#5 init_font_hex::idx#2 ]
 Allocated (was zp[2]:21) zp[2]:11 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
 Allocated (was zp[2]:23) zp[2]:13 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 ]
-Allocated (was zp[2]:26) zp[2]:15 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 init_angle_screen::angle_w#0 init_angle_screen::$7 ]
+Allocated (was zp[2]:26) zp[2]:15 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 init_angle_screen::angle_w#0 init_angle_screen::$9 ]
 Allocated (was zp[2]:31) zp[2]:17 [ atan2_16::yd#5 atan2_16::yd#3 atan2_16::yd#10 atan2_16::yd#1 atan2_16::yd#2 ]
 Allocated (was zp[2]:33) zp[2]:19 [ atan2_16::xd#5 atan2_16::xd#3 atan2_16::xd#10 atan2_16::xd#1 atan2_16::xd#2 ]
 Allocated (was zp[2]:41) zp[2]:21 [ init_angle_screen::xw#0 atan2_16::x#0 ]
@@ -2259,7 +2262,7 @@ init_font_hex: {
 // Populates 1000 bytes (a screen) with values representing the angle to the center.
 // Utilizes symmetry around the  center
 init_angle_screen: {
-    .label __7 = $f
+    .label __9 = $f
     .label xw = $15
     .label yw = $17
     .label angle_w = $f
@@ -2351,10 +2354,10 @@ init_angle_screen: {
     ldy #0
     sta.z xw+1
     sty.z xw
-    // [45] init_angle_screen::$5 = init_angle_screen::y#5 << 1 -- vbuaa=vbuz1_rol_1 
+    // [45] init_angle_screen::$6 = init_angle_screen::y#5 << 1 -- vbuaa=vbuz1_rol_1 
     lda.z y
     asl
-    // [46] init_angle_screen::yw#0 = init_angle_screen::$5 w= 0 -- vwuz1=vbuaa_word_vbuc1 
+    // [46] init_angle_screen::yw#0 = init_angle_screen::$6 w= 0 -- vwuz1=vbuaa_word_vbuc1 
     ldy #0
     sta.z yw+1
     sty.z yw
@@ -2367,37 +2370,37 @@ init_angle_screen: {
     // init_angle_screen::@5
   __b5:
     // [51] init_angle_screen::angle_w#0 = atan2_16::return#2
-    // [52] init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80 -- vwuz1=vwuz1_plus_vbuc1 
+    // [52] init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80 -- vwuz1=vwuz1_plus_vbuc1 
     lda #$80
     clc
-    adc.z __7
-    sta.z __7
+    adc.z __9
+    sta.z __9
     bcc !+
-    inc.z __7+1
+    inc.z __9+1
   !:
-    // [53] init_angle_screen::ang_w#0 = byte1  init_angle_screen::$7 -- vbuz1=_byte1_vwuz2 
-    lda.z __7+1
+    // [53] init_angle_screen::ang_w#0 = byte1  init_angle_screen::$9 -- vbuz1=_byte1_vwuz2 
+    lda.z __9+1
     sta.z ang_w
-    // [54] init_angle_screen::$9 = $80 + init_angle_screen::ang_w#0 -- vbuaa=vbuc1_plus_vbuz1 
+    // [54] init_angle_screen::$11 = $80 + init_angle_screen::ang_w#0 -- vbuaa=vbuc1_plus_vbuz1 
     lda #$80
     clc
     adc.z ang_w
-    // [55] init_angle_screen::screen_topline#6[init_angle_screen::x#2] = init_angle_screen::$9 -- pbuz1_derefidx_vbuz2=vbuaa 
+    // [55] init_angle_screen::screen_topline#6[init_angle_screen::x#2] = init_angle_screen::$11 -- pbuz1_derefidx_vbuz2=vbuaa 
     ldy.z x
     sta (screen_topline),y
-    // [56] init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0 -- vbuaa=vbuc1_minus_vbuz1 
+    // [56] init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0 -- vbuaa=vbuc1_minus_vbuz1 
     lda #$80
     sec
     sbc.z ang_w
-    // [57] init_angle_screen::screen_bottomline#6[init_angle_screen::x#2] = init_angle_screen::$10 -- pbuz1_derefidx_vbuz2=vbuaa 
+    // [57] init_angle_screen::screen_bottomline#6[init_angle_screen::x#2] = init_angle_screen::$12 -- pbuz1_derefidx_vbuz2=vbuaa 
     ldy.z x
     sta (screen_bottomline),y
-    // [58] init_angle_screen::$11 = - init_angle_screen::ang_w#0 -- vbuaa=_neg_vbuz1 
+    // [58] init_angle_screen::$13 = - init_angle_screen::ang_w#0 -- vbuaa=_neg_vbuz1 
     lda.z ang_w
     eor #$ff
     clc
     adc #1
-    // [59] init_angle_screen::screen_topline#6[init_angle_screen::xb#2] = init_angle_screen::$11 -- pbuz1_derefidx_vbuz2=vbuaa 
+    // [59] init_angle_screen::screen_topline#6[init_angle_screen::xb#2] = init_angle_screen::$13 -- pbuz1_derefidx_vbuz2=vbuaa 
     ldy.z xb
     sta (screen_topline),y
     // [60] init_angle_screen::screen_bottomline#6[init_angle_screen::xb#2] = init_angle_screen::ang_w#0 -- pbuz1_derefidx_vbuz2=vbuz3 
@@ -2931,13 +2934,13 @@ signed word atan2_16::yi#2 yi zp[2]:11 6666667.333333333
 signed word atan2_16::yi#3 yi zp[2]:11 3530000.4117647056
 signed word atan2_16::yi#8 yi zp[2]:11 1.0000001E7
 void init_angle_screen(byte* init_angle_screen::screen)
-byte~ init_angle_screen::$10 reg byte a 2002.0
 byte~ init_angle_screen::$11 reg byte a 2002.0
+byte~ init_angle_screen::$12 reg byte a 2002.0
+byte~ init_angle_screen::$13 reg byte a 2002.0
 byte~ init_angle_screen::$3 reg byte a 2002.0
 byte~ init_angle_screen::$4 reg byte a 2002.0
-byte~ init_angle_screen::$5 reg byte a 2002.0
-word~ init_angle_screen::$7 zp[2]:15 2002.0
-byte~ init_angle_screen::$9 reg byte a 2002.0
+byte~ init_angle_screen::$6 reg byte a 2002.0
+word~ init_angle_screen::$9 zp[2]:15 2002.0
 byte init_angle_screen::ang_w
 byte init_angle_screen::ang_w#0 ang_w zp[1]:25 715.0
 word init_angle_screen::angle_w
@@ -3008,7 +3011,7 @@ zp[1]:10 [ init_angle_screen::xb#2 init_angle_screen::xb#1 init_font_hex::idx#5
 zp[2]:11 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
 zp[2]:13 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 ]
 reg byte x [ atan2_16::i#2 atan2_16::i#1 ]
-zp[2]:15 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 init_angle_screen::angle_w#0 init_angle_screen::$7 ]
+zp[2]:15 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 init_angle_screen::angle_w#0 init_angle_screen::$9 ]
 reg byte y [ atan2_16::shift#2 atan2_16::shift#5 atan2_16::shift#1 ]
 zp[2]:17 [ atan2_16::yd#5 atan2_16::yd#3 atan2_16::yd#10 atan2_16::yd#1 atan2_16::yd#2 ]
 zp[2]:19 [ atan2_16::xd#5 atan2_16::xd#3 atan2_16::xd#10 atan2_16::xd#1 atan2_16::xd#2 ]
@@ -3018,12 +3021,12 @@ reg byte y [ init_font_hex::idx#3 ]
 reg byte a [ init_angle_screen::$3 ]
 reg byte a [ init_angle_screen::$4 ]
 zp[2]:21 [ init_angle_screen::xw#0 atan2_16::x#0 ]
-reg byte a [ init_angle_screen::$5 ]
+reg byte a [ init_angle_screen::$6 ]
 zp[2]:23 [ init_angle_screen::yw#0 atan2_16::y#0 ]
 zp[1]:25 [ init_angle_screen::ang_w#0 init_font_hex::$0 ]
-reg byte a [ init_angle_screen::$9 ]
-reg byte a [ init_angle_screen::$10 ]
 reg byte a [ init_angle_screen::$11 ]
+reg byte a [ init_angle_screen::$12 ]
+reg byte a [ init_angle_screen::$13 ]
 reg byte a [ atan2_16::$23 ]
 reg byte a [ atan2_16::$22 ]
 
@@ -3274,7 +3277,7 @@ init_font_hex: {
 // Populates 1000 bytes (a screen) with values representing the angle to the center.
 // Utilizes symmetry around the  center
 init_angle_screen: {
-    .label __7 = $f
+    .label __9 = $f
     .label xw = $15
     .label yw = $17
     .label angle_w = $f
@@ -3359,17 +3362,17 @@ init_angle_screen: {
     eor #$ff
     sec
     adc #$27
-    // signed word xw = (signed word)(word){ 39-x*2, 0 }
+    // MAKEWORD( 39-x*2, 0 )
     // [44] init_angle_screen::xw#0 = init_angle_screen::$4 w= 0 -- vwuz1=vbuaa_word_vbuc1 
     ldy #0
     sta.z xw+1
     sty.z xw
     // y*2
-    // [45] init_angle_screen::$5 = init_angle_screen::y#5 << 1 -- vbuaa=vbuz1_rol_1 
+    // [45] init_angle_screen::$6 = init_angle_screen::y#5 << 1 -- vbuaa=vbuz1_rol_1 
     lda.z y
     asl
-    // signed word yw = (signed word)(word){ y*2, 0 }
-    // [46] init_angle_screen::yw#0 = init_angle_screen::$5 w= 0 -- vwuz1=vbuaa_word_vbuc1 
+    // MAKEWORD( y*2, 0 )
+    // [46] init_angle_screen::yw#0 = init_angle_screen::$6 w= 0 -- vwuz1=vbuaa_word_vbuc1 
     sta.z yw+1
     sty.z yw
     // atan2_16(xw, yw)
@@ -3382,43 +3385,43 @@ init_angle_screen: {
     // word angle_w = atan2_16(xw, yw)
     // [51] init_angle_screen::angle_w#0 = atan2_16::return#2
     // angle_w+0x0080
-    // [52] init_angle_screen::$7 = init_angle_screen::angle_w#0 + $80 -- vwuz1=vwuz1_plus_vbuc1 
+    // [52] init_angle_screen::$9 = init_angle_screen::angle_w#0 + $80 -- vwuz1=vwuz1_plus_vbuc1 
     lda #$80
     clc
-    adc.z __7
-    sta.z __7
+    adc.z __9
+    sta.z __9
     bcc !+
-    inc.z __7+1
+    inc.z __9+1
   !:
     // byte ang_w = BYTE1(angle_w+0x0080)
-    // [53] init_angle_screen::ang_w#0 = byte1  init_angle_screen::$7 -- vbuz1=_byte1_vwuz2 
-    lda.z __7+1
+    // [53] init_angle_screen::ang_w#0 = byte1  init_angle_screen::$9 -- vbuz1=_byte1_vwuz2 
+    lda.z __9+1
     sta.z ang_w
     // 0x80+ang_w
-    // [54] init_angle_screen::$9 = $80 + init_angle_screen::ang_w#0 -- vbuaa=vbuc1_plus_vbuz1 
+    // [54] init_angle_screen::$11 = $80 + init_angle_screen::ang_w#0 -- vbuaa=vbuc1_plus_vbuz1 
     lda #$80
     clc
     adc.z ang_w
     // screen_topline[x] = 0x80+ang_w
-    // [55] init_angle_screen::screen_topline#6[init_angle_screen::x#2] = init_angle_screen::$9 -- pbuz1_derefidx_vbuz2=vbuaa 
+    // [55] init_angle_screen::screen_topline#6[init_angle_screen::x#2] = init_angle_screen::$11 -- pbuz1_derefidx_vbuz2=vbuaa 
     ldy.z x
     sta (screen_topline),y
     // 0x80-ang_w
-    // [56] init_angle_screen::$10 = $80 - init_angle_screen::ang_w#0 -- vbuaa=vbuc1_minus_vbuz1 
+    // [56] init_angle_screen::$12 = $80 - init_angle_screen::ang_w#0 -- vbuaa=vbuc1_minus_vbuz1 
     lda #$80
     sec
     sbc.z ang_w
     // screen_bottomline[x] = 0x80-ang_w
-    // [57] init_angle_screen::screen_bottomline#6[init_angle_screen::x#2] = init_angle_screen::$10 -- pbuz1_derefidx_vbuz2=vbuaa 
+    // [57] init_angle_screen::screen_bottomline#6[init_angle_screen::x#2] = init_angle_screen::$12 -- pbuz1_derefidx_vbuz2=vbuaa 
     sta (screen_bottomline),y
     // -ang_w
-    // [58] init_angle_screen::$11 = - init_angle_screen::ang_w#0 -- vbuaa=_neg_vbuz1 
+    // [58] init_angle_screen::$13 = - init_angle_screen::ang_w#0 -- vbuaa=_neg_vbuz1 
     lda.z ang_w
     eor #$ff
     clc
     adc #1
     // screen_topline[xb] = -ang_w
-    // [59] init_angle_screen::screen_topline#6[init_angle_screen::xb#2] = init_angle_screen::$11 -- pbuz1_derefidx_vbuz2=vbuaa 
+    // [59] init_angle_screen::screen_topline#6[init_angle_screen::xb#2] = init_angle_screen::$13 -- pbuz1_derefidx_vbuz2=vbuaa 
     ldy.z xb
     sta (screen_topline),y
     // screen_bottomline[xb] = ang_w

src/test/ref/cordic-atan2-clear.sym

@@ -63,13 +63,13 @@ signed word atan2_16::yi#2 yi zp[2]:11 6666667.333333333
 signed word atan2_16::yi#3 yi zp[2]:11 3530000.4117647056
 signed word atan2_16::yi#8 yi zp[2]:11 1.0000001E7
 void init_angle_screen(byte* init_angle_screen::screen)
-byte~ init_angle_screen::$10 reg byte a 2002.0
 byte~ init_angle_screen::$11 reg byte a 2002.0
+byte~ init_angle_screen::$12 reg byte a 2002.0
+byte~ init_angle_screen::$13 reg byte a 2002.0
 byte~ init_angle_screen::$3 reg byte a 2002.0
 byte~ init_angle_screen::$4 reg byte a 2002.0
-byte~ init_angle_screen::$5 reg byte a 2002.0
-word~ init_angle_screen::$7 zp[2]:15 2002.0
-byte~ init_angle_screen::$9 reg byte a 2002.0
+byte~ init_angle_screen::$6 reg byte a 2002.0
+word~ init_angle_screen::$9 zp[2]:15 2002.0
 byte init_angle_screen::ang_w
 byte init_angle_screen::ang_w#0 ang_w zp[1]:25 715.0
 word init_angle_screen::angle_w
@@ -140,7 +140,7 @@ zp[1]:10 [ init_angle_screen::xb#2 init_angle_screen::xb#1 init_font_hex::idx#5
 zp[2]:11 [ atan2_16::yi#3 atan2_16::yi#8 atan2_16::yi#0 atan2_16::yi#16 atan2_16::$2 atan2_16::yi#1 atan2_16::yi#2 init_font_hex::proto_lo#4 init_font_hex::proto_lo#1 ]
 zp[2]:13 [ atan2_16::xi#3 atan2_16::xi#8 atan2_16::xi#0 atan2_16::xi#13 atan2_16::$7 atan2_16::xi#1 atan2_16::xi#2 ]
 reg byte x [ atan2_16::i#2 atan2_16::i#1 ]
-zp[2]:15 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 init_angle_screen::angle_w#0 init_angle_screen::$7 ]
+zp[2]:15 [ atan2_16::angle#6 atan2_16::angle#12 atan2_16::angle#13 atan2_16::angle#2 atan2_16::angle#3 atan2_16::return#0 atan2_16::angle#11 atan2_16::angle#1 atan2_16::angle#4 atan2_16::angle#5 atan2_16::return#2 init_angle_screen::angle_w#0 init_angle_screen::$9 ]
 reg byte y [ atan2_16::shift#2 atan2_16::shift#5 atan2_16::shift#1 ]
 zp[2]:17 [ atan2_16::yd#5 atan2_16::yd#3 atan2_16::yd#10 atan2_16::yd#1 atan2_16::yd#2 ]
 zp[2]:19 [ atan2_16::xd#5 atan2_16::xd#3 atan2_16::xd#10 atan2_16::xd#1 atan2_16::xd#2 ]
@@ -150,11 +150,11 @@ reg byte y [ init_font_hex::idx#3 ]
 reg byte a [ init_angle_screen::$3 ]
 reg byte a [ init_angle_screen::$4 ]
 zp[2]:21 [ init_angle_screen::xw#0 atan2_16::x#0 ]
-reg byte a [ init_angle_screen::$5 ]
+reg byte a [ init_angle_screen::$6 ]
 zp[2]:23 [ init_angle_screen::yw#0 atan2_16::y#0 ]
 zp[1]:25 [ init_angle_screen::ang_w#0 init_font_hex::$0 ]
-reg byte a [ init_angle_screen::$9 ]
-reg byte a [ init_angle_screen::$10 ]
 reg byte a [ init_angle_screen::$11 ]
+reg byte a [ init_angle_screen::$12 ]
+reg byte a [ init_angle_screen::$13 ]
 reg byte a [ atan2_16::$23 ]
 reg byte a [ atan2_16::$22 ]

src/test/ref/examples/c64/bresenham/bitmap-bresenham.asm

@@ -530,10 +530,10 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(4) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $19
+    .label __1 = $19
     .label plotter = $17
     .label x = 4
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -541,17 +541,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x

src/test/ref/examples/c64/bresenham/bitmap-bresenham.cfg

@@ -271,10 +271,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [128] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [128] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [129] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [130] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [132] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [130] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [132] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [134] return 

src/test/ref/examples/c64/bresenham/bitmap-bresenham.log

@@ -122,11 +122,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_line::@6 bitmap_line::@9
   bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#4], bitmap_plot_ylo[bitmap_plot::y#4] }
-  bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -872,8 +873,9 @@ word bitmap_line::y2#7
 word bitmap_line::y2#8
 word bitmap_line::y2#9
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -998,8 +1000,6 @@ word sgn_u16::w#0
 word sgn_u16::w#1
 word sgn_u16::w#2
 
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#4] w= (byte)bitmap_plot_ylo[bitmap_plot::y#4]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) 1 in 
 Adding number conversion cast (unumber) 1 in 
 Adding number conversion cast (unumber) 1 in bitmap_init::bits#1 = bitmap_init::bits#3 >> 1
@@ -1016,8 +1016,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#1 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#4 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#4 & (unumber)$fff8
 Adding number conversion cast (unumber) 0 in bitmap_line::$4 = bitmap_line::dx#1 == 0
 Adding number conversion cast (unumber) 0 in bitmap_line::$5 = bitmap_line::dy#0 == 0
 Adding number conversion cast (unumber) 2 in bitmap_line::$20 = bitmap_line::dy#2 / 2
@@ -1074,8 +1074,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#4]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#4]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast 0
 Simplifying constant integer cast 0
@@ -1140,7 +1138,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
 Inferred type updated to word in bitmap_line::$20 = bitmap_line::dy#2 / 2
 Inferred type updated to word in bitmap_line::$15 = bitmap_line::dx#3 / 2
 Inferred type updated to byte in abs_u16::$1 = abs_u16::$0 & $80
@@ -1383,7 +1381,7 @@ Constant bitmap_clear::col#0 = bitmap_clear::fgcol#0*$10
 Successful SSA optimization Pass2ConstantIdentification
 Constant memset::c#0 = bitmap_clear::col#0
 Successful SSA optimization Pass2ConstantIdentification
-Inlining Noop Cast [25] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [25] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Successful SSA optimization Pass2NopCastInlining
 Inlining Noop Cast [83] memset::$4 = (byte*)memset::str#3 keeping memset::str#3
 Inlining Noop Cast [85] memset::dst#0 = (byte*)memset::str#3 keeping memset::str#3
@@ -1837,10 +1835,10 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line::@3 bitmap_line::@4 bitmap_li
   [128] bitmap_plot::x#4 = phi( bitmap_line::@3/bitmap_plot::x#2, bitmap_line::@4/bitmap_plot::x#0, bitmap_line::@6/bitmap_plot::x#1, bitmap_line::@9/bitmap_plot::x#3 )
   [128] bitmap_plot::y#4 = phi( bitmap_line::@3/bitmap_plot::y#2, bitmap_line::@4/bitmap_plot::y#0, bitmap_line::@6/bitmap_plot::y#1, bitmap_line::@9/bitmap_plot::y#3 )
   [129] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4]
-  [130] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8
-  [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [132] bitmap_plot::$1 = byte0  bitmap_plot::x#4
-  [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [130] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8
+  [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [132] bitmap_plot::$2 = byte0  bitmap_plot::x#4
+  [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [134] return 
@@ -1930,8 +1928,8 @@ word bitmap_line::y1#0 16400.2
 word bitmap_line::y2
 word bitmap_line::y2#0 3131562.625
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 2.000000002E9
-byte~ bitmap_plot::$1 2.000000002E9
+word~ bitmap_plot::$1 2.000000002E9
+byte~ bitmap_plot::$2 2.000000002E9
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 5.000000005E8
 byte* bitmap_plot::plotter#1 1.5000000015E9
@@ -2023,9 +2021,9 @@ Added variable abs_u16::$1 to live range equivalence class [ abs_u16::$1 ]
 Added variable sgn_u16::$0 to live range equivalence class [ sgn_u16::$0 ]
 Added variable sgn_u16::$1 to live range equivalence class [ sgn_u16::$1 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Complete equivalence classes
 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ]
 [ bitmap_init::x#2 bitmap_init::x#1 ]
@@ -2066,9 +2064,9 @@ Complete equivalence classes
 [ sgn_u16::$0 ]
 [ sgn_u16::$1 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 Allocated zp[1]:2 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ]
 Allocated zp[1]:3 [ bitmap_init::x#2 bitmap_init::x#1 ]
 Allocated zp[1]:4 [ bitmap_init::y#2 bitmap_init::y#1 ]
@@ -2108,9 +2106,9 @@ Allocated zp[1]:61 [ abs_u16::$1 ]
 Allocated zp[1]:62 [ sgn_u16::$0 ]
 Allocated zp[1]:63 [ sgn_u16::$1 ]
 Allocated zp[2]:64 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:66 [ bitmap_plot::$0 ]
+Allocated zp[2]:66 [ bitmap_plot::$1 ]
 Allocated zp[2]:68 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:70 [ bitmap_plot::$1 ]
+Allocated zp[1]:70 [ bitmap_plot::$2 ]
 REGISTER UPLIFT POTENTIAL REGISTERS
 Equivalence Class zp[1]:35 [ bitmap_init::$4 ] has ALU potential.
 Statement [0] *((byte*)VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR) = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -2168,9 +2166,9 @@ Statement [110] if(bitmap_line::x#15!=bitmap_line::x2#0) goto bitmap_line::@9 [
 Statement [111] bitmap_plot::x#0 = bitmap_line::x1#0 [ bitmap_line::y1#0 bitmap_plot::x#0 ] ( lines:10::bitmap_line:52 [ lines::l#2 bitmap_line::y1#0 bitmap_plot::x#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
 Statement [118] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( lines:10::bitmap_line:52::abs_u16:64 [ lines::l#2 bitmap_line::x1#0 bitmap_line::y1#0 bitmap_line::x2#0 bitmap_line::y2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 } { abs_u16::return#0 = abs_u16::return#4 } }  lines:10::bitmap_line:52::abs_u16:68 [ lines::l#2 bitmap_line::x1#0 bitmap_line::y1#0 bitmap_line::x2#0 bitmap_line::y2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { abs_u16::w#1 = abs_u16::w#2 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [129] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [130] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [130] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte y as potential for zp[1]:9 [ lines::l#2 lines::l#1 ]
 Statement [0] *((byte*)VICII+OFFSET_STRUCT_MOS6569_VICII_BORDER_COLOR) = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
 Statement [1] *((byte*)VICII+OFFSET_STRUCT_MOS6569_VICII_BG_COLOR) = 0 [ ] (  [ ] { }  ) always clobbers reg byte a 
@@ -2224,9 +2222,9 @@ Statement [110] if(bitmap_line::x#15!=bitmap_line::x2#0) goto bitmap_line::@9 [
 Statement [111] bitmap_plot::x#0 = bitmap_line::x1#0 [ bitmap_line::y1#0 bitmap_plot::x#0 ] ( lines:10::bitmap_line:52 [ lines::l#2 bitmap_line::y1#0 bitmap_plot::x#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
 Statement [118] abs_u16::return#2 = - abs_u16::w#2 [ abs_u16::return#2 ] ( lines:10::bitmap_line:52::abs_u16:64 [ lines::l#2 bitmap_line::x1#0 bitmap_line::y1#0 bitmap_line::x2#0 bitmap_line::y2#0 abs_u16::return#2 ] { { abs_u16::w#0 = abs_u16::w#2 } { abs_u16::return#0 = abs_u16::return#4 } }  lines:10::bitmap_line:52::abs_u16:68 [ lines::l#2 bitmap_line::x1#0 bitmap_line::y1#0 bitmap_line::x2#0 bitmap_line::y2#0 bitmap_line::dx#0 abs_u16::return#2 ] { { abs_u16::w#1 = abs_u16::w#2 } { abs_u16::return#1 = abs_u16::return#4 } }  ) always clobbers reg byte a 
 Statement [129] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] [ bitmap_plot::x#4 bitmap_plot::plotter#0 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [130] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
-Statement [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
+Statement [130] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 [ bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#4 bitmap_plot::plotter#1 ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 bitmap_plot::x#4 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a 
+Statement [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( lines:10::bitmap_line:52::bitmap_plot:86 [ lines::l#2 bitmap_line::y2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#13 bitmap_line::y#4 bitmap_line::e#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#4 } { bitmap_plot::x#1 = bitmap_plot::x#4 bitmap_line::x#13 } }  lines:10::bitmap_line:52::bitmap_plot:97 [ lines::l#2 ] { { bitmap_plot::y#2 = bitmap_plot::y#4 } { bitmap_plot::x#2 = bitmap_plot::x#4 bitmap_line::x#6 } }  lines:10::bitmap_line:52::bitmap_plot:103 [ lines::l#2 bitmap_line::x2#0 bitmap_line::dx#0 bitmap_line::dy#0 bitmap_line::sx#0 bitmap_line::sy#0 bitmap_line::x#7 bitmap_line::y#15 bitmap_line::e1#3 ] { { bitmap_plot::y#3 = bitmap_plot::y#4 } { bitmap_plot::x#3 = bitmap_plot::x#4 bitmap_line::x#7 } }  lines:10::bitmap_line:52::bitmap_plot:113 [ lines::l#2 ] { { bitmap_plot::y#0 = bitmap_plot::y#4 } { bitmap_plot::x#0 = bitmap_plot::x#4 bitmap_line::x1#0 } }  ) always clobbers reg byte a reg byte y 
 Potential registers zp[1]:2 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] : zp[1]:2 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:3 [ bitmap_init::x#2 bitmap_init::x#1 ] : zp[1]:3 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:4 [ bitmap_init::y#2 bitmap_init::y#1 ] : zp[1]:4 , reg byte x , reg byte y , 
@@ -2266,12 +2264,12 @@ Potential registers zp[1]:61 [ abs_u16::$1 ] : zp[1]:61 , reg byte a , reg byte
 Potential registers zp[1]:62 [ sgn_u16::$0 ] : zp[1]:62 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:63 [ sgn_u16::$1 ] : zp[1]:63 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:64 [ bitmap_plot::plotter#0 ] : zp[2]:64 , 
-Potential registers zp[2]:66 [ bitmap_plot::$0 ] : zp[2]:66 , 
+Potential registers zp[2]:66 [ bitmap_plot::$1 ] : zp[2]:66 , 
 Potential registers zp[2]:68 [ bitmap_plot::plotter#1 ] : zp[2]:68 , 
-Potential registers zp[1]:70 [ bitmap_plot::$1 ] : zp[1]:70 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:70 [ bitmap_plot::$2 ] : zp[1]:70 , reg byte a , reg byte x , reg byte y , 
 
 REGISTER UPLIFT SCOPES
-Uplift Scope [bitmap_plot] 2,600,600,014: zp[1]:31 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] 2,000,000,002: zp[2]:66 [ bitmap_plot::$0 ] 2,000,000,002: zp[1]:70 [ bitmap_plot::$1 ] 1,500,000,001.5: zp[2]:68 [ bitmap_plot::plotter#1 ] 750,250,005.5: zp[2]:32 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] 500,000,000.5: zp[2]:64 [ bitmap_plot::plotter#0 ] 
+Uplift Scope [bitmap_plot] 2,600,600,014: zp[1]:31 [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] 2,000,000,002: zp[2]:66 [ bitmap_plot::$1 ] 2,000,000,002: zp[1]:70 [ bitmap_plot::$2 ] 1,500,000,001.5: zp[2]:68 [ bitmap_plot::plotter#1 ] 750,250,005.5: zp[2]:32 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] 500,000,000.5: zp[2]:64 [ bitmap_plot::plotter#0 ] 
 Uplift Scope [bitmap_line] 689,445,408.53: zp[2]:19 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x1#0 bitmap_line::x#12 bitmap_line::x#1 ] 550,055,691.81: zp[2]:21 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y1#0 bitmap_line::y#1 bitmap_line::y#2 ] 523,553,340.77: zp[2]:23 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] 523,553,340.77: zp[2]:17 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] 8,344,444.64: zp[2]:50 [ bitmap_line::dy#0 ] 7,696,153.96: zp[2]:58 [ bitmap_line::sy#0 ] 7,510,000.18: zp[2]:46 [ bitmap_line::dx#0 ] 6,670,000.1: zp[2]:54 [ bitmap_line::sx#0 ] 3,131,562.62: zp[2]:40 [ bitmap_line::y2#0 ] 3,036,666.79: zp[2]:38 [ bitmap_line::x2#0 ] 
 Uplift Scope [abs_u16] 3,750,008.25: zp[2]:25 [ abs_u16::return#4 abs_u16::return#2 abs_u16::w#2 abs_u16::w#0 abs_u16::w#1 ] 2,000,002: zp[1]:60 [ abs_u16::$0 ] 2,000,002: zp[1]:61 [ abs_u16::$1 ] 200,002: zp[2]:44 [ abs_u16::return#0 ] 200,002: zp[2]:48 [ abs_u16::return#1 ] 
 Uplift Scope [sgn_u16] 2,000,002: zp[1]:62 [ sgn_u16::$0 ] 2,000,002: zp[1]:63 [ sgn_u16::$1 ] 1,600,007: zp[2]:27 [ sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ] 200,002: zp[2]:52 [ sgn_u16::return#0 ] 200,002: zp[2]:56 [ sgn_u16::return#1 ] 50,000.5: zp[2]:29 [ sgn_u16::return#4 ] 
@@ -2286,7 +2284,7 @@ Uplift Scope [bitmap_clear]
 Uplift Scope [main] 
 Uplift Scope [] 
 
-Uplifting [bitmap_plot] best 297378 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:66 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:68 [ bitmap_plot::plotter#1 ] zp[2]:32 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:64 [ bitmap_plot::plotter#0 ] 
+Uplifting [bitmap_plot] best 297378 combination reg byte x [ bitmap_plot::y#4 bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 bitmap_plot::y#3 ] zp[2]:66 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:68 [ bitmap_plot::plotter#1 ] zp[2]:32 [ bitmap_plot::x#4 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 bitmap_plot::x#3 ] zp[2]:64 [ bitmap_plot::plotter#0 ] 
 Uplifting [bitmap_line] best 297378 combination zp[2]:19 [ bitmap_line::x#7 bitmap_line::x#6 bitmap_line::x#15 bitmap_line::x#13 bitmap_line::x1#0 bitmap_line::x#12 bitmap_line::x#1 ] zp[2]:21 [ bitmap_line::y#15 bitmap_line::y#7 bitmap_line::y#13 bitmap_line::y#4 bitmap_line::y1#0 bitmap_line::y#1 bitmap_line::y#2 ] zp[2]:23 [ bitmap_line::e1#3 bitmap_line::e1#6 bitmap_line::e1#0 bitmap_line::e1#2 bitmap_line::e1#1 ] zp[2]:17 [ bitmap_line::e#3 bitmap_line::e#0 bitmap_line::e#6 bitmap_line::e#1 bitmap_line::e#2 ] zp[2]:50 [ bitmap_line::dy#0 ] zp[2]:58 [ bitmap_line::sy#0 ] zp[2]:46 [ bitmap_line::dx#0 ] zp[2]:54 [ bitmap_line::sx#0 ] zp[2]:40 [ bitmap_line::y2#0 ] zp[2]:38 [ bitmap_line::x2#0 ] 
 Uplifting [abs_u16] best 297368 combination zp[2]:25 [ abs_u16::return#4 abs_u16::return#2 abs_u16::w#2 abs_u16::w#0 abs_u16::w#1 ] reg byte a [ abs_u16::$0 ] reg byte a [ abs_u16::$1 ] zp[2]:44 [ abs_u16::return#0 ] zp[2]:48 [ abs_u16::return#1 ] 
 Uplifting [sgn_u16] best 297358 combination reg byte a [ sgn_u16::$0 ] reg byte a [ sgn_u16::$1 ] zp[2]:27 [ sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ] zp[2]:52 [ sgn_u16::return#0 ] zp[2]:56 [ sgn_u16::return#1 ] zp[2]:29 [ sgn_u16::return#4 ] 
@@ -2337,7 +2335,7 @@ Allocated (was zp[2]:40) zp[2]:17 [ bitmap_line::y2#0 ]
 Allocated (was zp[2]:46) zp[2]:19 [ bitmap_line::dx#0 ]
 Allocated (was zp[2]:54) zp[2]:21 [ bitmap_line::sx#0 ]
 Allocated (was zp[2]:64) zp[2]:23 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-Allocated (was zp[2]:66) zp[2]:25 [ bitmap_plot::$0 ]
+Allocated (was zp[2]:66) zp[2]:25 [ bitmap_plot::$1 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
@@ -3161,7 +3159,7 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(4) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $19
+    .label __1 = $19
     .label plotter = $17
     .label x = 4
     // [129] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -3169,24 +3167,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [130] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [130] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [132] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [132] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -3459,8 +3457,8 @@ word bitmap_line::y1#0 y1 zp[2]:6 16400.2
 word bitmap_line::y2
 word bitmap_line::y2#0 y2 zp[2]:17 3131562.625
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:25 2.000000002E9
-byte~ bitmap_plot::$1 reg byte x 2.000000002E9
+word~ bitmap_plot::$1 zp[2]:25 2.000000002E9
+byte~ bitmap_plot::$2 reg byte x 2.000000002E9
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:23 5.000000005E8
 byte* bitmap_plot::plotter#1 plotter zp[2]:23 1.5000000015E9
@@ -3541,8 +3539,8 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:23 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-zp[2]:25 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:25 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]
 
 
 FINAL ASSEMBLER
@@ -4329,37 +4327,37 @@ sgn_u16: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(4) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $19
+    .label __1 = $19
     .label plotter = $17
     .label x = 4
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [129] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#4] w= bitmap_plot_ylo[bitmap_plot::y#4] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [130] bitmap_plot::$0 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [130] bitmap_plot::$1 = bitmap_plot::x#4 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [131] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [132] bitmap_plot::$1 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
+    // [132] bitmap_plot::$2 = byte0  bitmap_plot::x#4 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [133] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y

src/test/ref/examples/c64/bresenham/bitmap-bresenham.sym

@@ -93,8 +93,8 @@ word bitmap_line::y1#0 y1 zp[2]:6 16400.2
 word bitmap_line::y2
 word bitmap_line::y2#0 y2 zp[2]:17 3131562.625
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:25 2.000000002E9
-byte~ bitmap_plot::$1 reg byte x 2.000000002E9
+word~ bitmap_plot::$1 zp[2]:25 2.000000002E9
+byte~ bitmap_plot::$2 reg byte x 2.000000002E9
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:23 5.000000005E8
 byte* bitmap_plot::plotter#1 plotter zp[2]:23 1.5000000015E9
@@ -175,5 +175,5 @@ reg byte a [ abs_u16::$1 ]
 reg byte a [ sgn_u16::$0 ]
 reg byte a [ sgn_u16::$1 ]
 zp[2]:23 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 sgn_u16::w#2 sgn_u16::w#0 sgn_u16::w#1 ]
-zp[2]:25 [ bitmap_plot::$0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:25 [ bitmap_plot::$1 ]
+reg byte x [ bitmap_plot::$2 ]

src/test/ref/examples/c64/scrolllogo/scrolllogo.asm

@@ -323,7 +323,7 @@ div32u16u: {
     jsr divr16u
     // divr16u(WORD0(dividend), divisor, rem16u)
     // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u)
-    // unsigned long quotient = { quotient_hi, quotient_lo}
+    // MAKEDWORD( quotient_hi, quotient_lo )
     lda.z quotient_hi
     sta.z return+2
     lda.z quotient_hi+1

src/test/ref/examples/c64/scrolllogo/scrolllogo.log

@@ -359,7 +359,8 @@ div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   div32u16u::$3 = divr16u::return#6
   rem16u#5 = rem16u#16
   div32u16u::quotient_lo#0 = div32u16u::$3
-  div32u16u::quotient#0 = (dword){ div32u16u::quotient_hi#1, div32u16u::quotient_lo#0 }
+  div32u16u::$4 = div32u16u::quotient_hi#1 dw= div32u16u::quotient_lo#0
+  div32u16u::quotient#0 = div32u16u::$4
   div32u16u::return#1 = div32u16u::quotient#0
   to:div32u16u::@return
 div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
@@ -859,6 +860,7 @@ word~ div32u16u::$0
 word~ div32u16u::$1
 word~ div32u16u::$2
 word~ div32u16u::$3
+dword~ div32u16u::$4
 dword div32u16u::dividend
 dword div32u16u::dividend#0
 dword div32u16u::dividend#1
@@ -1461,8 +1463,6 @@ word xsin_idx#7
 word xsin_idx#8
 word xsin_idx#9
 
-Fixing inline constructor with div32u16u::$4 = (word)div32u16u::quotient_hi#1 dw= (word)div32u16u::quotient_lo#0
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (snumber) 1 in sin16s_gen2::$1 = sin16s_gen2::ampl#0 >> 1
 Adding number conversion cast (unumber) 1 in sin16s::isUpper#1 = 1
 Adding number conversion cast (unumber) 3 in sin16s::$4 = sin16s::x#6 << 3
@@ -1581,8 +1581,6 @@ Simplifying constant integer cast 1
 Simplifying constant integer cast 1
 Simplifying constant integer cast 1
 Simplifying constant integer cast 0
-Simplifying constant integer cast div32u16u::quotient_hi#1
-Simplifying constant integer cast div32u16u::quotient_lo#0
 Simplifying constant integer cast 0
 Simplifying constant integer cast 1
 Simplifying constant integer cast 0
@@ -6786,7 +6784,7 @@ div32u16u: {
     // div32u16u::@2
     // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u)
     // [68] div32u16u::quotient_lo#0 = divr16u::return#3
-    // unsigned long quotient = { quotient_hi, quotient_lo}
+    // MAKEDWORD( quotient_hi, quotient_lo )
     // [69] div32u16u::return#1 = div32u16u::quotient_hi#0 dw= div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda.z quotient_hi
     sta.z return+2

src/test/ref/examples/c64/sinplotter/sine-plotter.asm

@@ -472,7 +472,7 @@ div32u16u: {
     jsr divr16u
     // divr16u(WORD0(dividend), divisor, rem16u)
     // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u)
-    // unsigned long quotient = { quotient_hi, quotient_lo}
+    // MAKEDWORD( quotient_hi, quotient_lo )
     lda.z quotient_hi
     sta.z return+2
     lda.z quotient_hi+1
@@ -787,10 +787,10 @@ wrap_y: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(8) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $25
+    .label __1 = $25
     .label plotter = $23
     .label x = 8
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
@@ -798,17 +798,17 @@ bitmap_plot: {
     // x & $fff8
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
     ldx.z x

src/test/ref/examples/c64/sinplotter/sine-plotter.cfg

@@ -353,10 +353,10 @@ bitmap_plot: scope:[bitmap_plot]  from render_sine::@4 render_sine::@6
   [171] bitmap_plot::x#2 = phi( render_sine::@4/bitmap_plot::x#0, render_sine::@6/bitmap_plot::x#1 )
   [171] bitmap_plot::y#2 = phi( render_sine::@4/bitmap_plot::y#0, render_sine::@6/bitmap_plot::y#1 )
   [172] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#2] w= bitmap_plot_ylo[bitmap_plot::y#2]
-  [173] bitmap_plot::$0 = bitmap_plot::x#2 & $fff8
-  [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [175] bitmap_plot::$1 = byte0  bitmap_plot::x#2
-  [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [173] bitmap_plot::$1 = bitmap_plot::x#2 & $fff8
+  [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [175] bitmap_plot::$2 = byte0  bitmap_plot::x#2
+  [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [177] return 

src/test/ref/examples/c64/sinplotter/sine-plotter.log

@@ -360,7 +360,8 @@ div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   div32u16u::$3 = divr16u::return#6
   rem16u#5 = rem16u#16
   div32u16u::quotient_lo#0 = div32u16u::$3
-  div32u16u::quotient#0 = (dword){ div32u16u::quotient_hi#1, div32u16u::quotient_lo#0 }
+  div32u16u::$4 = div32u16u::quotient_hi#1 dw= div32u16u::quotient_lo#0
+  div32u16u::quotient#0 = div32u16u::$4
   div32u16u::return#1 = div32u16u::quotient#0
   to:div32u16u::@return
 div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
@@ -639,11 +640,12 @@ void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
 bitmap_plot: scope:[bitmap_plot]  from render_sine::@5 render_sine::@7
   bitmap_plot::x#2 = phi( render_sine::@5/bitmap_plot::x#0, render_sine::@7/bitmap_plot::x#1 )
   bitmap_plot::y#2 = phi( render_sine::@5/bitmap_plot::y#0, render_sine::@7/bitmap_plot::y#1 )
-  bitmap_plot::plotter#0 = (byte*){ bitmap_plot_yhi[bitmap_plot::y#2], bitmap_plot_ylo[bitmap_plot::y#2] }
-  bitmap_plot::$0 = bitmap_plot::x#2 & $fff8
-  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$0
-  bitmap_plot::$1 = byte0  bitmap_plot::x#2
-  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  bitmap_plot::$0 = bitmap_plot_yhi[bitmap_plot::y#2] w= bitmap_plot_ylo[bitmap_plot::y#2]
+  bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0
+  bitmap_plot::$1 = bitmap_plot::x#2 & $fff8
+  bitmap_plot::plotter#1 = bitmap_plot::plotter#0 + bitmap_plot::$1
+  bitmap_plot::$2 = byte0  bitmap_plot::x#2
+  *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   return 
@@ -1049,8 +1051,9 @@ byte* bitmap_init::yoffs#2
 byte* bitmap_init::yoffs#3
 byte* bitmap_init::yoffs#4
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-number~ bitmap_plot::$0
-byte~ bitmap_plot::$1
+word~ bitmap_plot::$0
+number~ bitmap_plot::$1
+byte~ bitmap_plot::$2
 byte* bitmap_plot::plotter
 byte* bitmap_plot::plotter#0
 byte* bitmap_plot::plotter#1
@@ -1106,6 +1109,7 @@ word~ div32u16u::$0
 word~ div32u16u::$1
 word~ div32u16u::$2
 word~ div32u16u::$3
+dword~ div32u16u::$4
 dword div32u16u::dividend
 dword div32u16u::dividend#0
 dword div32u16u::dividend#1
@@ -1657,9 +1661,6 @@ signed word wrap_y::y#7
 signed word wrap_y::y#8
 signed word wrap_y::y#9
 
-Fixing inline constructor with div32u16u::$4 = (word)div32u16u::quotient_hi#1 dw= (word)div32u16u::quotient_lo#0
-Fixing inline constructor with bitmap_plot::$2 = (byte)bitmap_plot_yhi[bitmap_plot::y#2] w= (byte)bitmap_plot_ylo[bitmap_plot::y#2]
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (snumber) 1 in sin16s_gen2::$1 = sin16s_gen2::ampl#0 >> 1
 Adding number conversion cast (unumber) 1 in sin16s::isUpper#1 = 1
 Adding number conversion cast (unumber) 3 in sin16s::$4 = sin16s::x#6 << 3
@@ -1703,8 +1704,8 @@ Adding number conversion cast (unumber) $10 in bitmap_clear::$0 = bitmap_clear::
 Adding number conversion cast (unumber) bitmap_clear::$0 in bitmap_clear::$0 = bitmap_clear::fgcol#1 * (unumber)$10
 Adding number conversion cast (unumber) bitmap_clear::$1 in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
 Adding number conversion cast (unumber) 0 in memset::c#1 = 0
-Adding number conversion cast (unumber) $fff8 in bitmap_plot::$0 = bitmap_plot::x#2 & $fff8
-Adding number conversion cast (unumber) bitmap_plot::$0 in bitmap_plot::$0 = bitmap_plot::x#2 & (unumber)$fff8
+Adding number conversion cast (unumber) $fff8 in bitmap_plot::$1 = bitmap_plot::x#2 & $fff8
+Adding number conversion cast (unumber) bitmap_plot::$1 in bitmap_plot::$1 = bitmap_plot::x#2 & (unumber)$fff8
 Adding number conversion cast (unumber) VICII_BMM|VICII_DEN|VICII_RSEL|3 in *D011 = VICII_BMM|VICII_DEN|VICII_RSEL|3
 Adding number conversion cast (unumber) 3 in *D011 = ((unumber)) VICII_BMM|VICII_DEN|VICII_RSEL|3
 Adding number conversion cast (unumber) 3 in *((byte*)CIA2+OFFSET_STRUCT_MOS6526_CIA_PORT_A_DDR) = 3
@@ -1775,8 +1776,6 @@ Simplifying constant integer cast 1
 Simplifying constant integer cast 1
 Simplifying constant integer cast 1
 Simplifying constant integer cast 0
-Simplifying constant integer cast div32u16u::quotient_hi#1
-Simplifying constant integer cast div32u16u::quotient_lo#0
 Simplifying constant integer cast 0
 Simplifying constant integer cast 1
 Simplifying constant integer cast 0
@@ -1793,8 +1792,6 @@ Simplifying constant integer cast 7
 Simplifying constant integer cast 7
 Simplifying constant integer cast $10
 Simplifying constant integer cast 0
-Simplifying constant integer cast bitmap_plot_yhi[bitmap_plot::y#2]
-Simplifying constant integer cast bitmap_plot_ylo[bitmap_plot::y#2]
 Simplifying constant integer cast $fff8
 Simplifying constant integer cast VICII_BMM|VICII_DEN|VICII_RSEL|(unumber)3
 Simplifying constant integer cast 3
@@ -1875,7 +1872,7 @@ Inferred type updated to byte in bitmap_init::$5 = bitmap_init::$3 | bitmap_init
 Inferred type updated to byte in bitmap_init::$7 = bitmap_init::y#2 & 7
 Inferred type updated to byte in bitmap_clear::$0 = bitmap_clear::fgcol#1 * $10
 Inferred type updated to byte in bitmap_clear::$1 = bitmap_clear::$0 + bitmap_clear::bgcol#1
-Inferred type updated to word in bitmap_plot::$0 = bitmap_plot::x#2 & $fff8
+Inferred type updated to word in bitmap_plot::$1 = bitmap_plot::x#2 & $fff8
 Inferred type updated to byte in main::vicSelectGfxBank1_toDd001_$1 = main::vicSelectGfxBank1_toDd001_$0 / $40
 Inferred type updated to byte in main::vicSelectGfxBank1_toDd001_$2 = 3 ^ main::vicSelectGfxBank1_toDd001_$1
 Inferred type updated to word in main::toD0181_$0 = main::toD0181_$7 & $3fff
@@ -2305,7 +2302,7 @@ Successful SSA optimization Pass2ConstantRValueConsolidation
 Constant main::toD0181_return#0 = main::toD0181_$2|main::toD0181_$5
 Successful SSA optimization Pass2ConstantIdentification
 Inlining Noop Cast [13] sin16s_gen2::$8 = (signed word)sin16s_gen2::$7 keeping sin16s_gen2::$8
-Inlining Noop Cast [152] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$2 keeping bitmap_plot::plotter#0
+Inlining Noop Cast [152] bitmap_plot::plotter#0 = (byte*)bitmap_plot::$0 keeping bitmap_plot::plotter#0
 Successful SSA optimization Pass2NopCastInlining
 Inlining Noop Cast [53] sin16s::sinx#0 = (signed word)sin16s::usinx#1 keeping sin16s::usinx#1
 Inlining Noop Cast [119] memset::$4 = (byte*)memset::str#3 keeping memset::str#3
@@ -2944,10 +2941,10 @@ bitmap_plot: scope:[bitmap_plot]  from render_sine::@4 render_sine::@6
   [171] bitmap_plot::x#2 = phi( render_sine::@4/bitmap_plot::x#0, render_sine::@6/bitmap_plot::x#1 )
   [171] bitmap_plot::y#2 = phi( render_sine::@4/bitmap_plot::y#0, render_sine::@6/bitmap_plot::y#1 )
   [172] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#2] w= bitmap_plot_ylo[bitmap_plot::y#2]
-  [173] bitmap_plot::$0 = bitmap_plot::x#2 & $fff8
-  [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0
-  [175] bitmap_plot::$1 = byte0  bitmap_plot::x#2
-  [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1]
+  [173] bitmap_plot::$1 = bitmap_plot::x#2 & $fff8
+  [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1
+  [175] bitmap_plot::$2 = byte0  bitmap_plot::x#2
+  [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2]
   to:bitmap_plot::@return
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [177] return 
@@ -3070,8 +3067,8 @@ byte* bitmap_init::yoffs#1 202.0
 byte* bitmap_init::yoffs#2 63.125
 byte* bitmap_init::yoffs#4 101.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 2002.0
-byte~ bitmap_plot::$1 2002.0
+word~ bitmap_plot::$1 2002.0
+byte~ bitmap_plot::$2 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 500.5
 byte* bitmap_plot::plotter#1 1501.5
@@ -3370,9 +3367,9 @@ Added variable mul16s::$11 to live range equivalence class [ mul16s::$11 ]
 Added variable mul16s::return#1 to live range equivalence class [ mul16s::return#1 ]
 Added variable wrap_y::return#2 to live range equivalence class [ wrap_y::return#2 ]
 Added variable bitmap_plot::plotter#0 to live range equivalence class [ bitmap_plot::plotter#0 ]
-Added variable bitmap_plot::$0 to live range equivalence class [ bitmap_plot::$0 ]
-Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
 Added variable bitmap_plot::$1 to live range equivalence class [ bitmap_plot::$1 ]
+Added variable bitmap_plot::plotter#1 to live range equivalence class [ bitmap_plot::plotter#1 ]
+Added variable bitmap_plot::$2 to live range equivalence class [ bitmap_plot::$2 ]
 Added variable divr16u::$1 to live range equivalence class [ divr16u::$1 ]
 Added variable divr16u::$2 to live range equivalence class [ divr16u::$2 ]
 Added variable rem16u#14 to live range equivalence class [ rem16u#14 ]
@@ -3460,9 +3457,9 @@ Complete equivalence classes
 [ mul16s::return#1 ]
 [ wrap_y::return#2 ]
 [ bitmap_plot::plotter#0 ]
-[ bitmap_plot::$0 ]
-[ bitmap_plot::plotter#1 ]
 [ bitmap_plot::$1 ]
+[ bitmap_plot::plotter#1 ]
+[ bitmap_plot::$2 ]
 [ divr16u::$1 ]
 [ divr16u::$2 ]
 [ rem16u#14 ]
@@ -3549,9 +3546,9 @@ Allocated zp[2]:158 [ mul16s::$11 ]
 Allocated zp[4]:160 [ mul16s::return#1 ]
 Allocated zp[1]:164 [ wrap_y::return#2 ]
 Allocated zp[2]:165 [ bitmap_plot::plotter#0 ]
-Allocated zp[2]:167 [ bitmap_plot::$0 ]
+Allocated zp[2]:167 [ bitmap_plot::$1 ]
 Allocated zp[2]:169 [ bitmap_plot::plotter#1 ]
-Allocated zp[1]:171 [ bitmap_plot::$1 ]
+Allocated zp[1]:171 [ bitmap_plot::$2 ]
 Allocated zp[1]:172 [ divr16u::$1 ]
 Allocated zp[1]:173 [ divr16u::$2 ]
 Allocated zp[2]:174 [ rem16u#14 ]
@@ -3654,9 +3651,9 @@ Statement [167] wrap_y::return#2 = (byte)wrap_y::y#6 [ wrap_y::return#2 ] ( rend
 Statement [169] wrap_y::y#3 = wrap_y::y#6 + $c8 [ wrap_y::y#3 ] ( render_sine:16::wrap_y:72 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 wrap_y::y#3 ] { { wrap_y::y#0 = wrap_y::y#9 render_sine::sin_val#0 } { wrap_y::return#0 = wrap_y::return#2 } }  render_sine:16::wrap_y:81 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#3 ] { { wrap_y::y#1 = wrap_y::y#9 } { wrap_y::return#1 = wrap_y::return#2 } }  ) always clobbers reg byte a 
 Statement [170] wrap_y::y#2 = wrap_y::y#4 - $c8 [ wrap_y::y#2 ] ( render_sine:16::wrap_y:72 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 wrap_y::y#2 ] { { wrap_y::y#0 = wrap_y::y#9 render_sine::sin_val#0 } { wrap_y::return#0 = wrap_y::return#2 } }  render_sine:16::wrap_y:81 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#2 ] { { wrap_y::y#1 = wrap_y::y#9 } { wrap_y::return#1 = wrap_y::return#2 } }  ) always clobbers reg byte a 
 Statement [172] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#2] w= bitmap_plot_ylo[bitmap_plot::y#2] [ bitmap_plot::x#2 bitmap_plot::plotter#0 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
-Statement [173] bitmap_plot::$0 = bitmap_plot::x#2 & $fff8 [ bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
-Statement [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#2 bitmap_plot::plotter#1 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
-Statement [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a reg byte y 
+Statement [173] bitmap_plot::$1 = bitmap_plot::x#2 & $fff8 [ bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
+Statement [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#2 bitmap_plot::plotter#1 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
+Statement [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a reg byte y 
 Statement [184] divr16u::rem#1 = divr16u::rem#0 | 1 [ divr16u::dividend#3 divr16u::quotient#3 divr16u::i#2 divr16u::rem#1 ] ( sin16s_gen2:14::div32u16u:46::divr16u:102 [ divr16u::dividend#3 divr16u::quotient#3 divr16u::i#2 divr16u::rem#1 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  sin16s_gen2:14::div32u16u:46::divr16u:106 [ div32u16u::quotient_hi#0 divr16u::dividend#3 divr16u::quotient#3 divr16u::i#2 divr16u::rem#1 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp[1]:48 [ divr16u::i#2 divr16u::i#1 ]
 Statement [188] if(divr16u::rem#6<SIN_SIZE) goto divr16u::@3 [ divr16u::i#2 divr16u::dividend#0 divr16u::rem#6 divr16u::quotient#1 ] ( sin16s_gen2:14::div32u16u:46::divr16u:102 [ divr16u::i#2 divr16u::dividend#0 divr16u::rem#6 divr16u::quotient#1 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  sin16s_gen2:14::div32u16u:46::divr16u:106 [ div32u16u::quotient_hi#0 divr16u::i#2 divr16u::dividend#0 divr16u::rem#6 divr16u::quotient#1 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
@@ -3760,9 +3757,9 @@ Statement [167] wrap_y::return#2 = (byte)wrap_y::y#6 [ wrap_y::return#2 ] ( rend
 Statement [169] wrap_y::y#3 = wrap_y::y#6 + $c8 [ wrap_y::y#3 ] ( render_sine:16::wrap_y:72 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 wrap_y::y#3 ] { { wrap_y::y#0 = wrap_y::y#9 render_sine::sin_val#0 } { wrap_y::return#0 = wrap_y::return#2 } }  render_sine:16::wrap_y:81 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#3 ] { { wrap_y::y#1 = wrap_y::y#9 } { wrap_y::return#1 = wrap_y::return#2 } }  ) always clobbers reg byte a 
 Statement [170] wrap_y::y#2 = wrap_y::y#4 - $c8 [ wrap_y::y#2 ] ( render_sine:16::wrap_y:72 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 wrap_y::y#2 ] { { wrap_y::y#0 = wrap_y::y#9 render_sine::sin_val#0 } { wrap_y::return#0 = wrap_y::return#2 } }  render_sine:16::wrap_y:81 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#2 ] { { wrap_y::y#1 = wrap_y::y#9 } { wrap_y::return#1 = wrap_y::return#2 } }  ) always clobbers reg byte a 
 Statement [172] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#2] w= bitmap_plot_ylo[bitmap_plot::y#2] [ bitmap_plot::x#2 bitmap_plot::plotter#0 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#0 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#0 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
-Statement [173] bitmap_plot::$0 = bitmap_plot::x#2 & $fff8 [ bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$0 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$0 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
-Statement [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 [ bitmap_plot::x#2 bitmap_plot::plotter#1 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
-Statement [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] [ ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a reg byte y 
+Statement [173] bitmap_plot::$1 = bitmap_plot::x#2 & $fff8 [ bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$1 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#0 bitmap_plot::$1 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
+Statement [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 [ bitmap_plot::x#2 bitmap_plot::plotter#1 ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 bitmap_plot::x#2 bitmap_plot::plotter#1 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::plotter#1 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a 
+Statement [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] [ ] ( render_sine:16::bitmap_plot:77 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::$11 ] { { bitmap_plot::y#0 = bitmap_plot::y#2 render_sine::ypos#0 } { bitmap_plot::x#0 = bitmap_plot::x#2 render_sine::xpos#3 } }  render_sine:16::bitmap_plot:86 [ render_sine::sin_idx#2 render_sine::xpos#3 ] { { bitmap_plot::y#1 = bitmap_plot::y#2 render_sine::ypos2#0 } { bitmap_plot::x#1 = bitmap_plot::x#2 render_sine::xpos#3 } }  ) always clobbers reg byte a reg byte y 
 Statement [184] divr16u::rem#1 = divr16u::rem#0 | 1 [ divr16u::dividend#3 divr16u::quotient#3 divr16u::i#2 divr16u::rem#1 ] ( sin16s_gen2:14::div32u16u:46::divr16u:102 [ divr16u::dividend#3 divr16u::quotient#3 divr16u::i#2 divr16u::rem#1 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  sin16s_gen2:14::div32u16u:46::divr16u:106 [ div32u16u::quotient_hi#0 divr16u::dividend#3 divr16u::quotient#3 divr16u::i#2 divr16u::rem#1 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
 Statement [188] if(divr16u::rem#6<SIN_SIZE) goto divr16u::@3 [ divr16u::i#2 divr16u::dividend#0 divr16u::rem#6 divr16u::quotient#1 ] ( sin16s_gen2:14::div32u16u:46::divr16u:102 [ divr16u::i#2 divr16u::dividend#0 divr16u::rem#6 divr16u::quotient#1 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  sin16s_gen2:14::div32u16u:46::divr16u:106 [ div32u16u::quotient_hi#0 divr16u::i#2 divr16u::dividend#0 divr16u::rem#6 divr16u::quotient#1 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
 Statement [190] divr16u::rem#2 = divr16u::rem#6 - SIN_SIZE [ divr16u::i#2 divr16u::dividend#0 divr16u::quotient#2 divr16u::rem#2 ] ( sin16s_gen2:14::div32u16u:46::divr16u:102 [ divr16u::i#2 divr16u::dividend#0 divr16u::quotient#2 divr16u::rem#2 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::return#0 = divr16u::return#2 } }  sin16s_gen2:14::div32u16u:46::divr16u:106 [ div32u16u::quotient_hi#0 divr16u::i#2 divr16u::dividend#0 divr16u::quotient#2 divr16u::rem#2 ] { { div32u16u::return#0 = div32u16u::return#1 } { divr16u::rem#10 = divr16u::rem#4 rem16u#14 } { divr16u::return#0 = divr16u::return#3 } }  ) always clobbers reg byte a 
@@ -3855,9 +3852,9 @@ Potential registers zp[2]:158 [ mul16s::$11 ] : zp[2]:158 ,
 Potential registers zp[4]:160 [ mul16s::return#1 ] : zp[4]:160 , 
 Potential registers zp[1]:164 [ wrap_y::return#2 ] : zp[1]:164 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:165 [ bitmap_plot::plotter#0 ] : zp[2]:165 , 
-Potential registers zp[2]:167 [ bitmap_plot::$0 ] : zp[2]:167 , 
+Potential registers zp[2]:167 [ bitmap_plot::$1 ] : zp[2]:167 , 
 Potential registers zp[2]:169 [ bitmap_plot::plotter#1 ] : zp[2]:169 , 
-Potential registers zp[1]:171 [ bitmap_plot::$1 ] : zp[1]:171 , reg byte a , reg byte x , reg byte y , 
+Potential registers zp[1]:171 [ bitmap_plot::$2 ] : zp[1]:171 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:172 [ divr16u::$1 ] : zp[1]:172 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[1]:173 [ divr16u::$2 ] : zp[1]:173 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp[2]:174 [ rem16u#14 ] : zp[2]:174 , 
@@ -3874,7 +3871,7 @@ Uplift Scope [divr16u] 90,147.42: zp[2]:42 [ divr16u::rem#5 divr16u::rem#10 divr
 Uplift Scope [mulu16_sel] 21,012: zp[2]:49 [ mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 ] 20,002: zp[4]:180 [ mulu16_sel::$0 ] 20,002: zp[4]:184 [ mulu16_sel::$1 ] 15,010.5: zp[2]:51 [ mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ] 2,143.71: zp[2]:188 [ mulu16_sel::return#12 ] 2,002: zp[2]:126 [ mulu16_sel::return#0 ] 2,002: zp[2]:130 [ mulu16_sel::return#1 ] 2,002: zp[2]:134 [ mulu16_sel::return#2 ] 2,002: zp[2]:140 [ mulu16_sel::return#10 ] 2,002: zp[2]:144 [ mulu16_sel::return#11 ] 1,666.83: zp[1]:53 [ mulu16_sel::select#5 ] 
 Uplift Scope [sin16s] 11,061.5: zp[4]:27 [ sin16s::x#6 sin16s::x#4 sin16s::x#0 sin16s::x#1 sin16s::x#2 ] 4,705: zp[2]:31 [ sin16s::return#1 sin16s::return#5 sin16s::sinx#1 ] 2,002: zp[4]:120 [ sin16s::$4 ] 2,002: zp[2]:128 [ sin16s::x2#0 ] 2,002: zp[2]:136 [ sin16s::x3_6#0 ] 2,002: zp[2]:142 [ sin16s::x4#0 ] 2,002: zp[2]:146 [ sin16s::x5#0 ] 2,002: zp[2]:148 [ sin16s::x5_128#0 ] 500.5: zp[2]:132 [ sin16s::x3#0 ] 500.5: zp[2]:150 [ sin16s::usinx#1 ] 318.5: zp[2]:124 [ sin16s::x1#0 ] 202: zp[2]:78 [ sin16s::return#0 ] 166.83: zp[2]:138 [ sin16s::usinx#0 ] 30.33: zp[1]:26 [ sin16s::isUpper#2 ] 
 Uplift Scope [mul16s] 5,005: zp[4]:33 [ mul16s::m#4 mul16s::m#1 mul16s::m#0 ] 2,002: zp[2]:156 [ mul16s::$6 ] 2,002: zp[2]:158 [ mul16s::$11 ] 367.33: zp[4]:160 [ mul16s::return#1 ] 220.4: zp[2]:80 [ mul16s::a#0 ] 202: zp[4]:82 [ mul16s::return#0 ] 
-Uplift Scope [bitmap_plot] 2,608: zp[1]:39 [ bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 ] 2,002: zp[2]:167 [ bitmap_plot::$0 ] 2,002: zp[1]:171 [ bitmap_plot::$1 ] 1,501.5: zp[2]:169 [ bitmap_plot::plotter#1 ] 753: zp[2]:40 [ bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 ] 500.5: zp[2]:165 [ bitmap_plot::plotter#0 ] 
+Uplift Scope [bitmap_plot] 2,608: zp[1]:39 [ bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 ] 2,002: zp[2]:167 [ bitmap_plot::$1 ] 2,002: zp[1]:171 [ bitmap_plot::$2 ] 1,501.5: zp[2]:169 [ bitmap_plot::plotter#1 ] 753: zp[2]:40 [ bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 ] 500.5: zp[2]:165 [ bitmap_plot::plotter#0 ] 
 Uplift Scope [memset] 3,572.33: zp[2]:24 [ memset::dst#2 memset::dst#4 memset::dst#1 ] 183.67: zp[2]:106 [ memset::end#0 ] 125.12: zp[1]:23 [ memset::c#4 ] 101: zp[2]:19 [ memset::num#2 ] 0: zp[2]:21 [ memset::str#3 ] 
 Uplift Scope [bitmap_init] 366.12: zp[2]:5 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] 319.83: zp[1]:2 [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] 202: zp[1]:3 [ bitmap_init::x#2 bitmap_init::x#1 ] 202: zp[1]:4 [ bitmap_init::y#2 bitmap_init::y#1 ] 202: zp[1]:67 [ bitmap_init::$4 ] 202: zp[1]:68 [ bitmap_init::$5 ] 202: zp[1]:69 [ bitmap_init::$6 ] 50.5: zp[1]:66 [ bitmap_init::$7 ] 
 Uplift Scope [render_sine] 221.24: zp[2]:17 [ render_sine::xpos#3 render_sine::xpos#9 render_sine::xpos#1 ] 218.16: zp[2]:15 [ render_sine::sin_idx#2 render_sine::sin_idx#1 ] 202: zp[2]:94 [ render_sine::$1 ] 202: zp[2]:96 [ render_sine::sin_val#0 ] 202: zp[2]:100 [ render_sine::$4 ] 202: zp[2]:102 [ render_sine::sin2_val#0 ] 101: zp[1]:99 [ render_sine::ypos#0 ] 101: zp[1]:105 [ render_sine::ypos2#0 ] 30.3: zp[2]:92 [ render_sine::$11 ] 
@@ -3893,7 +3890,7 @@ Uplifting [divr16u] best 30526 combination zp[2]:42 [ divr16u::rem#5 divr16u::re
 Uplifting [mulu16_sel] best 30508 combination zp[2]:49 [ mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 ] zp[4]:180 [ mulu16_sel::$0 ] zp[4]:184 [ mulu16_sel::$1 ] zp[2]:51 [ mulu16_sel::v2#5 mulu16_sel::v2#4 mulu16_sel::v2#0 mulu16_sel::v2#1 mulu16_sel::v2#3 ] zp[2]:188 [ mulu16_sel::return#12 ] zp[2]:126 [ mulu16_sel::return#0 ] zp[2]:130 [ mulu16_sel::return#1 ] zp[2]:134 [ mulu16_sel::return#2 ] zp[2]:140 [ mulu16_sel::return#10 ] zp[2]:144 [ mulu16_sel::return#11 ] reg byte x [ mulu16_sel::select#5 ] 
 Uplifting [sin16s] best 30501 combination zp[4]:27 [ sin16s::x#6 sin16s::x#4 sin16s::x#0 sin16s::x#1 sin16s::x#2 ] zp[2]:31 [ sin16s::return#1 sin16s::return#5 sin16s::sinx#1 ] zp[4]:120 [ sin16s::$4 ] zp[2]:128 [ sin16s::x2#0 ] zp[2]:136 [ sin16s::x3_6#0 ] zp[2]:142 [ sin16s::x4#0 ] zp[2]:146 [ sin16s::x5#0 ] zp[2]:148 [ sin16s::x5_128#0 ] zp[2]:132 [ sin16s::x3#0 ] zp[2]:150 [ sin16s::usinx#1 ] zp[2]:124 [ sin16s::x1#0 ] zp[2]:78 [ sin16s::return#0 ] zp[2]:138 [ sin16s::usinx#0 ] reg byte y [ sin16s::isUpper#2 ] 
 Uplifting [mul16s] best 30501 combination zp[4]:33 [ mul16s::m#4 mul16s::m#1 mul16s::m#0 ] zp[2]:156 [ mul16s::$6 ] zp[2]:158 [ mul16s::$11 ] zp[4]:160 [ mul16s::return#1 ] zp[2]:80 [ mul16s::a#0 ] zp[4]:82 [ mul16s::return#0 ] 
-Uplifting [bitmap_plot] best 30432 combination reg byte x [ bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 ] zp[2]:167 [ bitmap_plot::$0 ] reg byte x [ bitmap_plot::$1 ] zp[2]:169 [ bitmap_plot::plotter#1 ] zp[2]:40 [ bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 ] zp[2]:165 [ bitmap_plot::plotter#0 ] 
+Uplifting [bitmap_plot] best 30432 combination reg byte x [ bitmap_plot::y#2 bitmap_plot::y#0 bitmap_plot::y#1 ] zp[2]:167 [ bitmap_plot::$1 ] reg byte x [ bitmap_plot::$2 ] zp[2]:169 [ bitmap_plot::plotter#1 ] zp[2]:40 [ bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 ] zp[2]:165 [ bitmap_plot::plotter#0 ] 
 Uplifting [memset] best 30416 combination zp[2]:24 [ memset::dst#2 memset::dst#4 memset::dst#1 ] zp[2]:106 [ memset::end#0 ] reg byte x [ memset::c#4 ] zp[2]:19 [ memset::num#2 ] zp[2]:21 [ memset::str#3 ] 
 Uplifting [bitmap_init] best 29966 combination zp[2]:5 [ bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] reg byte a [ bitmap_init::bits#3 bitmap_init::bits#4 bitmap_init::bits#1 ] reg byte x [ bitmap_init::x#2 bitmap_init::x#1 ] reg byte x [ bitmap_init::y#2 bitmap_init::y#1 ] reg byte a [ bitmap_init::$4 ] zp[1]:68 [ bitmap_init::$5 ] zp[1]:69 [ bitmap_init::$6 ] zp[1]:66 [ bitmap_init::$7 ] 
 Limited combination testing to 100 combinations of 15360 possible.
@@ -3966,7 +3963,7 @@ Coalescing zero page register [ zp[2]:165 [ bitmap_plot::plotter#0 bitmap_plot::
 Coalescing zero page register [ zp[2]:19 [ memset::num#2 memset::end#0 render_sine::xpos#3 render_sine::xpos#9 render_sine::xpos#1 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 ] ] with [ zp[2]:7 [ sin16s_gen2::i#2 sin16s_gen2::i#1 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ] ]
 Coalescing zero page register [ zp[2]:42 [ divr16u::rem#5 divr16u::rem#10 divr16u::rem#4 divr16u::rem#11 divr16u::rem#6 divr16u::rem#0 divr16u::rem#1 divr16u::rem#2 rem16u#14 wrap_y::y#6 wrap_y::y#4 wrap_y::y#9 wrap_y::y#0 wrap_y::y#1 wrap_y::y#2 wrap_y::y#3 render_sine::sin_val#0 render_sine::sin2_val#0 render_sine::$1 ] ] with [ zp[2]:31 [ sin16s::return#1 sin16s::return#5 sin16s::sinx#1 sin16s::usinx#1 sin16s::return#0 mul16s::a#0 sin16s::usinx#0 memset::str#3 memset::dst#2 memset::dst#4 memset::dst#1 ] ]
 Coalescing zero page register [ zp[2]:156 [ mul16s::$6 mul16s::$11 sin16s::x1#0 ] ] with [ zp[2]:110 [ div32u16u::quotient_hi#0 render_sine::$11 render_sine::$4 ] ]
-Coalescing zero page register [ zp[2]:167 [ bitmap_plot::$0 ] ] with [ zp[2]:49 [ mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ] ]
+Coalescing zero page register [ zp[2]:167 [ bitmap_plot::$1 ] ] with [ zp[2]:49 [ mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ] ]
 Allocated (was zp[4]:9) zp[4]:2 [ sin16s_gen2::x#2 sin16s_gen2::x#1 ]
 Allocated (was zp[2]:15) zp[2]:6 [ render_sine::sin_idx#2 render_sine::sin_idx#1 sin16s_gen2::sintab#2 sin16s_gen2::sintab#0 ]
 Allocated (was zp[2]:19) zp[2]:8 [ memset::num#2 memset::end#0 render_sine::xpos#3 render_sine::xpos#9 render_sine::xpos#1 bitmap_plot::x#2 bitmap_plot::x#0 bitmap_plot::x#1 sin16s_gen2::i#2 sin16s_gen2::i#1 bitmap_init::yoffs#2 bitmap_init::yoffs#4 bitmap_init::yoffs#1 ]
@@ -3980,7 +3977,7 @@ Allocated (was zp[2]:90) zp[2]:27 [ sin16s_gen2::$8 mul16u::a#3 mul16u::a#6 mul1
 Allocated (was zp[4]:120) zp[4]:29 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 Allocated (was zp[2]:156) zp[2]:33 [ mul16s::$6 mul16s::$11 sin16s::x1#0 div32u16u::quotient_hi#0 render_sine::$11 render_sine::$4 ]
 Allocated (was zp[2]:165) zp[2]:35 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 ]
-Allocated (was zp[2]:167) zp[2]:37 [ bitmap_plot::$0 mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ]
+Allocated (was zp[2]:167) zp[2]:37 [ bitmap_plot::$1 mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ]
 
 ASSEMBLER BEFORE OPTIMIZATION
   // File Comments
@@ -5162,7 +5159,7 @@ wrap_y: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(8) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $25
+    .label __1 = $25
     .label plotter = $23
     .label x = 8
     // [172] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#2] w= bitmap_plot_ylo[bitmap_plot::y#2] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
@@ -5170,24 +5167,24 @@ bitmap_plot: {
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
-    // [173] bitmap_plot::$0 = bitmap_plot::x#2 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [173] bitmap_plot::$1 = bitmap_plot::x#2 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
-    // [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    sta.z __1+1
+    // [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
-    // [175] bitmap_plot::$1 = byte0  bitmap_plot::x#2 -- vbuxx=_byte0_vwuz1 
+    // [175] bitmap_plot::$2 = byte0  bitmap_plot::x#2 -- vbuxx=_byte0_vwuz1 
     ldx.z x
-    // [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y
@@ -5756,8 +5753,8 @@ byte* bitmap_init::yoffs#1 yoffs zp[2]:8 202.0
 byte* bitmap_init::yoffs#2 yoffs zp[2]:8 63.125
 byte* bitmap_init::yoffs#4 yoffs zp[2]:8 101.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:37 2002.0
-byte~ bitmap_plot::$1 reg byte x 2002.0
+word~ bitmap_plot::$1 zp[2]:37 2002.0
+byte~ bitmap_plot::$2 reg byte x 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:35 500.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:35 1501.5
@@ -6019,8 +6016,8 @@ zp[4]:29 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 zp[2]:33 [ mul16s::$6 mul16s::$11 sin16s::x1#0 div32u16u::quotient_hi#0 render_sine::$11 render_sine::$4 ]
 reg byte a [ wrap_y::return#2 ]
 zp[2]:35 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 ]
-zp[2]:37 [ bitmap_plot::$0 mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:37 [ bitmap_plot::$1 mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ]
+reg byte x [ bitmap_plot::$2 ]
 reg byte a [ divr16u::$1 ]
 reg byte a [ divr16u::$2 ]
 reg byte a [ mul16u::$1 ]
@@ -6715,7 +6712,7 @@ div32u16u: {
     // div32u16u::@2
     // unsigned int quotient_lo = divr16u(WORD0(dividend), divisor, rem16u)
     // [108] div32u16u::quotient_lo#0 = divr16u::return#3
-    // unsigned long quotient = { quotient_hi, quotient_lo}
+    // MAKEDWORD( quotient_hi, quotient_lo )
     // [109] div32u16u::return#1 = div32u16u::quotient_hi#0 dw= div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda.z quotient_hi
     sta.z return+2
@@ -7153,37 +7150,37 @@ wrap_y: {
 // Plot a single dot in the bitmap
 // bitmap_plot(word zp(8) x, byte register(X) y)
 bitmap_plot: {
-    .label __0 = $25
+    .label __1 = $25
     .label plotter = $23
     .label x = 8
-    // char* plotter = (char*) { bitmap_plot_yhi[y], bitmap_plot_ylo[y] }
+    // MAKEWORD( bitmap_plot_yhi[y], bitmap_plot_ylo[y] )
     // [172] bitmap_plot::plotter#0 = bitmap_plot_yhi[bitmap_plot::y#2] w= bitmap_plot_ylo[bitmap_plot::y#2] -- vwuz1=pbuc1_derefidx_vbuxx_word_pbuc2_derefidx_vbuxx 
     lda bitmap_plot_yhi,x
     sta.z plotter+1
     lda bitmap_plot_ylo,x
     sta.z plotter
     // x & $fff8
-    // [173] bitmap_plot::$0 = bitmap_plot::x#2 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
+    // [173] bitmap_plot::$1 = bitmap_plot::x#2 & $fff8 -- vwuz1=vwuz2_band_vwuc1 
     lda.z x
     and #<$fff8
-    sta.z __0
+    sta.z __1
     lda.z x+1
     and #>$fff8
-    sta.z __0+1
+    sta.z __1+1
     // plotter += ( x & $fff8 )
-    // [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$0 -- pbuz1=pbuz1_plus_vwuz2 
+    // [174] bitmap_plot::plotter#1 = (byte*)bitmap_plot::plotter#0 + bitmap_plot::$1 -- pbuz1=pbuz1_plus_vwuz2 
     clc
     lda.z plotter
-    adc.z __0
+    adc.z __1
     sta.z plotter
     lda.z plotter+1
-    adc.z __0+1
+    adc.z __1+1
     sta.z plotter+1
     // BYTE0(x)
-    // [175] bitmap_plot::$1 = byte0  bitmap_plot::x#2 -- vbuxx=_byte0_vwuz1 
+    // [175] bitmap_plot::$2 = byte0  bitmap_plot::x#2 -- vbuxx=_byte0_vwuz1 
     ldx.z x
     // *plotter |= bitmap_plot_bit[BYTE0(x)]
-    // [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$1] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
+    // [176] *bitmap_plot::plotter#1 = *bitmap_plot::plotter#1 | bitmap_plot_bit[bitmap_plot::$2] -- _deref_pbuz1=_deref_pbuz1_bor_pbuc1_derefidx_vbuxx 
     lda bitmap_plot_bit,x
     ldy #0
     ora (plotter),y

src/test/ref/examples/c64/sinplotter/sine-plotter.sym

@@ -49,8 +49,8 @@ byte* bitmap_init::yoffs#1 yoffs zp[2]:8 202.0
 byte* bitmap_init::yoffs#2 yoffs zp[2]:8 63.125
 byte* bitmap_init::yoffs#4 yoffs zp[2]:8 101.0
 void bitmap_plot(word bitmap_plot::x , byte bitmap_plot::y)
-word~ bitmap_plot::$0 zp[2]:37 2002.0
-byte~ bitmap_plot::$1 reg byte x 2002.0
+word~ bitmap_plot::$1 zp[2]:37 2002.0
+byte~ bitmap_plot::$2 reg byte x 2002.0
 byte* bitmap_plot::plotter
 word bitmap_plot::plotter#0 plotter zp[2]:35 500.5
 byte* bitmap_plot::plotter#1 plotter zp[2]:35 1501.5
@@ -312,8 +312,8 @@ zp[4]:29 [ sin16s::$4 mul16u::mb#2 mul16u::mb#0 mul16u::mb#1 ]
 zp[2]:33 [ mul16s::$6 mul16s::$11 sin16s::x1#0 div32u16u::quotient_hi#0 render_sine::$11 render_sine::$4 ]
 reg byte a [ wrap_y::return#2 ]
 zp[2]:35 [ bitmap_plot::plotter#0 bitmap_plot::plotter#1 mulu16_sel::return#0 mulu16_sel::return#12 mulu16_sel::return#2 sin16s::x3_6#0 mulu16_sel::return#11 sin16s::x5#0 sin16s::x5_128#0 ]
-zp[2]:37 [ bitmap_plot::$0 mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ]
-reg byte x [ bitmap_plot::$1 ]
+zp[2]:37 [ bitmap_plot::$1 mulu16_sel::v1#5 mulu16_sel::v1#4 mulu16_sel::v1#0 mulu16_sel::v1#1 mulu16_sel::v1#2 mulu16_sel::v1#3 sin16s::x3#0 sin16s::x2#0 sin16s::x4#0 mulu16_sel::return#1 mulu16_sel::return#10 divr16u::dividend#3 divr16u::dividend#5 divr16u::dividend#0 ]
+reg byte x [ bitmap_plot::$2 ]
 reg byte a [ divr16u::$1 ]
 reg byte a [ divr16u::$2 ]
 reg byte a [ mul16u::$1 ]

src/test/ref/examples/c64/sinsprites/sinus-sprites.asm

@@ -787,7 +787,7 @@ getFAC: {
     jsr $b1aa
     sty memLo
     sta memHi
-    // unsigned int w = { *memHi, *memLo }
+    // MAKEWORD( *memHi, *memLo )
     sta.z return+1
     tya
     sta.z return

src/test/ref/examples/c64/sinsprites/sinus-sprites.log

@@ -34,7 +34,8 @@ setFAC::@return: scope:[setFAC]  from setFAC::@1
 word getFAC()
 getFAC: scope:[getFAC]  from gen_sintab::@21
   asm { jsr$b1aa stymemLo stamemHi  }
-  getFAC::w#0 = (word){ *memHi, *memLo }
+  getFAC::$0 = *memHi w= *memLo
+  getFAC::w#0 = getFAC::$0
   getFAC::return#0 = getFAC::w#0
   to:getFAC::@return
 getFAC::@return: scope:[getFAC]  from getFAC
@@ -1239,6 +1240,7 @@ byte* gen_sprites::spr#1
 byte* gen_sprites::spr#2
 byte* gen_sprites::spr#3
 word getFAC()
+word~ getFAC::$0
 word getFAC::return
 word getFAC::return#0
 word getFAC::return#1
@@ -1532,8 +1534,6 @@ constant const byte* sintab_y[$c5]  = { fill( $c5, 0) }
 constant byte* const sprites = (byte*)$2000
 void subFACfromARG()
 
-Fixing inline constructor with getFAC::$0 = (byte)*memHi w= (byte)*memLo
-Successful SSA optimization Pass2FixInlineConstructors
 Adding number conversion cast (unumber) $3f8 in 
 Adding number conversion cast (unumber) $ff in main::$1 = *((byte*)VICII+OFFSET_STRUCT_MOS6569_VICII_RASTER) != $ff
 Adding number conversion cast (unumber) 0 in COLS[init::i#2] = 0
@@ -1627,8 +1627,6 @@ Simplifying constant pointer cast (byte*) 8192
 Simplifying constant pointer cast (byte*) 1024
 Simplifying constant integer cast $3f8
 Simplifying constant pointer cast (byte*) 58085
-Simplifying constant integer cast *memHi
-Simplifying constant integer cast *memLo
 Simplifying constant integer cast $ff
 Simplifying constant integer cast 0
 Simplifying constant integer cast $28
@@ -6834,7 +6832,7 @@ getFAC: {
     jsr $b1aa
     sty memLo
     sta memHi
-    // unsigned int w = { *memHi, *memLo }
+    // MAKEWORD( *memHi, *memLo )
     // [217] getFAC::return#0 = *memHi w= *memLo -- vwuz1=_deref_pbuc1_word__deref_pbuc2 
     sta.z return+1
     tya