Next part of fragment renaming completed (coby1/cosby1/cowo1/coswo1 => vbuc1/vbsc1/vwuc1/vwsc1)

src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java

@@ -97,10 +97,12 @@ public class AsmFragmentManager {
       mapZpptrby.put("zpptrby2", "zpptrby1");
       mapZpptrby.put("zpptrby3", "zpptrby2");
       Map<String, String> mapConst = new LinkedHashMap<>();
-      mapConst.put("cowo2", "cowo1");
-      mapConst.put("cowo3", "cowo2");
-      mapConst.put("coby2", "coby1");
-      mapConst.put("coby3", "coby2");
+      mapConst.put("vwuc2", "vwuc1");
+      mapConst.put("vwuc3", "vwuc2");
+      mapConst.put("vbuc2", "vbuc1");
+      mapConst.put("vbuc3", "vbuc2");
+      mapConst.put("c2", "c1");
+      mapConst.put("c3", "c2");
       Map<String, String> mapZpptrToWord = new LinkedHashMap<>();
       mapZpptrToWord.put("zpptrby1", "zpwo1");
       mapZpptrToWord.put("zpptrby2", "zpwo2");
@@ -116,9 +118,9 @@ public class AsmFragmentManager {
       mapSbyToBy.put("vbsz1", "vbuz1");
       mapSbyToBy.put("vbsz2", "vbuz2");
       mapSbyToBy.put("vbsz3", "vbuz3");
-      mapSbyToBy.put("cosby1", "coby1");
-      mapSbyToBy.put("cosby2", "coby2");
-      mapSbyToBy.put("cosby3", "coby3");
+      mapSbyToBy.put("vbsc1", "vbuc1");
+      mapSbyToBy.put("vbsc2", "vbuc2");
+      mapSbyToBy.put("vbsc3", "vbuc3");
       mapSbyToBy.put("vbsaa", "vbuaa");
       mapSbyToBy.put("vbsxx", "vbuxx");
       mapSbyToBy.put("vbsyy", "vbuyy");
@@ -135,15 +137,15 @@ public class AsmFragmentManager {
       synths.add(new FragmentSynthesis("vbsyy=(.*)", null, null, "vbsaa=$1", "tay\n", null));
       synths.add(new FragmentSynthesis("vbuz1=(.*)", ".*=.*vb.z1.*", null, "vbuaa=$1", "sta {vbuz1}\n", mapZ));
       synths.add(new FragmentSynthesis("vbsz1=(.*)", ".*=.*vb.z1.*", null, "vbsaa=$1", "sta {vbsz1}\n", mapZ));
-      synths.add(new FragmentSynthesis("_deref_cowo1=(.*)", null, null, "vbuaa=$1", "sta {cowo1}\n", mapConst));
+      synths.add(new FragmentSynthesis("_deref_vwuc1=(.*)", null, null, "vbuaa=$1", "sta {c1}\n", mapConst));
       synths.add(new FragmentSynthesis("_deref_zpptrby1=(.*)", ".*=.*zpptrby1.*", null, "vbuaa=$1", "ldy #0\n" + "sta ({zpptrby1}),y\n", mapZpptrby));
-      synths.add(new FragmentSynthesis("cowo1_derefidx_vbuz1=(.*)", null, null, "vbuaa=$1", "ldx {vbuz1}\n"+"sta {cowo1},x\n", mapZ));
+      synths.add(new FragmentSynthesis("vwuc1_derefidx_vbuz1=(.*)", null, null, "vbuaa=$1", "ldx {vbuz1}\n"+"sta {c1},x\n", mapZ));
 
       synths.add(new FragmentSynthesis("(.*)=vbuxx(.*)", ".*=.*vb.aa.*", "txa\n", "$1=vbuaa$2", null, null));
       synths.add(new FragmentSynthesis("(.*)=vbuyy(.*)", ".*=.*vb.aa.*", "tya\n", "$1=vbuaa$2", null, null));
       synths.add(new FragmentSynthesis("(.*)=vbuz1(.*)", ".*=.*vb.aa.*|vbuz1=.*", "lda {vbuz1}\n", "$1=vbuaa$2", null, mapZ));
       synths.add(new FragmentSynthesis("(.*)=vbsz1(.*)", ".*=.*vb.aa.*|vbsz1=.*", "lda {vbsz1}\n", "$1=vbuaa$2", null, mapZ));
-      synths.add(new FragmentSynthesis("(.*)=_deref_cowo1(.*)", ".*=.*vb.aa.*", "lda {cowo1}\n", "$1=vbuaa$2", null, mapConst));
+      synths.add(new FragmentSynthesis("(.*)=_deref_vwuc1(.*)", ".*=.*vb.aa.*", "lda {c1}\n", "$1=vbuaa$2", null, mapConst));
       synths.add(new FragmentSynthesis("(.*)=_deref_zpptrby1(.*)", ".*=.*vb.aa.*|.*=.*vb.yy.*", "ldy #0\n" + "lda ({zpptrby1}),y\n", "$1=vbuaa$2", null, mapZpptrby));
 
       synths.add(new FragmentSynthesis("(.*)=(.*)_vbuxx", ".*=vb.[ax][ax].*vb.xx|.*derefidx_vb.xx", "txa\n", "$1=$2_vbuaa", null, null));
@@ -163,7 +165,7 @@ public class AsmFragmentManager {
 
       synths.add(new FragmentSynthesis("vbuz1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*", "lda {vbuz1}\n", "vbuaa_$1_$2", null, mapZ));
       synths.add(new FragmentSynthesis("vbsz1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*", "lda {vbsz1}\n", "vbsaa_$1_$2", null, mapZ));
-      synths.add(new FragmentSynthesis("_deref_cowo1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*", "lda {cowo1}\n", "vbuaa_$1_$2", null, mapConst));
+      synths.add(new FragmentSynthesis("_deref_vwuc1_(lt|gt|le|ge|eq|neq)_(.*)", ".*vb.aa.*", "lda {c1}\n", "vbuaa_$1_$2", null, mapConst));
       synths.add(new FragmentSynthesis("_deref_zpptrby1_(lt|gt|le|ge|eq|neq)_(.*)", ".*=.*vb.aa.*|.*=.*vb.yy.*", "ldy #0\n" + "lda ({zpptrby1}),y\n", "vbuaa_$1_$2", null, mapZpptrby));
       synths.add(new FragmentSynthesis("(.*)_ge_(vb.aa)_then_(.*)", ".*vb.aa.*_ge.*", null, "$2_lt_$1_then_$3", null, null));
       synths.add(new FragmentSynthesis("(.*)_ge_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_ge.*", null, "$2_lt_$1_then_$3", null, null));
@@ -184,14 +186,14 @@ public class AsmFragmentManager {
       synths.add(new FragmentSynthesis("(.*)_eq_(vb.xx)_then_(.*)", ".*vb.[ax][ax].*_eq.*", null, "$2_eq_$1_then_$3", null, null));
       synths.add(new FragmentSynthesis("(.*)_eq_(vb.yy)_then_(.*)", ".*vb.[axy][axy].*_eq.*", null, "$2_eq_$1_then_$3", null, null));
 
-      synths.add(new FragmentSynthesis("zpptrby1=(coby.|cowo.)_(sethi|setlo|plus|minus)_(.*)", ".*zpwo.*|.*=zpptr.*", null, "zpwo1=$1_$2_$3", null, mapZpptrToWord));
+      synths.add(new FragmentSynthesis("zpptrby1=(vbuc.|vwuc.)_(sethi|setlo|plus|minus)_(.*)", ".*zpwo.*|.*=zpptr.*", null, "zpwo1=$1_$2_$3", null, mapZpptrToWord));
       synths.add(new FragmentSynthesis("zpptrby1=zpptrby([12])_(sethi|setlo|plus|minus)_(.*)", ".*zpwo.*", null, "zpwo1=zpwo$1_$2_$3", null, mapZpptrToWord));
       synths.add(new FragmentSynthesis("zpptrby1=zpptrby1_(sethi|setlo|plus|minus)_zpwo1", null, null, "zpptrby1=zpptrby1_$1_zpwo1", null, mapZpptrToWord2));
       synths.add(new FragmentSynthesis("zpptrby1=zpptrby2_(sethi|setlo|plus|minus)_zpwo1", null, null, "zpptrby1=zpptrby2_$1_zpwo1", null, mapZpptrToWord3));
 
       synths.add(new FragmentSynthesis("(vbsz.|vbsaa|vbsxx|vbsyy)_(eq|neq)_(vbsz.|csoby.|vbsaa|vbsxx|vbsyy)_then_(.*)", null, null, "$1_$2_$3_then_$4", null, mapSbyToBy));
-      synths.add(new FragmentSynthesis("(vbsz.|vbsaa|vbsxx|vbsyy)=(vbsz.|cosby.|vbsaa|vbsxx|vbsyy)", null, null, "$1=$2", null, mapSbyToBy));
-      synths.add(new FragmentSynthesis("(vbsz.|vbsaa|vbsxx|vbsyy)=(vbsz.|csoby.|vbsaa|vbsxx|vbsyy)_(plus|band|bxor|bor)_(vbsz.|csoby.|vbsaa|vbsxx|vbsyy)", null, null, "$1=$2_$3_$4", null, mapSbyToBy));
+      synths.add(new FragmentSynthesis("(vbsz.|vbsaa|vbsxx|vbsyy)=(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)", null, null, "$1=$2", null, mapSbyToBy));
+      synths.add(new FragmentSynthesis("(vbsz.|vbsaa|vbsxx|vbsyy)=(vbsz.|vbsc.|vbsaa|vbsxx|vbsyy)_(plus|band|bxor|bor)_(vbsz.|csoby.|vbsaa|vbsxx|vbsyy)", null, null, "$1=$2_$3_$4", null, mapSbyToBy));
       synths.add(new FragmentSynthesis("(vbsz.|vbsaa|vbsxx|vbsyy)=_(inc|dec)_(vbsz.|csoby.|vbsaa|vbsxx|vbsyy)", null, null, "$1=_$2_$3", null, mapSbyToBy));
 
       for (FragmentSynthesis synth : synths) {

src/main/java/dk/camelot64/kickc/fragment/AsmFragmentSignature.java

@@ -300,23 +300,23 @@ public class AsmFragmentSignature {
             constType = SymbolTypeInference.inferType(program.getScope(), (ConstantValue) value);
          }
          if (SymbolType.isByte(constType)) {
-            String name = "coby" + nextConstByteIdx++;
+            String name = "vbuc" + nextConstByteIdx++;
             bindings.put(name, value);
             return name;
          } else if (SymbolType.isSByte(constType)) {
-            String name = "cosby" + nextConstByteIdx++;
+            String name = "vbsc" + nextConstByteIdx++;
             bindings.put(name, value);
             return name;
          } else if (SymbolType.isWord(constType)) {
-            String name = "cowo" + nextConstByteIdx++;
+            String name = "vwuc" + nextConstByteIdx++;
             bindings.put(name, value);
             return name;
          } else if (SymbolType.isSWord(constType)) {
-            String name = "coswo" + nextConstByteIdx++;
+            String name = "vwsc" + nextConstByteIdx++;
             bindings.put(name, value);
             return name;
          } else if (constType instanceof SymbolTypePointer && SymbolType.BYTE.equals(((SymbolTypePointer) constType).getElementType())) {
-            String name = "cowo" + nextConstByteIdx++;
+            String name = "vwuc" + nextConstByteIdx++;
             bindings.put(name, value);
             return name;
          } else {

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_cowo1=_dec__deref_cowo1.asm

@@ -1 +0,0 @@
-dec {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_cowo1=_inc__deref_cowo1.asm

@@ -1 +0,0 @@
-inc {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_cowo1=coby2.asm

@@ -1,2 +0,0 @@
-lda #{coby2}
-sta {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_cowo1=vbuaa.asm

@@ -1 +0,0 @@
-sta {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_cowo1=vbuxx.asm

@@ -1 +0,0 @@
-stx {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_cowo1=vbuyy.asm

@@ -1 +0,0 @@
-sty {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_cowo1=vbuz1.asm

@@ -1,2 +0,0 @@
-lda {z1}
-sta {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_vwuc1=_dec__deref_vwuc1.asm

@@ -0,0 +1 @@
+dec {c1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_vwuc1=_inc__deref_vwuc1.asm

@@ -0,0 +1 @@
+inc {c1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_vwuc1=vbuaa.asm

@@ -0,0 +1 @@
+sta {c1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_vwuc1=vbuc2.asm

@@ -0,0 +1,2 @@
+lda #{c2}
+sta {c1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_vwuc1=vbuxx.asm

@@ -0,0 +1 @@
+stx {c1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_vwuc1=vbuyy.asm

@@ -0,0 +1 @@
+sty {c1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_vwuc1=vbuz1.asm

@@ -0,0 +1,2 @@
+lda {z1}
+sta {c1}

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_zpptrby1=coby1.asm

@@ -1,3 +0,0 @@
-ldy #0
-lda #{coby1}
-sta ({zpptrby1}),y

src/main/java/dk/camelot64/kickc/fragment/asm/_deref_zpptrby1=vbuc1.asm

@@ -0,0 +1,3 @@
+ldy #0
+lda #{c1}
+sta ({zpptrby1}),y

src/main/java/dk/camelot64/kickc/fragment/asm/coby1_ge_coby2_then_la1.asm

@@ -1,3 +0,0 @@
-lda #{coby1}
-cmp #{coby2}
-bcs {la1}

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_coby2=coby3.asm

@@ -1,2 +0,0 @@
-lda #{coby3}
-sta {cowo1}+{coby2}

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuaa=coby2.asm

@@ -1,3 +0,0 @@
-tax
-lda #{coby2}
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuaa=vbuaa.asm

@@ -1,2 +0,0 @@
-tax
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuaa=vbuxx.asm

@@ -1,3 +0,0 @@
-tay
-txa
-sta {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuaa=vbuyy.asm

@@ -1,3 +0,0 @@
-tax
-tya
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuaa=vbuz1.asm

@@ -1,3 +0,0 @@
-tax
-lda {z1}
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuxx=coby2.asm

@@ -1,2 +0,0 @@
-lda #{coby2}
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuxx=vbuaa.asm

@@ -1 +0,0 @@
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuxx=vbuxx.asm

@@ -1,2 +0,0 @@
-txa
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuxx=vbuyy.asm

@@ -1,2 +0,0 @@
-tya
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuxx=vbuz1.asm

@@ -1,2 +0,0 @@
-lda {z1}
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuyy=coby2.asm

@@ -1,2 +0,0 @@
-lda #{coby2}
-sta {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuyy=vbuaa.asm

@@ -1 +0,0 @@
-sta {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuyy=vbuxx.asm

@@ -1,2 +0,0 @@
-txa
-sta {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuyy=vbuyy.asm

@@ -1,2 +0,0 @@
-tya
-sta {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuyy=vbuz1.asm

@@ -1,2 +0,0 @@
-lda {z1}
-sta {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuz1=coby2.asm

@@ -1,3 +0,0 @@
-lda #{coby2}
-ldx {z1}
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuz1=vbsaa.asm

@@ -1,2 +0,0 @@
-ldx {z1}
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuz1=vbuaa.asm

@@ -1,2 +0,0 @@
-ldx {z1}
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuz1=vbuxx.asm

@@ -1,3 +0,0 @@
-txa
-ldx {z1}
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuz1=vbuyy.asm

@@ -1,3 +0,0 @@
-tya
-ldy {z1}
-sta {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_vbuz1=vbuz1.asm

@@ -1,3 +0,0 @@
-ldx {z1}
-txa
-sta {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/cowo1_derefidx_zpwo1=coby2.asm

@@ -1,9 +0,0 @@
-lda #<{cowo1}
-clc
-adc {zpwo1}
-sta !+ +1
-lda #>{cowo1}
-adc {zpwo1}+1
-sta !+ +2
-lda #{coby2}
-!: sta {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbsaa=coby1.asm

@@ -1 +0,0 @@
-lda #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbsaa=vbuc1.asm

@@ -0,0 +1 @@
+lda #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbsaa_lt_vbuc1_then_la1.asm

@@ -1,6 +1,6 @@
 sec
-sbc #{coby1}
+sbc #{c1}
 bvc !+
 eor #$80
 !:
-bmi {la1}
+bmi {la1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=_deref_cowo1.asm

@@ -1 +0,0 @@
-lda {cowo1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=_deref_vwuc1.asm

@@ -0,0 +1 @@
+lda {c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=coby1.asm

@@ -1 +0,0 @@
-lda #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=coby1_minus_vbuaa.asm

@@ -1,3 +0,0 @@
-eor #$ff
-clc
-adc #{coby1}+1

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=coby1_minus_vbuxx.asm

@@ -1,4 +0,0 @@
-stx $ff
-lda #{coby1}
-sec
-sbc $ff

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=coby1_minus_vbuyy.asm

@@ -1,4 +0,0 @@
-sty $ff
-lda #{coby1}
-sec
-sbc $ff

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=coby1_mul_coby2.asm

@@ -1 +0,0 @@
-lda {coby1}*{coby2}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=cowo1_derefidx_vbuaa.asm

@@ -1,2 +0,0 @@
-tax
-lda {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=cowo1_derefidx_vbuxx.asm

@@ -1 +0,0 @@
-lda {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=cowo1_derefidx_vbuyy.asm

@@ -1 +0,0 @@
-lda {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=cowo1_derefidx_vbuz1.asm

@@ -1,2 +0,0 @@
-ldx {z1}
-lda {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_band_coby1.asm

@@ -1 +0,0 @@
-and #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_band_vbuc1.asm

@@ -0,0 +1 @@
+and #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_coby1.asm

@@ -1 +0,0 @@
-ora #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_cowo1_derefidx_vbuxx.asm

@@ -1 +0,0 @@
-ora {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_cowo1_derefidx_vbuyy.asm

@@ -1 +0,0 @@
-ora {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_vbuc1.asm

@@ -0,0 +1 @@
+ora #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_vwuc1_derefidx_vbuxx.asm

@@ -0,0 +1 @@
+ora {c1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bor_vwuc1_derefidx_vbuyy.asm

@@ -0,0 +1 @@
+ora {c1},y

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bxor_coby1.asm

@@ -1 +0,0 @@
-eor #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_bxor_vbuc1.asm

@@ -0,0 +1 @@
+eor #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_minus_coby1.asm

@@ -1,2 +0,0 @@
-sec
-sbc #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_minus_vbuc1.asm

@@ -0,0 +1,2 @@
+sec
+sbc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_plus_coby1.asm

@@ -1,2 +0,0 @@
-clc
-adc #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_plus_cowo1_derefidx_vbuxx.asm

@@ -1,2 +0,0 @@
-clc
-adc {cowo1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_plus_cowo1_derefidx_vbuyy.asm

@@ -1,2 +0,0 @@
-clc
-adc {cowo1},y

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_plus_vbuc1.asm

@@ -0,0 +1,2 @@
+clc
+adc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_plus_vwuc1_derefidx_vbuxx.asm

@@ -0,0 +1,2 @@
+clc
+adc {c1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuaa_plus_vwuc1_derefidx_vbuyy.asm

@@ -0,0 +1,2 @@
+clc
+adc {c1},y

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuc1.asm

@@ -0,0 +1 @@
+lda #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuc1_minus_vbuaa.asm

@@ -0,0 +1,3 @@
+eor #$ff
+clc
+adc #{c1}+1

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuc1_minus_vbuxx.asm

@@ -0,0 +1,4 @@
+stx $ff
+lda #{c1}
+sec
+sbc $ff

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuc1_minus_vbuyy.asm

@@ -0,0 +1,4 @@
+sty $ff
+lda #{c1}
+sec
+sbc $ff

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuc1_mul_vbuc2.asm

@@ -0,0 +1 @@
+lda {c1}*{c2}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuc1_plus_vbuz1.asm

@@ -1,3 +1,3 @@
 lda {z1}
 clc
-adc #{coby1}
+adc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuxx_minus_coby1.asm

@@ -1,3 +0,0 @@
-txa
-sec
-sbc #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuxx_minus_vbuc1.asm

@@ -0,0 +1,3 @@
+txa
+sec
+sbc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuxx_plus_coby1.asm

@@ -1,3 +0,0 @@
-txa
-clc
-adc #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuxx_plus_vbuc1.asm

@@ -0,0 +1,3 @@
+txa
+clc
+adc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuyy_minus_coby1.asm

@@ -1,3 +0,0 @@
-tya
-sec
-sbc #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuyy_minus_vbuc1.asm

@@ -0,0 +1,3 @@
+tya
+sec
+sbc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuyy_plus_coby1.asm

@@ -1,3 +0,0 @@
-tya
-clc
-adc #{coby1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuyy_plus_vbuc1.asm

@@ -0,0 +1,3 @@
+tya
+clc
+adc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuz1_bor_vwuc1_derefidx_vbuz2.asm

@@ -1,3 +1,3 @@
 lda {z1}
 ldx {z2}
-ora {cowo1},x
+ora {c1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuz1_minus_vbuc1.asm

@@ -1,3 +1,3 @@
 lda {z1}
 sec
-sbc #{coby1}
+sbc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vbuz1_plus_vbuc1.asm

@@ -1,3 +1,3 @@
 lda {z1}
 clc
-adc #{coby1}
+adc #{c1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vwuc1_derefidx_vbuaa.asm

@@ -0,0 +1,2 @@
+tax
+lda {c1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vwuc1_derefidx_vbuxx.asm

@@ -0,0 +1 @@
+lda {c1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vwuc1_derefidx_vbuyy.asm

@@ -0,0 +1 @@
+lda {c1},y

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=vwuc1_derefidx_vbuz1.asm

@@ -0,0 +1,2 @@
+ldx {z1}
+lda {c1},x

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=zpptrby1_derefidx_coby1.asm

@@ -1,2 +0,0 @@
-ldy #{coby1}
-lda ({zpptrby1}),y

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=zpptrby1_derefidx_vbuc1.asm

@@ -0,0 +1,2 @@
+ldy #{c1}
+lda ({zpptrby1}),y

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa_eq_coby1_then_la1.asm

@@ -1,2 +0,0 @@
-cmp #{coby1}
-beq {la1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa_eq_vbuc1_then_la1.asm

@@ -0,0 +1,2 @@
+cmp #{c1}
+beq {la1}

src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa_ge_coby1_then_la1.asm

@@ -1,2 +0,0 @@
-cmp #{coby1}
-bcs {la1}