diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml
index 0e2cdc822..cd4a6ad1d 100644
--- a/src/main/assembly/assembly.xml
+++ b/src/main/assembly/assembly.xml
@@ -23,6 +23,7 @@
fragment
*.asm
+ */*.asm
diff --git a/src/main/fragment/6502X/_deref_pbuc1=vbuaa_band_vbuxx.asm b/src/main/fragment/MOS6502X/_deref_pbuc1=vbuaa_band_vbuxx.asm
similarity index 100%
rename from src/main/fragment/6502X/_deref_pbuc1=vbuaa_band_vbuxx.asm
rename to src/main/fragment/MOS6502X/_deref_pbuc1=vbuaa_band_vbuxx.asm
diff --git a/src/main/fragment/6502X/vbuxx=vbuaa_minus_vbuc1.asm b/src/main/fragment/MOS6502X/vbuxx=vbuaa_minus_vbuc1.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuxx=vbuaa_minus_vbuc1.asm
rename to src/main/fragment/MOS6502X/vbuxx=vbuaa_minus_vbuc1.asm
diff --git a/src/main/fragment/6502X/vbuxx=vbuaa_plus_vbuc1.asm b/src/main/fragment/MOS6502X/vbuxx=vbuaa_plus_vbuc1.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuxx=vbuaa_plus_vbuc1.asm
rename to src/main/fragment/MOS6502X/vbuxx=vbuaa_plus_vbuc1.asm
diff --git a/src/main/fragment/6502X/vbuxx=vbuc1_minus_vbuaa.asm b/src/main/fragment/MOS6502X/vbuxx=vbuc1_minus_vbuaa.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuxx=vbuc1_minus_vbuaa.asm
rename to src/main/fragment/MOS6502X/vbuxx=vbuc1_minus_vbuaa.asm
diff --git a/src/main/fragment/6502X/vbuxx=vbuxx_band_vbuaa.asm b/src/main/fragment/MOS6502X/vbuxx=vbuxx_band_vbuaa.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuxx=vbuxx_band_vbuaa.asm
rename to src/main/fragment/MOS6502X/vbuxx=vbuxx_band_vbuaa.asm
diff --git a/src/main/fragment/6502X/vbuxx=vbuxx_minus_vbuc1.asm b/src/main/fragment/MOS6502X/vbuxx=vbuxx_minus_vbuc1.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuxx=vbuxx_minus_vbuc1.asm
rename to src/main/fragment/MOS6502X/vbuxx=vbuxx_minus_vbuc1.asm
diff --git a/src/main/fragment/6502X/vbuxx=vbuxx_plus_vbuc1.asm b/src/main/fragment/MOS6502X/vbuxx=vbuxx_plus_vbuc1.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuxx=vbuxx_plus_vbuc1.asm
rename to src/main/fragment/MOS6502X/vbuxx=vbuxx_plus_vbuc1.asm
diff --git a/src/main/fragment/6502X/vbuxx=vbuz1_minus_vbuc1.asm b/src/main/fragment/MOS6502X/vbuxx=vbuz1_minus_vbuc1.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuxx=vbuz1_minus_vbuc1.asm
rename to src/main/fragment/MOS6502X/vbuxx=vbuz1_minus_vbuc1.asm
diff --git a/src/main/fragment/6502X/vbuxx=vbuz1_plus_vbuc1.asm b/src/main/fragment/MOS6502X/vbuxx=vbuz1_plus_vbuc1.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuxx=vbuz1_plus_vbuc1.asm
rename to src/main/fragment/MOS6502X/vbuxx=vbuz1_plus_vbuc1.asm
diff --git a/src/main/fragment/6502X/vbuz1=vbuaa_band_vbuxx.asm b/src/main/fragment/MOS6502X/vbuz1=vbuaa_band_vbuxx.asm
similarity index 100%
rename from src/main/fragment/6502X/vbuz1=vbuaa_band_vbuxx.asm
rename to src/main/fragment/MOS6502X/vbuz1=vbuaa_band_vbuxx.asm
diff --git a/src/main/fragment/unused/pbuc1_derefidx_vbuc2=vbuc3.asm b/src/main/fragment/unused/pbuc1_derefidx_vbuc2=vbuc3.asm
deleted file mode 100644
index c23a91f06..000000000
--- a/src/main/fragment/unused/pbuc1_derefidx_vbuc2=vbuc3.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-lda #{c3}
-sta {c1}+{c2}
diff --git a/src/main/fragment/unused/pbuz1=pbuz1_minus_vbuc1.asm b/src/main/fragment/unused/pbuz1=pbuz1_minus_vbuc1.asm
deleted file mode 100644
index ee167317a..000000000
--- a/src/main/fragment/unused/pbuz1=pbuz1_minus_vbuc1.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda {z1}
-sec
-sbc #{c1}
-sta {z1}
-bcs !+
-dec {z1}+1
-!:
diff --git a/src/main/fragment/unused/pbuz1=pbuz1_plus_pbuz1.asm b/src/main/fragment/unused/pbuz1=pbuz1_plus_pbuz1.asm
deleted file mode 100644
index c835c9c15..000000000
--- a/src/main/fragment/unused/pbuz1=pbuz1_plus_pbuz1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-lda {z1}
-asl
-sta {z1}
-lda {z1}+1
-rol
-sta {z1}+1
diff --git a/src/main/fragment/unused/pbuz1=pbuz1_plus_pbuz2.asm b/src/main/fragment/unused/pbuz1=pbuz1_plus_pbuz2.asm
deleted file mode 100644
index ab17205b1..000000000
--- a/src/main/fragment/unused/pbuz1=pbuz1_plus_pbuz2.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1
diff --git a/src/main/fragment/unused/pbuz1=pbuz2_plus_pbuz3.asm b/src/main/fragment/unused/pbuz1=pbuz2_plus_pbuz3.asm
deleted file mode 100644
index c505ed8b2..000000000
--- a/src/main/fragment/unused/pbuz1=pbuz2_plus_pbuz3.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda {z2}
-clc
-adc {z3}
-sta {z1}
-lda {z2}+1
-adc {z3}+1
-sta {z1}+1
diff --git a/src/main/fragment/unused/pbuz1=pbuz2_plus_vbuz3.asm b/src/main/fragment/unused/pbuz1=pbuz2_plus_vbuz3.asm
deleted file mode 100644
index f28ca29e8..000000000
--- a/src/main/fragment/unused/pbuz1=pbuz2_plus_vbuz3.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda {z2}
-clc
-adc {z3}
-sta {z1}
-lda #0
-adc {z2}+1
-sta {z1}+1
diff --git a/src/main/fragment/unused/pbuz1=vbuc1.asm b/src/main/fragment/unused/pbuz1=vbuc1.asm
deleted file mode 100644
index 92e586bdd..000000000
--- a/src/main/fragment/unused/pbuz1=vbuc1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda #{c1}
-sta {z1}
-lda #0
-sta {z1}+1
diff --git a/src/main/fragment/unused/pbuz1=vwuc1_plus_vbuxx.asm b/src/main/fragment/unused/pbuz1=vwuc1_plus_vbuxx.asm
deleted file mode 100644
index acf837cbf..000000000
--- a/src/main/fragment/unused/pbuz1=vwuc1_plus_vbuxx.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-txa
-clc
-adc #<{c1}
-sta {z1}
-lda #0
-adc #>{c1}
-sta {z1}+1
diff --git a/src/main/fragment/unused/pbuz1=vwuc1_plus_vbuz2.asm b/src/main/fragment/unused/pbuz1=vwuc1_plus_vbuz2.asm
deleted file mode 100644
index c00fb5cd6..000000000
--- a/src/main/fragment/unused/pbuz1=vwuc1_plus_vbuz2.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda #<{c1}
-clc
-adc {z2}
-sta {z1}
-lda #>{c1}
-adc #0
-sta {z1}+1
diff --git a/src/main/fragment/unused/pbuz1_derefidx_vbuaa=vbuc1.asm b/src/main/fragment/unused/pbuz1_derefidx_vbuaa=vbuc1.asm
deleted file mode 100644
index 67233b4de..000000000
--- a/src/main/fragment/unused/pbuz1_derefidx_vbuaa=vbuc1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-tay
-lda #{c1}
-sta ({z1}),y
diff --git a/src/main/fragment/unused/pbuz1_derefidx_vbuc1=vbuc2.asm b/src/main/fragment/unused/pbuz1_derefidx_vbuc1=vbuc2.asm
deleted file mode 100644
index adf21795b..000000000
--- a/src/main/fragment/unused/pbuz1_derefidx_vbuc1=vbuc2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-ldy #{c1}
-lda #{c2}
-sta ({z1}),y
diff --git a/src/main/fragment/unused/pbuz1_derefidx_vbuxx=vbuc1.asm b/src/main/fragment/unused/pbuz1_derefidx_vbuxx=vbuc1.asm
deleted file mode 100644
index 41841fa23..000000000
--- a/src/main/fragment/unused/pbuz1_derefidx_vbuxx=vbuc1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-txa
-tay
-lda #{c1}
-sta ({z1}),y
diff --git a/src/main/fragment/unused/pbuz1_derefidx_vbuyy=vbuyy.asm b/src/main/fragment/unused/pbuz1_derefidx_vbuyy=vbuyy.asm
deleted file mode 100644
index 360a677a2..000000000
--- a/src/main/fragment/unused/pbuz1_derefidx_vbuyy=vbuyy.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-tya
-sta ({z1}),y
diff --git a/src/main/fragment/unused/pbuz1_derefidx_vbuz2=vbuz2.asm b/src/main/fragment/unused/pbuz1_derefidx_vbuz2=vbuz2.asm
deleted file mode 100644
index ff97fae10..000000000
--- a/src/main/fragment/unused/pbuz1_derefidx_vbuz2=vbuz2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-lda {z2}
-tay
-sta ({z1}),y
diff --git a/src/main/fragment/unused/true_then_la1.asm b/src/main/fragment/unused/true_then_la1.asm
deleted file mode 100644
index 3a49f26fb..000000000
--- a/src/main/fragment/unused/true_then_la1.asm
+++ /dev/null
@@ -1 +0,0 @@
-jmp {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vboaa=_not_vboaa.asm b/src/main/fragment/unused/vboaa=_not_vboaa.asm
deleted file mode 100644
index f651def45..000000000
--- a/src/main/fragment/unused/vboaa=_not_vboaa.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-cmp #0
-beq !+
-lda #$ff
-!:
-eor #$ff
\ No newline at end of file
diff --git a/src/main/fragment/unused/vboaa=vboaa_and_vboz1.asm b/src/main/fragment/unused/vboaa=vboaa_and_vboz1.asm
deleted file mode 100644
index 08c66fd76..000000000
--- a/src/main/fragment/unused/vboaa=vboaa_and_vboz1.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-cmp #0
-beq !+
-lda #$ff
-!:
-and {z1}
diff --git a/src/main/fragment/unused/vboaa=vbuaa_eq_vbuc1.asm b/src/main/fragment/unused/vboaa=vbuaa_eq_vbuc1.asm
deleted file mode 100644
index b8c26558c..000000000
--- a/src/main/fragment/unused/vboaa=vbuaa_eq_vbuc1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-sec
-sbc #{c1}
-beq !+
-lda #$ff
-!:
-eor #$ff
\ No newline at end of file
diff --git a/src/main/fragment/unused/vboaa_then_la1.asm b/src/main/fragment/unused/vboaa_then_la1.asm
deleted file mode 100644
index 76f89204f..000000000
--- a/src/main/fragment/unused/vboaa_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cmp #0
-bne {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa=pbuz1_derefidx_vbuc1.asm b/src/main/fragment/unused/vbuaa=pbuz1_derefidx_vbuc1.asm
deleted file mode 100644
index e91a0cb3f..000000000
--- a/src/main/fragment/unused/vbuaa=pbuz1_derefidx_vbuc1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-ldy #{c1}
-lda ({z1}),y
diff --git a/src/main/fragment/unused/vbuaa=vbuaa_bor__hi_pbuz1.asm b/src/main/fragment/unused/vbuaa=vbuaa_bor__hi_pbuz1.asm
deleted file mode 100644
index 4acf6c458..000000000
--- a/src/main/fragment/unused/vbuaa=vbuaa_bor__hi_pbuz1.asm
+++ /dev/null
@@ -1 +0,0 @@
-ora >{z1}
diff --git a/src/main/fragment/unused/vbuaa=vbuaa_bor_pbuc1_derefidx_vbuyy.asm b/src/main/fragment/unused/vbuaa=vbuaa_bor_pbuc1_derefidx_vbuyy.asm
deleted file mode 100644
index 430a811c6..000000000
--- a/src/main/fragment/unused/vbuaa=vbuaa_bor_pbuc1_derefidx_vbuyy.asm
+++ /dev/null
@@ -1 +0,0 @@
-ora {c1},y
diff --git a/src/main/fragment/unused/vbuaa=vbuaa_bor_vbuc1.asm b/src/main/fragment/unused/vbuaa=vbuaa_bor_vbuc1.asm
deleted file mode 100644
index 79111b72f..000000000
--- a/src/main/fragment/unused/vbuaa=vbuaa_bor_vbuc1.asm
+++ /dev/null
@@ -1 +0,0 @@
-ora #{c1}
diff --git a/src/main/fragment/unused/vbuaa=vbuaa_bxor_vbuz1.asm b/src/main/fragment/unused/vbuaa=vbuaa_bxor_vbuz1.asm
deleted file mode 100644
index 12ee9823e..000000000
--- a/src/main/fragment/unused/vbuaa=vbuaa_bxor_vbuz1.asm
+++ /dev/null
@@ -1 +0,0 @@
-eor {z1}
diff --git a/src/main/fragment/unused/vbuaa=vbuxx_bxor_vbuaa.asm b/src/main/fragment/unused/vbuaa=vbuxx_bxor_vbuaa.asm
deleted file mode 100644
index d1e807eb9..000000000
--- a/src/main/fragment/unused/vbuaa=vbuxx_bxor_vbuaa.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-stx $ff
-eor $ff
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa=vbuyy_bxor_vbuaa.asm b/src/main/fragment/unused/vbuaa=vbuyy_bxor_vbuaa.asm
deleted file mode 100644
index ab9973106..000000000
--- a/src/main/fragment/unused/vbuaa=vbuyy_bxor_vbuaa.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-sty $ff
-eor $ff
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa=vbuz1_minus_1.asm b/src/main/fragment/unused/vbuaa=vbuz1_minus_1.asm
deleted file mode 100644
index cd39f6cec..000000000
--- a/src/main/fragment/unused/vbuaa=vbuz1_minus_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-lda {z1}
-sec
-sbc #1
diff --git a/src/main/fragment/unused/vbuaa_eq_pbuc1_derefidx_vbuxx_then_la1.asm b/src/main/fragment/unused/vbuaa_eq_pbuc1_derefidx_vbuxx_then_la1.asm
deleted file mode 100644
index 0b3b979f3..000000000
--- a/src/main/fragment/unused/vbuaa_eq_pbuc1_derefidx_vbuxx_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cmp {c1},x
-beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa_eq_pbuc1_derefidx_vbuyy_then_la1.asm b/src/main/fragment/unused/vbuaa_eq_pbuc1_derefidx_vbuyy_then_la1.asm
deleted file mode 100644
index 4ad54a5ab..000000000
--- a/src/main/fragment/unused/vbuaa_eq_pbuc1_derefidx_vbuyy_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cmp {c1},y
-beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa_eq_vbuaa_then_la1.asm b/src/main/fragment/unused/vbuaa_eq_vbuaa_then_la1.asm
deleted file mode 100644
index 3a49f26fb..000000000
--- a/src/main/fragment/unused/vbuaa_eq_vbuaa_then_la1.asm
+++ /dev/null
@@ -1 +0,0 @@
-jmp {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa_eq_vbuc1_then_la1.asm b/src/main/fragment/unused/vbuaa_eq_vbuc1_then_la1.asm
deleted file mode 100644
index 11697ec89..000000000
--- a/src/main/fragment/unused/vbuaa_eq_vbuc1_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cmp #{c1}
-beq {la1}
diff --git a/src/main/fragment/unused/vbuaa_eq_vbuxx_then_la1.asm b/src/main/fragment/unused/vbuaa_eq_vbuxx_then_la1.asm
deleted file mode 100644
index 0b137a468..000000000
--- a/src/main/fragment/unused/vbuaa_eq_vbuxx_then_la1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-stx $ff
-cmp $ff
-beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa_eq_vbuyy_then_la1.asm b/src/main/fragment/unused/vbuaa_eq_vbuyy_then_la1.asm
deleted file mode 100644
index 38676c6e0..000000000
--- a/src/main/fragment/unused/vbuaa_eq_vbuyy_then_la1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sty $ff
-cmp $ff
-beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa_le_0_then_la1.asm b/src/main/fragment/unused/vbuaa_le_0_then_la1.asm
deleted file mode 100644
index 118295957..000000000
--- a/src/main/fragment/unused/vbuaa_le_0_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cmp #0
-beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa_le_vbuz1_then_la1.asm b/src/main/fragment/unused/vbuaa_le_vbuz1_then_la1.asm
deleted file mode 100644
index 0f1748708..000000000
--- a/src/main/fragment/unused/vbuaa_le_vbuz1_then_la1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-cmp {c1}
-bcc {la1}
-beq {la1}
diff --git a/src/main/fragment/unused/vbuaa_lt_vbuaa_then_la1.asm b/src/main/fragment/unused/vbuaa_lt_vbuaa_then_la1.asm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/fragment/unused/vbuaa_lt_vbuyy_then_la1.asm b/src/main/fragment/unused/vbuaa_lt_vbuyy_then_la1.asm
deleted file mode 100644
index a0e687cab..000000000
--- a/src/main/fragment/unused/vbuaa_lt_vbuyy_then_la1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sty $ff
-cmp $ff
-bcc {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa_minus_vbuz1.asm b/src/main/fragment/unused/vbuaa_minus_vbuz1.asm
deleted file mode 100644
index 66b19bd6b..000000000
--- a/src/main/fragment/unused/vbuaa_minus_vbuz1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-sec
-sbc {z1}
diff --git a/src/main/fragment/unused/vbuaa_neq_vbuaa_then_la1.asm b/src/main/fragment/unused/vbuaa_neq_vbuaa_then_la1.asm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/fragment/unused/vbuaa_neq_vbuxx_then_la1.asm b/src/main/fragment/unused/vbuaa_neq_vbuxx_then_la1.asm
deleted file mode 100644
index 30b7fab4f..000000000
--- a/src/main/fragment/unused/vbuaa_neq_vbuxx_then_la1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sta $ff
-cpx $ff
-bne {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuaa_neq_vbuyy_then_la1.asm b/src/main/fragment/unused/vbuaa_neq_vbuyy_then_la1.asm
deleted file mode 100644
index 1d588b64b..000000000
--- a/src/main/fragment/unused/vbuaa_neq_vbuyy_then_la1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sta $ff
-cpy $ff
-bne {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuc1_le_vbuz1_then_la1.asm b/src/main/fragment/unused/vbuc1_le_vbuz1_then_la1.asm
deleted file mode 100644
index 34eda909c..000000000
--- a/src/main/fragment/unused/vbuc1_le_vbuz1_then_la1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda #{c1}
-cmp {z1}
-bcc {la1}
-beq {la1}
diff --git a/src/main/fragment/unused/vbuc1_lt_vbuz1_then_la1.asm b/src/main/fragment/unused/vbuc1_lt_vbuz1_then_la1.asm
deleted file mode 100644
index 5bb432c83..000000000
--- a/src/main/fragment/unused/vbuc1_lt_vbuz1_then_la1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-lda #{c1}
-cmp {z1}
-bcc {la1}
diff --git a/src/main/fragment/unused/vbuxx=_byte_zpsby1.asm b/src/main/fragment/unused/vbuxx=_byte_zpsby1.asm
deleted file mode 100644
index a49c6c9e2..000000000
--- a/src/main/fragment/unused/vbuxx=_byte_zpsby1.asm
+++ /dev/null
@@ -1 +0,0 @@
-ldx {zpsby1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuxx=vbuyy_plus_1.asm b/src/main/fragment/unused/vbuxx=vbuyy_plus_1.asm
deleted file mode 100644
index 6f9cf741d..000000000
--- a/src/main/fragment/unused/vbuxx=vbuyy_plus_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-tya
-tax
-inx
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuxx=vbuz1_minus_1.asm b/src/main/fragment/unused/vbuxx=vbuz1_minus_1.asm
deleted file mode 100644
index 6e7b4f7f7..000000000
--- a/src/main/fragment/unused/vbuxx=vbuz1_minus_1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-ldx {z1}
-dex
diff --git a/src/main/fragment/unused/vbuxx=vwuc1_derefidx_vbuxx.asm b/src/main/fragment/unused/vbuxx=vwuc1_derefidx_vbuxx.asm
deleted file mode 100644
index 0902c607d..000000000
--- a/src/main/fragment/unused/vbuxx=vwuc1_derefidx_vbuxx.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-lda {c1},x
-tax
diff --git a/src/main/fragment/unused/vbuxx=vwuc1_derefidx_vbuyy.asm b/src/main/fragment/unused/vbuxx=vwuc1_derefidx_vbuyy.asm
deleted file mode 100644
index ae5a6f44c..000000000
--- a/src/main/fragment/unused/vbuxx=vwuc1_derefidx_vbuyy.asm
+++ /dev/null
@@ -1 +0,0 @@
-ldx {c1},y
diff --git a/src/main/fragment/unused/vbuxx_eq_vbuxx_then_la1.asm b/src/main/fragment/unused/vbuxx_eq_vbuxx_then_la1.asm
deleted file mode 100644
index 3a49f26fb..000000000
--- a/src/main/fragment/unused/vbuxx_eq_vbuxx_then_la1.asm
+++ /dev/null
@@ -1 +0,0 @@
-jmp {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuxx_eq_vbuyy_then_la1.asm b/src/main/fragment/unused/vbuxx_eq_vbuyy_then_la1.asm
deleted file mode 100644
index 446ed9647..000000000
--- a/src/main/fragment/unused/vbuxx_eq_vbuyy_then_la1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sty $ff
-cpx $ff
-beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuxx_gt_vbuc1_then_la1.asm b/src/main/fragment/unused/vbuxx_gt_vbuc1_then_la1.asm
deleted file mode 100644
index 575879514..000000000
--- a/src/main/fragment/unused/vbuxx_gt_vbuc1_then_la1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-cpx #{c1}
-beq !+
-bcs {la1}
-!:
diff --git a/src/main/fragment/unused/vbuxx_le_0_then_la1.asm b/src/main/fragment/unused/vbuxx_le_0_then_la1.asm
deleted file mode 100644
index d1d800f7b..000000000
--- a/src/main/fragment/unused/vbuxx_le_0_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cpx #0
-beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuxx_lt_vbuxx_then_la1.asm b/src/main/fragment/unused/vbuxx_lt_vbuxx_then_la1.asm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/fragment/unused/vbuyy=_byte_zpsby1.asm b/src/main/fragment/unused/vbuyy=_byte_zpsby1.asm
deleted file mode 100644
index 0d3be70ce..000000000
--- a/src/main/fragment/unused/vbuyy=_byte_zpsby1.asm
+++ /dev/null
@@ -1 +0,0 @@
-ldy {zpsby1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuyy=_dec_vbuz1.asm b/src/main/fragment/unused/vbuyy=_dec_vbuz1.asm
deleted file mode 100644
index 4a59233a5..000000000
--- a/src/main/fragment/unused/vbuyy=_dec_vbuz1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-ldy {z1}
-dey
diff --git a/src/main/fragment/unused/vbuyy=vbuyy_minus_1.asm b/src/main/fragment/unused/vbuyy=vbuyy_minus_1.asm
deleted file mode 100644
index 37aac7c98..000000000
--- a/src/main/fragment/unused/vbuyy=vbuyy_minus_1.asm
+++ /dev/null
@@ -1 +0,0 @@
-dey
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuyy=vbuz1_minus_1.asm b/src/main/fragment/unused/vbuyy=vbuz1_minus_1.asm
deleted file mode 100644
index 4a59233a5..000000000
--- a/src/main/fragment/unused/vbuyy=vbuz1_minus_1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-ldy {z1}
-dey
diff --git a/src/main/fragment/unused/vbuyy_eq_vbuc1_then_la1.asm b/src/main/fragment/unused/vbuyy_eq_vbuc1_then_la1.asm
deleted file mode 100644
index be28bc23e..000000000
--- a/src/main/fragment/unused/vbuyy_eq_vbuc1_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cpy #{c1}
-beq {la1}
diff --git a/src/main/fragment/unused/vbuyy_eq_vbuyy_then_la1.asm b/src/main/fragment/unused/vbuyy_eq_vbuyy_then_la1.asm
deleted file mode 100644
index 3a49f26fb..000000000
--- a/src/main/fragment/unused/vbuyy_eq_vbuyy_then_la1.asm
+++ /dev/null
@@ -1 +0,0 @@
-jmp {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuyy_eq_vbuz1_then_la1.asm b/src/main/fragment/unused/vbuyy_eq_vbuz1_then_la1.asm
deleted file mode 100644
index e0ff37f4f..000000000
--- a/src/main/fragment/unused/vbuyy_eq_vbuz1_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cpy {z1}
-beq {la1}
diff --git a/src/main/fragment/unused/vbuyy_gt_vbuc1_then_la1.asm b/src/main/fragment/unused/vbuyy_gt_vbuc1_then_la1.asm
deleted file mode 100644
index c1159ac92..000000000
--- a/src/main/fragment/unused/vbuyy_gt_vbuc1_then_la1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-cpy #{c1}
-beq !+
-bcs {la1}
-!:
diff --git a/src/main/fragment/unused/vbuyy_le_0_then_la1.asm b/src/main/fragment/unused/vbuyy_le_0_then_la1.asm
deleted file mode 100644
index 9af1697e9..000000000
--- a/src/main/fragment/unused/vbuyy_le_0_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-cpy #0
-beq {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vbuyy_lt_vbuyy_then_la1.asm b/src/main/fragment/unused/vbuyy_lt_vbuyy_then_la1.asm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/fragment/unused/vbuz1=_dec_vbuaa.asm b/src/main/fragment/unused/vbuz1=_dec_vbuaa.asm
deleted file mode 100644
index cdf148103..000000000
--- a/src/main/fragment/unused/vbuz1=_dec_vbuaa.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-sta {z1}
-dec {z1}
diff --git a/src/main/fragment/unused/vbuz1=pbuz2_derefidx_vbuc1.asm b/src/main/fragment/unused/vbuz1=pbuz2_derefidx_vbuc1.asm
deleted file mode 100644
index 662fd1da1..000000000
--- a/src/main/fragment/unused/vbuz1=pbuz2_derefidx_vbuc1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-ldy #{c1}
-lda ({z2}),y
-sta {z1}
diff --git a/src/main/fragment/unused/vbuz1=vbuaa_minus_1.asm b/src/main/fragment/unused/vbuz1=vbuaa_minus_1.asm
deleted file mode 100644
index cdf148103..000000000
--- a/src/main/fragment/unused/vbuz1=vbuaa_minus_1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-sta {z1}
-dec {z1}
diff --git a/src/main/fragment/unused/vbuz1=vbuxx_minus_1.asm b/src/main/fragment/unused/vbuz1=vbuxx_minus_1.asm
deleted file mode 100644
index c31874b8e..000000000
--- a/src/main/fragment/unused/vbuz1=vbuxx_minus_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-dex
-stx {z1}
-inx
diff --git a/src/main/fragment/unused/vbuz1=vbuyy_minus_1.asm b/src/main/fragment/unused/vbuz1=vbuyy_minus_1.asm
deleted file mode 100644
index 2293e6e71..000000000
--- a/src/main/fragment/unused/vbuz1=vbuyy_minus_1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-sty {z1}
-dec {z1}
diff --git a/src/main/fragment/unused/vbuz1=vbuz1_band_vbuaa.asm b/src/main/fragment/unused/vbuz1=vbuz1_band_vbuaa.asm
deleted file mode 100644
index dcebbc5a8..000000000
--- a/src/main/fragment/unused/vbuz1=vbuz1_band_vbuaa.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-and {z1}
-sta {z1}
diff --git a/src/main/fragment/unused/vbuz1=vbuz1_bor_vbuaa.asm b/src/main/fragment/unused/vbuz1=vbuz1_bor_vbuaa.asm
deleted file mode 100644
index 992edc053..000000000
--- a/src/main/fragment/unused/vbuz1=vbuz1_bor_vbuaa.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-ora {z1}
-sta {z1}
diff --git a/src/main/fragment/unused/vbuz1=vbuz2_minus_vbuc1.asm b/src/main/fragment/unused/vbuz1=vbuz2_minus_vbuc1.asm
deleted file mode 100644
index 7b2fad59b..000000000
--- a/src/main/fragment/unused/vbuz1=vbuz2_minus_vbuc1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda {z2}
-sec
-sbc #{c1}
-sta {z1}
diff --git a/src/main/fragment/unused/vbuz1=vbuz2_plus_vbuz1.asm b/src/main/fragment/unused/vbuz1=vbuz2_plus_vbuz1.asm
deleted file mode 100644
index 217b53c0d..000000000
--- a/src/main/fragment/unused/vbuz1=vbuz2_plus_vbuz1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda {z1}
-clc
-adc {z2}
-sta {z1}
diff --git a/src/main/fragment/unused/vbuz1=vbuz2_plus_vbuz2.asm b/src/main/fragment/unused/vbuz1=vbuz2_plus_vbuz2.asm
deleted file mode 100644
index 2f2058a21..000000000
--- a/src/main/fragment/unused/vbuz1=vbuz2_plus_vbuz2.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda {z2}
-clc
-adc {z2}
-sta {z1}
diff --git a/src/main/fragment/unused/vbuz1_ge_vbuz1_then_la1.asm b/src/main/fragment/unused/vbuz1_ge_vbuz1_then_la1.asm
deleted file mode 100644
index 1e6cf2716..000000000
--- a/src/main/fragment/unused/vbuz1_ge_vbuz1_then_la1.asm
+++ /dev/null
@@ -1 +0,0 @@
-jmp {la1}
diff --git a/src/main/fragment/unused/vbuz1_lt_vbuz1_then_la1.asm b/src/main/fragment/unused/vbuz1_lt_vbuz1_then_la1.asm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/fragment/unused/vbuz=vbuz1_ror_1.asm b/src/main/fragment/unused/vbuz=vbuz1_ror_1.asm
deleted file mode 100644
index 8eb257022..000000000
--- a/src/main/fragment/unused/vbuz=vbuz1_ror_1.asm
+++ /dev/null
@@ -1 +0,0 @@
-lsr {z1}
diff --git a/src/main/fragment/unused/vwsz1=vwsz1_ror_1.asm b/src/main/fragment/unused/vwsz1=vwsz1_ror_1.asm
deleted file mode 100644
index 4e6837599..000000000
--- a/src/main/fragment/unused/vwsz1=vwsz1_ror_1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda {z1}+1
-cmp #$80
-ror {z1}+1
-ror {z1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vwsz1=vwsz2_ror_6.asm b/src/main/fragment/unused/vwsz1=vwsz2_ror_6.asm
deleted file mode 100644
index dc9c2fb2a..000000000
--- a/src/main/fragment/unused/vwsz1=vwsz2_ror_6.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-// ROL twice instead of RORing 6 times
-lda {z2} // {z2} low byte to tmp $ff
-sta $ff
-lda {z2}+1 // {z2} high byte to {z1} low byte
-sta {z1}
-lda #0
-bit {z2}+1
-bpl !+ // {z2} high byte positive?
-lda #$ff
-!:
-sta {z1}+1 // sign extended {z2} into {z1} high byte
-// ROL twice
-rol $ff
-rol {z1}
-rol {z1}+1
-rol $ff
-rol {z1}
-rol {z1}+1
\ No newline at end of file
diff --git a/src/main/fragment/unused/vwuz1=_inc_vwuz2.asm b/src/main/fragment/unused/vwuz1=_inc_vwuz2.asm
deleted file mode 100644
index f88d213c3..000000000
--- a/src/main/fragment/unused/vwuz1=_inc_vwuz2.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda {z2}
-clc
-adc #1
-sta {z1}
-lda {z2}+1
-adc #0
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=_word_pbuz1.asm b/src/main/fragment/unused/vwuz1=_word_pbuz1.asm
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/fragment/unused/vwuz1=vbuaa_word_vbuaa.asm b/src/main/fragment/unused/vwuz1=vbuaa_word_vbuaa.asm
deleted file mode 100644
index 774c7c9f2..000000000
--- a/src/main/fragment/unused/vwuz1=vbuaa_word_vbuaa.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-sta {z1}
-sta {z1}+1
\ No newline at end of file
diff --git a/src/main/fragment/unused/vwuz1=vbuc1_setlo__deref_pbuc2.asm b/src/main/fragment/unused/vwuz1=vbuc1_setlo__deref_pbuc2.asm
deleted file mode 100644
index 1bca2ac1d..000000000
--- a/src/main/fragment/unused/vwuz1=vbuc1_setlo__deref_pbuc2.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda {c2}
-sta {z1}
-lda #0
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vbuxx.asm b/src/main/fragment/unused/vwuz1=vbuxx.asm
deleted file mode 100644
index a0f0d3e2c..000000000
--- a/src/main/fragment/unused/vwuz1=vbuxx.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-stx {z1}
-ldx #0
-stx {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vbuxx_word_vbuaa.asm b/src/main/fragment/unused/vwuz1=vbuxx_word_vbuaa.asm
deleted file mode 100644
index 4facf027b..000000000
--- a/src/main/fragment/unused/vwuz1=vbuxx_word_vbuaa.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-stx {z1}+1
-sta {z1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vwuz1=vbuxx_word_vbuyy.asm b/src/main/fragment/unused/vwuz1=vbuxx_word_vbuyy.asm
deleted file mode 100644
index e9431d186..000000000
--- a/src/main/fragment/unused/vwuz1=vbuxx_word_vbuyy.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-stx {z1}+1
-sty {z1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vwuz1=vbuyy.asm b/src/main/fragment/unused/vwuz1=vbuyy.asm
deleted file mode 100644
index c74d1099b..000000000
--- a/src/main/fragment/unused/vwuz1=vbuyy.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sty {z1}
-ldy #0
-sty {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vbuyy_word_vbuaa.asm b/src/main/fragment/unused/vwuz1=vbuyy_word_vbuaa.asm
deleted file mode 100644
index b4951b4f1..000000000
--- a/src/main/fragment/unused/vwuz1=vbuyy_word_vbuaa.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-sty {z1}+1
-sta {z1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vwuz1=vbuyy_word_vbuxx.asm b/src/main/fragment/unused/vwuz1=vbuyy_word_vbuxx.asm
deleted file mode 100644
index 58e629c86..000000000
--- a/src/main/fragment/unused/vwuz1=vbuyy_word_vbuxx.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-sty {z1}+1
-stx {z1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vwuz1=vbuz2_word_vbuaa.asm b/src/main/fragment/unused/vwuz1=vbuz2_word_vbuaa.asm
deleted file mode 100644
index 348e35109..000000000
--- a/src/main/fragment/unused/vwuz1=vbuz2_word_vbuaa.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sta {z1}
-lda {z2}
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuc1_sethi_vbuz2.asm b/src/main/fragment/unused/vwuz1=vwuc1_sethi_vbuz2.asm
deleted file mode 100644
index da0b9eebe..000000000
--- a/src/main/fragment/unused/vwuz1=vwuc1_sethi_vbuz2.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda #<{c1}
-sta {z1}
-lda {z2}
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuaa.asm b/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuaa.asm
deleted file mode 100644
index 5eda95ad0..000000000
--- a/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuaa.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sta {z1}
-lda #>{c1}
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuxx.asm b/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuxx.asm
deleted file mode 100644
index 9e0e6a8dd..000000000
--- a/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuxx.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-stx {z1}
-lda #>{c1}
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuyy.asm b/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuyy.asm
deleted file mode 100644
index 3f9455a11..000000000
--- a/src/main/fragment/unused/vwuz1=vwuc1_setlo_vbuyy.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sty {z1}
-lda #>{c1}
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuz1_minus_vwuz2.asm b/src/main/fragment/unused/vwuz1=vwuz1_minus_vwuz2.asm
deleted file mode 100644
index cfaea4ef8..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz1_minus_vwuz2.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda {z1}
-sec
-sbc {z2}
-sta {z1}
-lda {z1}+1
-sbc {z2}+1
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuz1_sethi__deref_pbuc1.asm b/src/main/fragment/unused/vwuz1=vwuz1_sethi__deref_pbuc1.asm
deleted file mode 100644
index 2c8bdbb70..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz1_sethi__deref_pbuc1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-lda {c1}
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuz1_setlo_vbuxx.asm b/src/main/fragment/unused/vwuz1=vwuz1_setlo_vbuxx.asm
deleted file mode 100644
index b53a90aad..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz1_setlo_vbuxx.asm
+++ /dev/null
@@ -1 +0,0 @@
-stx {z1}
diff --git a/src/main/fragment/unused/vwuz1=vwuz1_setlo_vbuyy.asm b/src/main/fragment/unused/vwuz1=vwuz1_setlo_vbuyy.asm
deleted file mode 100644
index d83b2fd2d..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz1_setlo_vbuyy.asm
+++ /dev/null
@@ -1 +0,0 @@
-sty {z1}
diff --git a/src/main/fragment/unused/vwuz1=vwuz2_plus_vbuc1.asm b/src/main/fragment/unused/vwuz1=vwuz2_plus_vbuc1.asm
deleted file mode 100644
index 2e9e69bc1..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz2_plus_vbuc1.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda {z2}
-clc
-adc #{c1}
-sta {z1}
-lda {z2}+1
-adc #0
-sta {z1}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuz2_rol_2.asm b/src/main/fragment/unused/vwuz1=vwuz2_rol_2.asm
deleted file mode 100644
index 7676f1f3f..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz2_rol_2.asm
+++ /dev/null
@@ -1,12 +0,0 @@
-lda {z1}
-asl
-sta {z2}
-lda {z1}+1
-rol
-sta {z2}+1
-lda {z1}
-asl
-sta {z2}
-lda {z1}+1
-rol
-sta {z2}+1
diff --git a/src/main/fragment/unused/vwuz1=vwuz2_ror_1.asm b/src/main/fragment/unused/vwuz1=vwuz2_ror_1.asm
deleted file mode 100644
index f218ce807..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz2_ror_1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-lda {z2}+1
-lsr
-sta {z1}+1
-lda {z2}
-ror
-sta {z1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/vwuz1=vwuz2_sethi__deref_pbuc1.asm b/src/main/fragment/unused/vwuz1=vwuz2_sethi__deref_pbuc1.asm
deleted file mode 100644
index 1c10e88fa..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz2_sethi__deref_pbuc1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda {c1}
-sta {z1}+1
-lda {z2}
-sta {z1}
diff --git a/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuaa.asm b/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuaa.asm
deleted file mode 100644
index 6851b96fa..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuaa.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sta {z1}+1
-lda {z2}
-sta {z1}
diff --git a/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuxx.asm b/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuxx.asm
deleted file mode 100644
index 3f560e5a9..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuxx.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-stx {z1}+1
-lda {z2}
-sta {z1}
diff --git a/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuyy.asm b/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuyy.asm
deleted file mode 100644
index 8a60ee033..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuyy.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-sty {z1}+1
-lda {z2}
-sta {z1}
diff --git a/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuz3.asm b/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuz3.asm
deleted file mode 100644
index 6883c9f33..000000000
--- a/src/main/fragment/unused/vwuz1=vwuz2_sethi_vbuz3.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-lda {z2}
-sta {z1}
-lda {z3}
-sta {z1}+1
diff --git a/src/main/fragment/unused/zpbo1=vbuz1_gt_vbuc1.asm b/src/main/fragment/unused/zpbo1=vbuz1_gt_vbuc1.asm
deleted file mode 100644
index ea93088a9..000000000
--- a/src/main/fragment/unused/zpbo1=vbuz1_gt_vbuc1.asm
+++ /dev/null
@@ -1,11 +0,0 @@
- LDA {z1}
- CMP #{c1}
- BEQ !+
- BCS !++
-!:
- LDA #0
- JMP !++
-!:
- LDA #$ff
-!:
- STA {zpbo1}
diff --git a/src/main/fragment/unused/zpbo1=vbuz1_le_vbuc1.asm b/src/main/fragment/unused/zpbo1=vbuz1_le_vbuc1.asm
deleted file mode 100644
index 193f50c94..000000000
--- a/src/main/fragment/unused/zpbo1=vbuz1_le_vbuc1.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-lda {z1}
-cmp #{c1}
-bcc !+
-beq !+
-lda #0
-jmp !++
-!: lda #$ff
-!: sta {zpbo1}
diff --git a/src/main/fragment/unused/zpbo1=vbuz1_lt_vbuc1.asm b/src/main/fragment/unused/zpbo1=vbuz1_lt_vbuc1.asm
deleted file mode 100644
index 6dbc68446..000000000
--- a/src/main/fragment/unused/zpbo1=vbuz1_lt_vbuc1.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-lda {z1}
-cmp #{c1}
-bcc !+
-lda #0
-jmp !++
-!: lda #$ff
-!: sta {zpbo1}
diff --git a/src/main/fragment/unused/zpbo1_then_la1.asm b/src/main/fragment/unused/zpbo1_then_la1.asm
deleted file mode 100644
index 1e101fb01..000000000
--- a/src/main/fragment/unused/zpbo1_then_la1.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-lda {zpbo1}
-bne {la1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/zpsby1=_inc_zpsby1.asm b/src/main/fragment/unused/zpsby1=_inc_zpsby1.asm
deleted file mode 100644
index 26c2fa4b2..000000000
--- a/src/main/fragment/unused/zpsby1=_inc_zpsby1.asm
+++ /dev/null
@@ -1 +0,0 @@
-inc {zpsby1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/zpsby1=_sbyte_vbuxx.asm b/src/main/fragment/unused/zpsby1=_sbyte_vbuxx.asm
deleted file mode 100644
index 6e902d6ff..000000000
--- a/src/main/fragment/unused/zpsby1=_sbyte_vbuxx.asm
+++ /dev/null
@@ -1 +0,0 @@
-stx {zpsby1}
\ No newline at end of file
diff --git a/src/main/fragment/unused/zpsby1=_sbyte_vbuyy.asm b/src/main/fragment/unused/zpsby1=_sbyte_vbuyy.asm
deleted file mode 100644
index 4bdedc840..000000000
--- a/src/main/fragment/unused/zpsby1=_sbyte_vbuyy.asm
+++ /dev/null
@@ -1 +0,0 @@
-sty {zpsby1}
\ No newline at end of file
diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateSynthesizer.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateSynthesizer.java
index 71436c8c3..b351ef1fb 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateSynthesizer.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateSynthesizer.java
@@ -32,6 +32,12 @@ public class AsmFragmentTemplateSynthesizer {
SYNTHESIZER = new AsmFragmentTemplateSynthesizer(fragmentFolder, fragmentCpuFolder, cacheFolder, log);
}
+ /** Re-initialize the fragment template synthesizer with a CPU-specific fragment folder. */
+ public static void reinitialize(String cpuName, CompileLog log) {
+ Path fragmentCpuFolder = SYNTHESIZER.defaultFragmentFolder.resolve(cpuName);
+ SYNTHESIZER = new AsmFragmentTemplateSynthesizer(SYNTHESIZER.defaultFragmentFolder, fragmentCpuFolder, SYNTHESIZER.cacheFolder, log);
+ }
+
/** Finalize the fragment template synthesizer. */
public static void finalize(CompileLog log) {
SYNTHESIZER.saveBestFragmentCache(log);
diff --git a/src/main/java/dk/camelot64/kickc/model/TargetCpu.java b/src/main/java/dk/camelot64/kickc/model/TargetCpu.java
index ae9758453..1fad3fe41 100644
--- a/src/main/java/dk/camelot64/kickc/model/TargetCpu.java
+++ b/src/main/java/dk/camelot64/kickc/model/TargetCpu.java
@@ -3,9 +3,9 @@ package dk.camelot64.kickc.model;
/** The target CPU variation of the compile. Controls which instructions are legal. */
public enum TargetCpu {
/** Vanilla MOS 6502 CPU - without illegal opcodes. */
- MOS6502("6502"),
+ MOS6502("MOS6502"),
/** MOS 6502 CPU with support for illegal instructions. */
- MOS6502X("6502X"),
+ MOS6502X("MOS6502X"),
///** 65C02 CPU - More addressing modes and instructions, no illegal instructions. http://westerndesigncenter.com/wdc/documentation/w65c02s.pdf */
//WDC65C02("65C02"),
///** 65CE02 CPU - Even more addressing modes and instructions. http://www.zimmers.net/anonftp/pub/cbm/documents/chipdata/65ce02.txt */
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
index deeaa2d5b..fdf4146e8 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
@@ -3,6 +3,7 @@ package dk.camelot64.kickc.passes;
import dk.camelot64.kickc.NumberParser;
import dk.camelot64.kickc.SourceLoader;
import dk.camelot64.kickc.asm.AsmClobber;
+import dk.camelot64.kickc.fragment.AsmFragmentTemplateSynthesizer;
import dk.camelot64.kickc.model.*;
import dk.camelot64.kickc.model.operators.*;
import dk.camelot64.kickc.model.statements.*;
@@ -151,6 +152,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor templates =
@@ -201,7 +201,7 @@ public class TestFragments {
private void testFragments(String fileName, Collection signatures) throws IOException {
CompileLog log = new CompileLog();
- AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), new File("src/main/fragment/6502X/").toPath(), null, log);
+ AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), new File("src/main/fragment/MOS6502X/").toPath(), null, log);
List sigs = new ArrayList<>(signatures);
// Always test max 1000 signatures
diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index d65316cec..d5cdecf9b 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -36,6 +36,11 @@ public class TestPrograms {
public TestPrograms() {
}
+ @Test
+ public void testCpu6502() throws IOException, URISyntaxException {
+ compileAndCompare("cpu-6502");
+ }
+
@Test
public void testZpCode() throws IOException, URISyntaxException {
compileAndCompare("examples/zpcode/zpcode");
@@ -3082,7 +3087,6 @@ public class TestPrograms {
@BeforeClass
public static void setUp() {
- AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), new File("src/main/fragment/6502X/").toPath(), getFragmentCacheDir().toPath(), new CompileLog());
}
@AfterClass
@@ -3175,6 +3179,7 @@ public class TestPrograms {
private void testFile(String fileName, Integer upliftCombinations, CompileLog compileLog) throws IOException, URISyntaxException {
System.out.println("Testing output for " + fileName);
+ AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), new File("src/main/fragment/MOS6502X/").toPath(), getFragmentCacheDir().toPath(), new CompileLog());
Compiler compiler = new Compiler();
if(compileLog != null) {
compiler.setLog(compileLog);
diff --git a/src/test/kc/cpu-6502.kc b/src/test/kc/cpu-6502.kc
new file mode 100644
index 000000000..dbb06c61f
--- /dev/null
+++ b/src/test/kc/cpu-6502.kc
@@ -0,0 +1,17 @@
+// Test the 6502 CPU without support for illegal opcodes
+// By a program that normally uses illegal opcodes
+
+#pragma cpu(MOS6502)
+
+void main() {
+ const char* screen = 0x0400;
+ char c=0;
+ while(c<100) {
+ screen[c] = '*';
+ if((c&4)==0) {
+ c+=5;
+ }
+ c++;
+ }
+
+}
\ No newline at end of file
diff --git a/src/test/ref/address-of-0.log b/src/test/ref/address-of-0.log
index bbb43c8db..67bc5ccd3 100644
--- a/src/test/ref/address-of-0.log
+++ b/src/test/ref/address-of-0.log
@@ -145,7 +145,7 @@ Allocated zp ZP_BYTE:2 [ main::b#2 main::b#0 main::b#1 ]
Allocated zp ZP_BYTE:3 [ main::c#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test address-of - use the pointer to get the value
// Upstart
diff --git a/src/test/ref/address-of-1.log b/src/test/ref/address-of-1.log
index 0a5633b53..0b25f1314 100644
--- a/src/test/ref/address-of-1.log
+++ b/src/test/ref/address-of-1.log
@@ -261,7 +261,7 @@ Allocated zp ZP_BYTE:6 [ main::b2#0 ]
Allocated zp ZP_BYTE:7 [ main::b3#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test address-of - pass the pointer as parameter
// Upstart
diff --git a/src/test/ref/address-of-2.log b/src/test/ref/address-of-2.log
index 3a931a160..9a765c1e1 100644
--- a/src/test/ref/address-of-2.log
+++ b/src/test/ref/address-of-2.log
@@ -364,7 +364,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ val#0 val#1 val#2 val#12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test address-of by assigning the affected variable in multiple ways
// Upstart
diff --git a/src/test/ref/address-of-3.log b/src/test/ref/address-of-3.log
index dff061791..d87089db4 100644
--- a/src/test/ref/address-of-3.log
+++ b/src/test/ref/address-of-3.log
@@ -318,7 +318,7 @@ Allocated zp ZP_BYTE:6 [ main::$7 ]
Allocated zp ZP_BYTE:7 [ print::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test address-of an array element
// Upstart
diff --git a/src/test/ref/array-16bit-lookup.log b/src/test/ref/array-16bit-lookup.log
index 4d127e9e4..8be53a2e3 100644
--- a/src/test/ref/array-16bit-lookup.log
+++ b/src/test/ref/array-16bit-lookup.log
@@ -267,7 +267,7 @@ Allocated zp ZP_BYTE:13 [ getValue::$2 ]
Allocated zp ZP_WORD:14 [ getValue::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test KickC performance for 16-bit array lookup function from article "Optimizing C array lookups for the 6502"
// http://8bitworkshop.com/blog/compilers/2019/03/17/cc65-optimization.html
diff --git a/src/test/ref/array-length-symbolic-min.log b/src/test/ref/array-length-symbolic-min.log
index 8325b0349..a31d5f3ea 100644
--- a/src/test/ref/array-length-symbolic-min.log
+++ b/src/test/ref/array-length-symbolic-min.log
@@ -143,7 +143,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::sub#2 main::sub#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates symbolic array lengths
// Upstart
diff --git a/src/test/ref/array-length-symbolic.log b/src/test/ref/array-length-symbolic.log
index fa5f0024f..5a55ab3b5 100644
--- a/src/test/ref/array-length-symbolic.log
+++ b/src/test/ref/array-length-symbolic.log
@@ -285,7 +285,7 @@ Allocated zp ZP_BYTE:6 [ main::$2 ]
Allocated zp ZP_BYTE:7 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates symbolic array lengths
// Upstart
diff --git a/src/test/ref/arrays-init-kasm-0.log b/src/test/ref/arrays-init-kasm-0.log
index 8b9d97cd4..8669258b5 100644
--- a/src/test/ref/arrays-init-kasm-0.log
+++ b/src/test/ref/arrays-init-kasm-0.log
@@ -91,7 +91,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test initializing array using KickAssembler
// Upstart
diff --git a/src/test/ref/arrays-init.log b/src/test/ref/arrays-init.log
index a93cc3f00..cc7b2a0a9 100644
--- a/src/test/ref/arrays-init.log
+++ b/src/test/ref/arrays-init.log
@@ -139,7 +139,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/asm-culling-jmp.log b/src/test/ref/asm-culling-jmp.log
index 30eb369b1..20d375507 100644
--- a/src/test/ref/asm-culling-jmp.log
+++ b/src/test/ref/asm-culling-jmp.log
@@ -74,7 +74,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Example of inline ASM where a JMP is erronously culled during compilation
// https://gitlab.com/camelot/kickc/issues/302
diff --git a/src/test/ref/asm-mnemonic-names.log b/src/test/ref/asm-mnemonic-names.log
index 306045ddf..4f3f1a13c 100644
--- a/src/test/ref/asm-mnemonic-names.log
+++ b/src/test/ref/asm-mnemonic-names.log
@@ -128,7 +128,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test using an ASM mnemonic as a C symbol names
// Works if the C-lexer and the ASM-lexer are separated properly
diff --git a/src/test/ref/asm-uses-0.log b/src/test/ref/asm-uses-0.log
index 4ef91a4fa..948b12332 100644
--- a/src/test/ref/asm-uses-0.log
+++ b/src/test/ref/asm-uses-0.log
@@ -100,7 +100,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that inline asm uses clause makes the compiler not cull a procedure referenced
// Upstart
diff --git a/src/test/ref/assignment-chained.log b/src/test/ref/assignment-chained.log
index d221498c8..d6e66862e 100644
--- a/src/test/ref/assignment-chained.log
+++ b/src/test/ref/assignment-chained.log
@@ -149,7 +149,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::a#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that chained assignments work as intended
// Upstart
diff --git a/src/test/ref/assignment-compound.log b/src/test/ref/assignment-compound.log
index 58cf6d34f..7232d696a 100644
--- a/src/test/ref/assignment-compound.log
+++ b/src/test/ref/assignment-compound.log
@@ -744,7 +744,7 @@ Allocated zp ZP_BYTE:2 [ test::a#11 ]
Allocated zp ZP_BYTE:3 [ test::i#11 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test compound assignment operators
// Upstart
diff --git a/src/test/ref/bgblack.log b/src/test/ref/bgblack.log
index 5100df901..6958e3a8b 100644
--- a/src/test/ref/bgblack.log
+++ b/src/test/ref/bgblack.log
@@ -83,7 +83,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/bitmap-circle.log b/src/test/ref/bitmap-circle.log
index 4f109fb2f..90c6a11e4 100644
--- a/src/test/ref/bitmap-circle.log
+++ b/src/test/ref/bitmap-circle.log
@@ -1191,7 +1191,7 @@ Allocated zp ZP_BYTE:46 [ plot::$6 ]
Allocated zp ZP_WORD:47 [ fill::end#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Plots a circle on a bitmap using Bresenham's Circle algorithm
// Coded by Richard-William Loerakker
diff --git a/src/test/ref/bitmap-plot-0.log b/src/test/ref/bitmap-plot-0.log
index bc5d1fe05..6d00bf6b7 100644
--- a/src/test/ref/bitmap-plot-0.log
+++ b/src/test/ref/bitmap-plot-0.log
@@ -1819,7 +1819,7 @@ Allocated zp ZP_BYTE:35 [ bitmap_init::$5 ]
Allocated zp ZP_BYTE:36 [ bitmap_init::$6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the simple bitmap plotter - and counts plots per frame in an IRQ
// Plots simple plots
diff --git a/src/test/ref/bitmap-plot-1.log b/src/test/ref/bitmap-plot-1.log
index c1238ec70..ad10fb151 100644
--- a/src/test/ref/bitmap-plot-1.log
+++ b/src/test/ref/bitmap-plot-1.log
@@ -4063,7 +4063,7 @@ Allocated zp ZP_BYTE:224 [ divr16u::$2 ]
Allocated zp ZP_WORD:225 [ rem16u#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the simple bitmap plotter - and counts plots per frame in an IRQ
// Plots a fullscreen elipsis
diff --git a/src/test/ref/bitmap-plot-2.log b/src/test/ref/bitmap-plot-2.log
index 58480dfbb..500ad6144 100644
--- a/src/test/ref/bitmap-plot-2.log
+++ b/src/test/ref/bitmap-plot-2.log
@@ -4298,7 +4298,7 @@ Allocated zp ZP_BYTE:223 [ divr16u::$2 ]
Allocated zp ZP_WORD:224 [ rem16u#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the simple bitmap plotter - and counts plots per frame in an IRQ
// Plots a spiral
diff --git a/src/test/ref/bitmap-plot-3.log b/src/test/ref/bitmap-plot-3.log
index 3aae369fd..f9819fc07 100644
--- a/src/test/ref/bitmap-plot-3.log
+++ b/src/test/ref/bitmap-plot-3.log
@@ -2532,7 +2532,7 @@ Allocated zp ZP_BYTE:72 [ bitmap_init::$5 ]
Allocated zp ZP_BYTE:73 [ bitmap_init::$6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the simple bitmap plotter
// Plots a few lines using the bresenham line algorithm
diff --git a/src/test/ref/bitmap-plotter.log b/src/test/ref/bitmap-plotter.log
index 679d34166..3e3db734c 100644
--- a/src/test/ref/bitmap-plotter.log
+++ b/src/test/ref/bitmap-plotter.log
@@ -1048,7 +1048,7 @@ Allocated zp ZP_BYTE:32 [ init_plot_tables::$8 ]
Allocated zp ZP_BYTE:33 [ init_plot_tables::$9 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/bitwise-not.log b/src/test/ref/bitwise-not.log
index 54482db7c..fdbd270ed 100644
--- a/src/test/ref/bitwise-not.log
+++ b/src/test/ref/bitwise-not.log
@@ -124,7 +124,7 @@ Allocated zp ZP_BYTE:2 [ main::c#2 main::c#1 ]
Allocated zp ZP_BYTE:3 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/bool-const.log b/src/test/ref/bool-const.log
index 4cb9d7dd3..08a74b914 100644
--- a/src/test/ref/bool-const.log
+++ b/src/test/ref/bool-const.log
@@ -379,7 +379,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A Minimal test of boolean constants.
// Upstart
diff --git a/src/test/ref/bool-function.log b/src/test/ref/bool-function.log
index 1af865a4c..ebbf85eb8 100644
--- a/src/test/ref/bool-function.log
+++ b/src/test/ref/bool-function.log
@@ -275,7 +275,7 @@ Allocated zp ZP_BOOL:9 [ isSet::$1 ]
Allocated zp ZP_BOOL:10 [ isSet::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a function taking boolean parameter and returning boolean result
// Upstart
diff --git a/src/test/ref/bool-ifs-min.log b/src/test/ref/bool-ifs-min.log
index 615418540..71be77c38 100644
--- a/src/test/ref/bool-ifs-min.log
+++ b/src/test/ref/bool-ifs-min.log
@@ -178,7 +178,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A test of boolean conditions using && || and !
// Upstart
diff --git a/src/test/ref/bool-nullpointer-exception.log b/src/test/ref/bool-nullpointer-exception.log
index 40443692d..b3e5f84a1 100644
--- a/src/test/ref/bool-nullpointer-exception.log
+++ b/src/test/ref/bool-nullpointer-exception.log
@@ -139,7 +139,7 @@ Complete equivalence classes
Allocated zp ZP_BOOL:2 [ framedone#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Some bool code that causes a NullPointerException
// Upstart
diff --git a/src/test/ref/bool-pointer.log b/src/test/ref/bool-pointer.log
index 972b1b0e9..38b05ec07 100644
--- a/src/test/ref/bool-pointer.log
+++ b/src/test/ref/bool-pointer.log
@@ -133,7 +133,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a pointer to a boolean
// Upstart
diff --git a/src/test/ref/bool-vars.log b/src/test/ref/bool-vars.log
index 3f02833d8..d2fab5780 100644
--- a/src/test/ref/bool-vars.log
+++ b/src/test/ref/bool-vars.log
@@ -703,7 +703,7 @@ Allocated zp ZP_BYTE:10 [ bool_or::$1 ]
Allocated zp ZP_BYTE:11 [ bool_and::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A test of boolean conditions using && || and !
// Upstart
diff --git a/src/test/ref/bresenham.log b/src/test/ref/bresenham.log
index 75b3d620e..57c1f9486 100644
--- a/src/test/ref/bresenham.log
+++ b/src/test/ref/bresenham.log
@@ -390,7 +390,7 @@ Allocated zp ZP_BYTE:5 [ main::e#3 main::e#5 main::e#1 main::e#2 ]
Allocated zp ZP_BYTE:6 [ main::y#2 main::y#4 main::y#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/bresenhamarr.log b/src/test/ref/bresenhamarr.log
index 4803764f8..2fee66b84 100644
--- a/src/test/ref/bresenhamarr.log
+++ b/src/test/ref/bresenhamarr.log
@@ -401,7 +401,7 @@ Allocated zp ZP_BYTE:6 [ main::y#2 main::y#4 main::y#1 ]
Allocated zp ZP_WORD:7 [ main::$15 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/c-types.log b/src/test/ref/c-types.log
index 0b8ab589d..a49bb883f 100644
--- a/src/test/ref/c-types.log
+++ b/src/test/ref/c-types.log
@@ -2302,7 +2302,7 @@ Allocated zp ZP_BYTE:24 [ print_byte::$0 ]
Allocated zp ZP_BYTE:25 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the different standard C types
// Upstart
diff --git a/src/test/ref/c64dtv-8bppcharstretch.log b/src/test/ref/c64dtv-8bppcharstretch.log
index ff697443d..403ad0bc6 100644
--- a/src/test/ref/c64dtv-8bppcharstretch.log
+++ b/src/test/ref/c64dtv-8bppcharstretch.log
@@ -1603,7 +1603,7 @@ Allocated zp ZP_BYTE:25 [ gfx_init_screen0::$2 ]
Allocated zp ZP_BYTE:26 [ gfx_init_screen0::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// C64DTV 8bpp charmode stretcher
// Upstart
diff --git a/src/test/ref/c64dtv-8bppchunkystretch.log b/src/test/ref/c64dtv-8bppchunkystretch.log
index 0aeb74b6c..e0a53a4fa 100644
--- a/src/test/ref/c64dtv-8bppchunkystretch.log
+++ b/src/test/ref/c64dtv-8bppchunkystretch.log
@@ -1134,7 +1134,7 @@ Allocated zp ZP_WORD:14 [ gfx_init_chunky::$8 ]
Allocated zp ZP_BYTE:16 [ gfx_init_chunky::c#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// C64DTV 8bpp charmode stretcher
// Upstart
diff --git a/src/test/ref/c64dtv-blitter-box.log b/src/test/ref/c64dtv-blitter-box.log
index 1d0c9c7a4..4483c47d8 100644
--- a/src/test/ref/c64dtv-blitter-box.log
+++ b/src/test/ref/c64dtv-blitter-box.log
@@ -641,7 +641,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::$13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Fill a box on the screen using the blitter
// Upstart
diff --git a/src/test/ref/c64dtv-blittermin.log b/src/test/ref/c64dtv-blittermin.log
index ad5607cc0..be03e7fbf 100644
--- a/src/test/ref/c64dtv-blittermin.log
+++ b/src/test/ref/c64dtv-blittermin.log
@@ -683,7 +683,7 @@ Allocated zp ZP_BYTE:2 [ main::r#2 main::r#1 ]
Allocated zp ZP_BYTE:3 [ main::$9 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/c64dtv-color.log b/src/test/ref/c64dtv-color.log
index a9f846dca..fd6e2e57f 100644
--- a/src/test/ref/c64dtv-color.log
+++ b/src/test/ref/c64dtv-color.log
@@ -329,7 +329,7 @@ Allocated zp ZP_BYTE:2 [ main::r#2 main::r#1 ]
Allocated zp ZP_BYTE:3 [ main::c#2 main::c#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test C64DTV v2 256-colors and the 16-color redefinable palette
// Upstart
diff --git a/src/test/ref/c64dtv-gfxexplorer.log b/src/test/ref/c64dtv-gfxexplorer.log
index 82b3d6ef0..8ffd3bfdc 100644
--- a/src/test/ref/c64dtv-gfxexplorer.log
+++ b/src/test/ref/c64dtv-gfxexplorer.log
@@ -15199,7 +15199,7 @@ Allocated zp ZP_BYTE:341 [ gfx_init_screen0::$2 ]
Allocated zp ZP_BYTE:342 [ gfx_init_screen0::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Interactive Explorer for C64DTV Screen Modes
// Upstart
diff --git a/src/test/ref/c64dtv-gfxmodes.log b/src/test/ref/c64dtv-gfxmodes.log
index 974a2494c..30c01db72 100644
--- a/src/test/ref/c64dtv-gfxmodes.log
+++ b/src/test/ref/c64dtv-gfxmodes.log
@@ -14126,7 +14126,7 @@ Allocated zp ZP_BYTE:293 [ mode_stdchar::$30 ]
Allocated zp ZP_BYTE:294 [ print_str_lines::ch#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Exploring C64DTV Screen Modes
// Upstart
diff --git a/src/test/ref/call-parameter-autocast.log b/src/test/ref/call-parameter-autocast.log
index 7369656c1..f390ba516 100644
--- a/src/test/ref/call-parameter-autocast.log
+++ b/src/test/ref/call-parameter-autocast.log
@@ -260,7 +260,7 @@ Allocated zp ZP_WORD:3 [ print::w#3 ]
Allocated zp ZP_BYTE:5 [ print::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test auto-casting of call-parameters
// Upstart
diff --git a/src/test/ref/callconstparam.log b/src/test/ref/callconstparam.log
index 1f371e9af..ea059b7b5 100644
--- a/src/test/ref/callconstparam.log
+++ b/src/test/ref/callconstparam.log
@@ -265,7 +265,7 @@ Allocated zp ZP_WORD:3 [ screen#16 screen#10 screen#4 ]
Allocated zp ZP_BYTE:5 [ line::x#2 line::x#0 line::x#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Multiple calls with different (constant?) parameters should yield different values at runtime
// Currently the same constant parameter is passed on every call.
diff --git a/src/test/ref/cast-deref.log b/src/test/ref/cast-deref.log
index 4eb860f6c..3e7e9c63f 100644
--- a/src/test/ref/cast-deref.log
+++ b/src/test/ref/cast-deref.log
@@ -136,7 +136,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Example of NOP-casting a dereferenced signed byte to a byte
// Upstart
diff --git a/src/test/ref/cast-not-needed-2.log b/src/test/ref/cast-not-needed-2.log
index 9b20d1ed0..756bbd3d9 100644
--- a/src/test/ref/cast-not-needed-2.log
+++ b/src/test/ref/cast-not-needed-2.log
@@ -227,7 +227,7 @@ Allocated zp ZP_WORD:2 [ main::getScreen1_return#0 ]
Allocated zp ZP_WORD:4 [ main::spritePtr1_return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a cast that is not needed
// Upstart
diff --git a/src/test/ref/cast-not-needed-3.log b/src/test/ref/cast-not-needed-3.log
index 85741a94c..8fb55bea8 100644
--- a/src/test/ref/cast-not-needed-3.log
+++ b/src/test/ref/cast-not-needed-3.log
@@ -232,7 +232,7 @@ Allocated zp ZP_WORD:4 [ main::spritePtr1_$0#0 ]
Allocated zp ZP_BYTE:6 [ main::spritePtr1_return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a cast that is not needed
// Upstart
diff --git a/src/test/ref/cast-not-needed.log b/src/test/ref/cast-not-needed.log
index 6d361fb31..6a2fae365 100644
--- a/src/test/ref/cast-not-needed.log
+++ b/src/test/ref/cast-not-needed.log
@@ -120,7 +120,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a cast that is not needed
// Upstart
diff --git a/src/test/ref/cast-precedence-problem.log b/src/test/ref/cast-precedence-problem.log
index 5943cf3a0..e121db21e 100644
--- a/src/test/ref/cast-precedence-problem.log
+++ b/src/test/ref/cast-precedence-problem.log
@@ -233,7 +233,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that casting inside constants in the output handles precedence between cast and + correctly - should generate the following KA-expression ($ff & sumw>>1)+1
// Upstart
diff --git a/src/test/ref/casting.log b/src/test/ref/casting.log
index 72382c59c..36f892b52 100644
--- a/src/test/ref/casting.log
+++ b/src/test/ref/casting.log
@@ -362,7 +362,7 @@ Allocated zp ZP_BYTE:5 [ main::sb#0 ]
Allocated zp ZP_BYTE:6 [ w::b2#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/chargen.log b/src/test/ref/chargen.log
index 2b26e2d67..bff4f4ea6 100644
--- a/src/test/ref/chargen.log
+++ b/src/test/ref/chargen.log
@@ -381,7 +381,7 @@ Allocated zp ZP_BYTE:7 [ main::c#2 ]
Allocated zp ZP_BYTE:8 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/chessboard.log b/src/test/ref/chessboard.log
index 9f4d2e7e9..935f47331 100644
--- a/src/test/ref/chessboard.log
+++ b/src/test/ref/chessboard.log
@@ -284,7 +284,7 @@ Allocated zp ZP_BYTE:7 [ main::column#2 main::column#1 ]
Allocated zp ZP_BYTE:8 [ main::color#3 main::color#5 main::color#2 main::color#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Draws a chess board in the upper left corner of the screen
// Upstart
diff --git a/src/test/ref/cia-timer-cyclecount.log b/src/test/ref/cia-timer-cyclecount.log
index 782c41d9f..6b0f4b5de 100644
--- a/src/test/ref/cia-timer-cyclecount.log
+++ b/src/test/ref/cia-timer-cyclecount.log
@@ -721,7 +721,7 @@ Allocated zp ZP_BYTE:29 [ print_byte_at::$2 ]
Allocated zp ZP_DWORD:30 [ clock::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Counting cycles using a CIA timer
// Upstart
diff --git a/src/test/ref/cia-timer-simple.log b/src/test/ref/cia-timer-simple.log
index 7a592f8b5..32289ae69 100644
--- a/src/test/ref/cia-timer-simple.log
+++ b/src/test/ref/cia-timer-simple.log
@@ -689,7 +689,7 @@ Allocated zp ZP_BYTE:21 [ print_byte_at::$2 ]
Allocated zp ZP_DWORD:22 [ clock::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Setup and run a simple CIA-timer
// Upstart
diff --git a/src/test/ref/clobber-a-problem.log b/src/test/ref/clobber-a-problem.log
index 0d103031f..354113d01 100644
--- a/src/test/ref/clobber-a-problem.log
+++ b/src/test/ref/clobber-a-problem.log
@@ -244,7 +244,7 @@ Allocated zp ZP_BYTE:3 [ irq_raster_next#0 irq_raster_next#1 ]
Allocated zp ZP_BYTE:4 [ irq::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/coalesce-assignment.log b/src/test/ref/coalesce-assignment.log
index f0fc6dc53..30fa03785 100644
--- a/src/test/ref/coalesce-assignment.log
+++ b/src/test/ref/coalesce-assignment.log
@@ -245,7 +245,7 @@ Allocated zp ZP_BYTE:6 [ main::f#0 ]
Allocated zp ZP_BYTE:7 [ main::g#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests variable coalescing over assignments
// Upstart
diff --git a/src/test/ref/code-after-return-1.log b/src/test/ref/code-after-return-1.log
index 1fc40b59c..e9256aff5 100644
--- a/src/test/ref/code-after-return-1.log
+++ b/src/test/ref/code-after-return-1.log
@@ -155,7 +155,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test code after return in main()
// Upstart
diff --git a/src/test/ref/code-after-return.log b/src/test/ref/code-after-return.log
index d59ab3a12..3c339c903 100644
--- a/src/test/ref/code-after-return.log
+++ b/src/test/ref/code-after-return.log
@@ -88,7 +88,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test code after return in main()
// Upstart
diff --git a/src/test/ref/comma-decl-for.log b/src/test/ref/comma-decl-for.log
index eebbed745..4ddb91ee0 100644
--- a/src/test/ref/comma-decl-for.log
+++ b/src/test/ref/comma-decl-for.log
@@ -146,7 +146,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests comma-separated declarations inside for()
// Upstart
diff --git a/src/test/ref/comma-decl.log b/src/test/ref/comma-decl.log
index 9be428afd..16b4dd58f 100644
--- a/src/test/ref/comma-decl.log
+++ b/src/test/ref/comma-decl.log
@@ -131,7 +131,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests comma-separated declarations
// Upstart
diff --git a/src/test/ref/comma-expr-1.log b/src/test/ref/comma-expr-1.log
index 8fe64eacc..ee7ee579a 100644
--- a/src/test/ref/comma-expr-1.log
+++ b/src/test/ref/comma-expr-1.log
@@ -106,7 +106,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple comma-expression (in parenthesis)
// Upstart
diff --git a/src/test/ref/comma-expr-2.log b/src/test/ref/comma-expr-2.log
index a91127b00..9488750f6 100644
--- a/src/test/ref/comma-expr-2.log
+++ b/src/test/ref/comma-expr-2.log
@@ -93,7 +93,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple comma-expressions (without parenthesis)
// Upstart
diff --git a/src/test/ref/comma-expr-for.log b/src/test/ref/comma-expr-for.log
index c209abbbb..e7c089ed4 100644
--- a/src/test/ref/comma-expr-for.log
+++ b/src/test/ref/comma-expr-for.log
@@ -150,7 +150,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests comma-expressions in for()-statement
// Upstart
diff --git a/src/test/ref/comparison-rewriting-pointer.log b/src/test/ref/comparison-rewriting-pointer.log
index debc56ba8..fa419aa1c 100644
--- a/src/test/ref/comparison-rewriting-pointer.log
+++ b/src/test/ref/comparison-rewriting-pointer.log
@@ -204,7 +204,7 @@ Allocated zp ZP_WORD:2 [ main::sc#2 main::sc#1 ]
Allocated zp ZP_WORD:4 [ main::cc#2 main::cc#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test rewriting of constant comparisons for pointers
// Upstart
diff --git a/src/test/ref/comparison-rewriting.log b/src/test/ref/comparison-rewriting.log
index 43a752cc6..b7f904345 100644
--- a/src/test/ref/comparison-rewriting.log
+++ b/src/test/ref/comparison-rewriting.log
@@ -509,7 +509,7 @@ Allocated zp ZP_WORD:6 [ main::screen#11 main::screen#1 ]
Allocated zp ZP_BYTE:8 [ main::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test rewriting of constant comparisons
// Upstart
diff --git a/src/test/ref/complex-conditional-problem.log b/src/test/ref/complex-conditional-problem.log
index 77eac6347..6599f7462 100644
--- a/src/test/ref/complex-conditional-problem.log
+++ b/src/test/ref/complex-conditional-problem.log
@@ -179,7 +179,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::key#2 main::key#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test to provoke Exception when using complex || condition
// Upstart
diff --git a/src/test/ref/complex/ataritempest/ataritempest.log b/src/test/ref/complex/ataritempest/ataritempest.log
index d923c842b..8a6d0c9f0 100644
--- a/src/test/ref/complex/ataritempest/ataritempest.log
+++ b/src/test/ref/complex/ataritempest/ataritempest.log
@@ -183,7 +183,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ entryPoint::i#2 entryPoint::i#1 ]
INITIAL ASM
-Target platform is custom / 6502X
+Target platform is custom / MOS6502X
// File Comments
// Atari Tempest ROM Development Template
// Each function of the kernal is a no-args function
diff --git a/src/test/ref/complex/clearscreen/clearscreen.log b/src/test/ref/complex/clearscreen/clearscreen.log
index b1e9d24b2..f9b8830b3 100644
--- a/src/test/ref/complex/clearscreen/clearscreen.log
+++ b/src/test/ref/complex/clearscreen/clearscreen.log
@@ -5211,7 +5211,7 @@ Allocated zp ZP_BYTE:184 [ processChars::$39 ]
Allocated zp ZP_BYTE:185 [ processChars::$33 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Clears start screen throwing around the letters (by turning them into sprites)
// Upstart
diff --git a/src/test/ref/complex/medusa/medusa.log b/src/test/ref/complex/medusa/medusa.log
index e58976ba6..6ec283109 100644
--- a/src/test/ref/complex/medusa/medusa.log
+++ b/src/test/ref/complex/medusa/medusa.log
@@ -384,7 +384,7 @@ Allocated zp ZP_WORD:8 [ memcpy::dst#2 memcpy::dst#4 memcpy::dst#1 ]
Allocated zp ZP_WORD:10 [ memcpy::src_end#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Display MEDUSA PETSCII by Buzz_clik
// https://csdb.dk/release/?id=178673
diff --git a/src/test/ref/complex/splines/truetype-splines.log b/src/test/ref/complex/splines/truetype-splines.log
index 34bde2868..67fa9fdf6 100644
--- a/src/test/ref/complex/splines/truetype-splines.log
+++ b/src/test/ref/complex/splines/truetype-splines.log
@@ -6221,7 +6221,7 @@ Allocated zp ZP_BYTE:310 [ mulf_init::$12 ]
Allocated zp ZP_BYTE:311 [ mulf_init::$13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Show a few simple splines using the splines library
// Upstart
diff --git a/src/test/ref/complex/tetris/test-sprites.log b/src/test/ref/complex/tetris/test-sprites.log
index ba1d58e86..6a1d303c7 100644
--- a/src/test/ref/complex/tetris/test-sprites.log
+++ b/src/test/ref/complex/tetris/test-sprites.log
@@ -2136,7 +2136,7 @@ Allocated zp ZP_BYTE:25 [ sprites_irq::ptr#1 ]
Allocated zp ZP_BYTE:26 [ sprites_irq::ptr#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/complex/tetris/tetris.log b/src/test/ref/complex/tetris/tetris.log
index 9b68ae779..9edf83251 100644
--- a/src/test/ref/complex/tetris/tetris.log
+++ b/src/test/ref/complex/tetris/tetris.log
@@ -13834,7 +13834,7 @@ Allocated zp ZP_BYTE:222 [ sprites_irq::ptr#1 ]
Allocated zp ZP_BYTE:223 [ sprites_irq::ptr#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tetris Game for the Commodore 64
// The tetris game tries to match NES tetris gameplay pretty closely
diff --git a/src/test/ref/complex/xmega65/xmega65.log b/src/test/ref/complex/xmega65/xmega65.log
index fa5878132..dde57d64b 100644
--- a/src/test/ref/complex/xmega65/xmega65.log
+++ b/src/test/ref/complex/xmega65/xmega65.log
@@ -622,7 +622,7 @@ Allocated zp ZP_WORD:11 [ memset::dst#2 memset::dst#4 memset::dst#1 ]
Allocated zp ZP_WORD:13 [ memset::end#0 ]
INITIAL ASM
-Target platform is custom / 6502X
+Target platform is custom / MOS6502X
// File Comments
// XMega65 Kernal Development Template
// Each function of the kernal is a no-args function
diff --git a/src/test/ref/condition-integer-0.log b/src/test/ref/condition-integer-0.log
index 885fd151e..d89bc5ae6 100644
--- a/src/test/ref/condition-integer-0.log
+++ b/src/test/ref/condition-integer-0.log
@@ -382,7 +382,7 @@ Allocated zp ZP_WORD:4 [ main::i1#2 main::i1#1 ]
Allocated zp ZP_BYTE:6 [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests using integer conditions in if()
// This should produce '+ ++ ++' at the top of the screen
diff --git a/src/test/ref/condition-integer-1.log b/src/test/ref/condition-integer-1.log
index a489af45d..09be3db21 100644
--- a/src/test/ref/condition-integer-1.log
+++ b/src/test/ref/condition-integer-1.log
@@ -384,7 +384,7 @@ Allocated zp ZP_WORD:4 [ main::i1#2 main::i1#1 ]
Allocated zp ZP_BYTE:6 [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests using integer conditions in if()
// This should produce '0 0 0' at the top of the screen
diff --git a/src/test/ref/condition-integer-2.log b/src/test/ref/condition-integer-2.log
index 9753dbcbf..ee9ec7bdb 100644
--- a/src/test/ref/condition-integer-2.log
+++ b/src/test/ref/condition-integer-2.log
@@ -323,7 +323,7 @@ Allocated zp ZP_BYTE:6 [ main::k#2 main::k#1 ]
Allocated zp ZP_BYTE:7 [ idx#12 idx#13 idx#4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests using integer conditions in while() / for() / do..while
// This should produce 'ba ba ba' at the top of the screen
diff --git a/src/test/ref/condition-integer-3.log b/src/test/ref/condition-integer-3.log
index 0a829da38..112a4be1c 100644
--- a/src/test/ref/condition-integer-3.log
+++ b/src/test/ref/condition-integer-3.log
@@ -210,7 +210,7 @@ Allocated zp ZP_BYTE:3 [ main::idx#2 main::idx#1 ]
Allocated zp ZP_BYTE:4 [ main::j#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests using integer conditions in ternary operator
// This should produce '++0++' at the top of the screen
diff --git a/src/test/ref/condition-integer-4.log b/src/test/ref/condition-integer-4.log
index 1bd1ef35a..2a136bf38 100644
--- a/src/test/ref/condition-integer-4.log
+++ b/src/test/ref/condition-integer-4.log
@@ -408,7 +408,7 @@ Allocated zp ZP_BYTE:8 [ main::$11 ]
Allocated zp ZP_BYTE:9 [ main::$12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests using integer conditions in && and || operator
// This should produce '01010101', '00110011', '00010001', '01110111' at the top of the screen
diff --git a/src/test/ref/condition-type-mismatch.log b/src/test/ref/condition-type-mismatch.log
index ba9c1360d..857e9c180 100644
--- a/src/test/ref/condition-type-mismatch.log
+++ b/src/test/ref/condition-type-mismatch.log
@@ -112,7 +112,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a condition type mismatch (not boolean)
// Upstart
diff --git a/src/test/ref/consolidate-array-index-problem.log b/src/test/ref/consolidate-array-index-problem.log
index d3055de0e..14a7bef05 100644
--- a/src/test/ref/consolidate-array-index-problem.log
+++ b/src/test/ref/consolidate-array-index-problem.log
@@ -158,7 +158,7 @@ Allocated zp ZP_BYTE:2 [ main::x#2 main::x#1 ]
Allocated zp ZP_BYTE:3 [ main::y#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/consolidate-constant-problem.log b/src/test/ref/consolidate-constant-problem.log
index c4772daa8..bfa8e42ed 100644
--- a/src/test/ref/consolidate-constant-problem.log
+++ b/src/test/ref/consolidate-constant-problem.log
@@ -226,7 +226,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/const-condition.log b/src/test/ref/const-condition.log
index b41d07779..5f61beb8d 100644
--- a/src/test/ref/const-condition.log
+++ b/src/test/ref/const-condition.log
@@ -103,7 +103,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Ensure that if()'s with constant comparisons are identified and eliminated
// Upstart
diff --git a/src/test/ref/const-early-identification.log b/src/test/ref/const-early-identification.log
index 2cebb8d3e..336c434fa 100644
--- a/src/test/ref/const-early-identification.log
+++ b/src/test/ref/const-early-identification.log
@@ -184,7 +184,7 @@ Allocated zp ZP_BYTE:2 [ A#0 ]
Allocated zp ZP_BYTE:3 [ sub::D#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that constants are identified early
// Upstart
diff --git a/src/test/ref/const-identification.log b/src/test/ref/const-identification.log
index 4bf856c4a..8aad03f02 100644
--- a/src/test/ref/const-identification.log
+++ b/src/test/ref/const-identification.log
@@ -347,7 +347,7 @@ Allocated zp ZP_BYTE:5 [ plot::idx#0 ]
Allocated zp ZP_BYTE:6 [ plot::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/const-if-problem.log b/src/test/ref/const-if-problem.log
index 7f17d4b48..09386ccf9 100644
--- a/src/test/ref/const-if-problem.log
+++ b/src/test/ref/const-if-problem.log
@@ -151,7 +151,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Constant if() contains call to (unused) function - should be optimized away
// Upstart
diff --git a/src/test/ref/const-int-cast-problem.log b/src/test/ref/const-int-cast-problem.log
index e109600ce..bfc03fe31 100644
--- a/src/test/ref/const-int-cast-problem.log
+++ b/src/test/ref/const-int-cast-problem.log
@@ -129,7 +129,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a problem with converting casted constant numbers to fixed type constant integers
// Upstart
diff --git a/src/test/ref/const-mult-div.log b/src/test/ref/const-mult-div.log
index 5afd42833..4dbce63d7 100644
--- a/src/test/ref/const-mult-div.log
+++ b/src/test/ref/const-mult-div.log
@@ -90,7 +90,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a constant with multiplication and division
// Upstart
diff --git a/src/test/ref/const-param.log b/src/test/ref/const-param.log
index 26c855d01..60571eea8 100644
--- a/src/test/ref/const-param.log
+++ b/src/test/ref/const-param.log
@@ -258,7 +258,7 @@ Allocated zp ZP_BYTE:8 [ main::$2 ]
Allocated zp ZP_BYTE:9 [ sum::return#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test that the compiler optimizes when the same parameter value is passed into a function in all calls
// Upstart
diff --git a/src/test/ref/const-pointer.log b/src/test/ref/const-pointer.log
index afafad483..156f5c68b 100644
--- a/src/test/ref/const-pointer.log
+++ b/src/test/ref/const-pointer.log
@@ -126,7 +126,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
//Test that constant pointers are detected correctly
// Upstart
diff --git a/src/test/ref/const-signed-promotion.log b/src/test/ref/const-signed-promotion.log
index 253efd139..62a0115ea 100644
--- a/src/test/ref/const-signed-promotion.log
+++ b/src/test/ref/const-signed-promotion.log
@@ -166,7 +166,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test fragment promotion of a constant (400) to signed word even if it also matches an unsigned word
// Upstart
diff --git a/src/test/ref/const-word-pointer.log b/src/test/ref/const-word-pointer.log
index d3ad1c995..e3ab78db6 100644
--- a/src/test/ref/const-word-pointer.log
+++ b/src/test/ref/const-word-pointer.log
@@ -157,7 +157,7 @@ Allocated zp ZP_BYTE:6 [ main::$3 ]
Allocated zp ZP_BYTE:7 [ main::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a constant word pointers (pointing to a word placed on zeropage).
// The result when running is "CML!" on the screen.
diff --git a/src/test/ref/constabsmin.log b/src/test/ref/constabsmin.log
index 3301512c9..3d052a98d 100644
--- a/src/test/ref/constabsmin.log
+++ b/src/test/ref/constabsmin.log
@@ -78,7 +78,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/constant-string-concat-0.log b/src/test/ref/constant-string-concat-0.log
index ffdbe85e2..c56058d04 100644
--- a/src/test/ref/constant-string-concat-0.log
+++ b/src/test/ref/constant-string-concat-0.log
@@ -136,7 +136,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Concatenates string constants in different ways
// Upstart
diff --git a/src/test/ref/constant-string-concat.log b/src/test/ref/constant-string-concat.log
index cf095e06f..cf774dd70 100644
--- a/src/test/ref/constant-string-concat.log
+++ b/src/test/ref/constant-string-concat.log
@@ -125,7 +125,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Concatenates string constants in different ways
// Upstart
diff --git a/src/test/ref/constantmin.log b/src/test/ref/constantmin.log
index eb07e3c1b..13d8d123e 100644
--- a/src/test/ref/constantmin.log
+++ b/src/test/ref/constantmin.log
@@ -188,7 +188,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/constants.log b/src/test/ref/constants.log
index 7d47ed123..9f9b47e9f 100644
--- a/src/test/ref/constants.log
+++ b/src/test/ref/constants.log
@@ -1631,7 +1631,7 @@ Allocated zp ZP_BYTE:15 [ assert_byte::c#3 ]
Allocated zp ZP_WORD:16 [ memset::dst#2 memset::dst#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/cordic-atan2-16-ref.log b/src/test/ref/cordic-atan2-16-ref.log
index d0ce635ed..07fd82f22 100644
--- a/src/test/ref/cordic-atan2-16-ref.log
+++ b/src/test/ref/cordic-atan2-16-ref.log
@@ -2430,7 +2430,7 @@ Allocated zp ZP_BYTE:67 [ init_font_hex::$2 ]
Allocated zp ZP_BYTE:68 [ init_font_hex::idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Find atan2(x, y) using the CORDIC method
// See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf
diff --git a/src/test/ref/cordic-atan2-16.log b/src/test/ref/cordic-atan2-16.log
index 3c1bd9ffa..92b592c12 100644
--- a/src/test/ref/cordic-atan2-16.log
+++ b/src/test/ref/cordic-atan2-16.log
@@ -1844,7 +1844,7 @@ Allocated zp ZP_BYTE:49 [ init_font_hex::$2 ]
Allocated zp ZP_BYTE:50 [ init_font_hex::idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Find atan2(x, y) using the CORDIC method
// See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf
diff --git a/src/test/ref/cordic-atan2-clear.log b/src/test/ref/cordic-atan2-clear.log
index 61c50ae43..2c95adcf2 100644
--- a/src/test/ref/cordic-atan2-clear.log
+++ b/src/test/ref/cordic-atan2-clear.log
@@ -2072,7 +2072,7 @@ Allocated zp ZP_BYTE:60 [ init_font_hex::$2 ]
Allocated zp ZP_BYTE:61 [ init_font_hex::idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Find atan2(x, y) using the CORDIC method
// See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf
diff --git a/src/test/ref/cordic-atan2.log b/src/test/ref/cordic-atan2.log
index 4d3c2c90f..9468273b9 100644
--- a/src/test/ref/cordic-atan2.log
+++ b/src/test/ref/cordic-atan2.log
@@ -1527,7 +1527,7 @@ Allocated zp ZP_BYTE:29 [ init_font_hex::$2 ]
Allocated zp ZP_BYTE:30 [ init_font_hex::idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Find atan2(x, y) using the CORDIC method
// See http://bsvi.ru/uploads/CORDIC--_10EBA/cordic.pdf
diff --git a/src/test/ref/cpu-6502.asm b/src/test/ref/cpu-6502.asm
new file mode 100644
index 000000000..907bf44e4
--- /dev/null
+++ b/src/test/ref/cpu-6502.asm
@@ -0,0 +1,27 @@
+// Test the 6502 CPU without support for illegal opcodes
+// By a program that normally uses illegal opcodes
+.pc = $801 "Basic"
+:BasicUpstart(main)
+.pc = $80d "Program"
+main: {
+ .label screen = $400
+ ldx #0
+ b1:
+ cpx #$64
+ bcc b2
+ rts
+ b2:
+ lda #'*'
+ sta screen,x
+ txa
+ and #4
+ cmp #0
+ bne b3
+ txa
+ clc
+ adc #5
+ tax
+ b3:
+ inx
+ jmp b1
+}
diff --git a/src/test/ref/cpu-6502.cfg b/src/test/ref/cpu-6502.cfg
new file mode 100644
index 000000000..1e288221b
--- /dev/null
+++ b/src/test/ref/cpu-6502.cfg
@@ -0,0 +1,31 @@
+@begin: scope:[] from
+ [0] phi()
+ to:@1
+@1: scope:[] from @begin
+ [1] phi()
+ [2] call main
+ to:@end
+@end: scope:[] from @1
+ [3] phi()
+main: scope:[main] from @1
+ [4] phi()
+ to:main::@1
+main::@1: scope:[main] from main main::@3
+ [5] (byte) main::c#3 ← phi( main/(byte) 0 main::@3/(byte) main::c#1 )
+ [6] if((byte) main::c#3<(byte) $64) goto main::@2
+ to:main::@return
+main::@return: scope:[main] from main::@1
+ [7] return
+ to:@return
+main::@2: scope:[main] from main::@1
+ [8] *((const byte*) main::screen#0 + (byte) main::c#3) ← (byte) '*'
+ [9] (byte~) main::$1 ← (byte) main::c#3 & (byte) 4
+ [10] if((byte~) main::$1!=(byte) 0) goto main::@3
+ to:main::@4
+main::@4: scope:[main] from main::@2
+ [11] (byte) main::c#2 ← (byte) main::c#3 + (byte) 5
+ to:main::@3
+main::@3: scope:[main] from main::@2 main::@4
+ [12] (byte) main::c#5 ← phi( main::@2/(byte) main::c#3 main::@4/(byte) main::c#2 )
+ [13] (byte) main::c#1 ← ++ (byte) main::c#5
+ to:main::@1
diff --git a/src/test/ref/cpu-6502.log b/src/test/ref/cpu-6502.log
new file mode 100644
index 000000000..7c8aef170
--- /dev/null
+++ b/src/test/ref/cpu-6502.log
@@ -0,0 +1,483 @@
+Culled Empty Block (label) main::@5
+Culled Empty Block (label) main::@3
+Culled Empty Block (label) main::@6
+Culled Empty Block (label) main::@8
+
+CONTROL FLOW GRAPH SSA
+@begin: scope:[] from
+ to:@1
+main: scope:[main] from @1
+ (byte*) main::screen#0 ← ((byte*)) (number) $400
+ (byte) main::c#0 ← (number) 0
+ to:main::@1
+main::@1: scope:[main] from main main::@4
+ (byte) main::c#3 ← phi( main/(byte) main::c#0 main::@4/(byte) main::c#1 )
+ (bool~) main::$0 ← (byte) main::c#3 < (number) $64
+ if((bool~) main::$0) goto main::@2
+ to:main::@return
+main::@2: scope:[main] from main::@1
+ (byte) main::c#4 ← phi( main::@1/(byte) main::c#3 )
+ *((byte*) main::screen#0 + (byte) main::c#4) ← (byte) '*'
+ (number~) main::$1 ← (byte) main::c#4 & (number) 4
+ (bool~) main::$2 ← (number~) main::$1 == (number) 0
+ (bool~) main::$3 ← ! (bool~) main::$2
+ if((bool~) main::$3) goto main::@4
+ to:main::@7
+main::@4: scope:[main] from main::@2 main::@7
+ (byte) main::c#5 ← phi( main::@2/(byte) main::c#4 main::@7/(byte) main::c#2 )
+ (byte) main::c#1 ← ++ (byte) main::c#5
+ to:main::@1
+main::@7: scope:[main] from main::@2
+ (byte) main::c#6 ← phi( main::@2/(byte) main::c#4 )
+ (byte) main::c#2 ← (byte) main::c#6 + (number) 5
+ to:main::@4
+main::@return: scope:[main] from main::@1
+ return
+ to:@return
+@1: scope:[] from @begin
+ call main
+ to:@2
+@2: scope:[] from @1
+ to:@end
+@end: scope:[] from @2
+
+SYMBOL TABLE SSA
+(label) @1
+(label) @2
+(label) @begin
+(label) @end
+(void()) main()
+(bool~) main::$0
+(number~) main::$1
+(bool~) main::$2
+(bool~) main::$3
+(label) main::@1
+(label) main::@2
+(label) main::@4
+(label) main::@7
+(label) main::@return
+(byte) main::c
+(byte) main::c#0
+(byte) main::c#1
+(byte) main::c#2
+(byte) main::c#3
+(byte) main::c#4
+(byte) main::c#5
+(byte) main::c#6
+(byte*) main::screen
+(byte*) main::screen#0
+
+Adding number conversion cast (unumber) 0 in (byte) main::c#0 ← (number) 0
+Adding number conversion cast (unumber) $64 in (bool~) main::$0 ← (byte) main::c#3 < (number) $64
+Adding number conversion cast (unumber) 4 in (number~) main::$1 ← (byte) main::c#4 & (number) 4
+Adding number conversion cast (unumber) main::$1 in (number~) main::$1 ← (byte) main::c#4 & (unumber)(number) 4
+Adding number conversion cast (unumber) 0 in (bool~) main::$2 ← (unumber~) main::$1 == (number) 0
+Adding number conversion cast (unumber) 5 in (byte) main::c#2 ← (byte) main::c#6 + (number) 5
+Successful SSA optimization PassNAddNumberTypeConversions
+Inlining cast (byte*) main::screen#0 ← (byte*)(number) $400
+Inlining cast (byte) main::c#0 ← (unumber)(number) 0
+Successful SSA optimization Pass2InlineCast
+Simplifying constant pointer cast (byte*) 1024
+Simplifying constant integer cast 0
+Simplifying constant integer cast $64
+Simplifying constant integer cast 4
+Simplifying constant integer cast 0
+Simplifying constant integer cast 5
+Successful SSA optimization PassNCastSimplification
+Finalized unsigned number type (byte) 0
+Finalized unsigned number type (byte) $64
+Finalized unsigned number type (byte) 4
+Finalized unsigned number type (byte) 0
+Finalized unsigned number type (byte) 5
+Successful SSA optimization PassNFinalizeNumberTypeConversions
+Inferred type updated to byte in (unumber~) main::$1 ← (byte) main::c#4 & (byte) 4
+Inversing boolean not [9] (bool~) main::$3 ← (byte~) main::$1 != (byte) 0 from [8] (bool~) main::$2 ← (byte~) main::$1 == (byte) 0
+Successful SSA optimization Pass2UnaryNotSimplification
+Alias (byte) main::c#3 = (byte) main::c#4 (byte) main::c#6
+Successful SSA optimization Pass2AliasElimination
+Simple Condition (bool~) main::$0 [4] if((byte) main::c#3<(byte) $64) goto main::@2
+Simple Condition (bool~) main::$3 [10] if((byte~) main::$1!=(byte) 0) goto main::@4
+Successful SSA optimization Pass2ConditionalJumpSimplification
+Constant (const byte*) main::screen#0 = (byte*) 1024
+Constant (const byte) main::c#0 = 0
+Successful SSA optimization Pass2ConstantIdentification
+Inlining constant with var siblings (const byte) main::c#0
+Constant inlined main::c#0 = (byte) 0
+Successful SSA optimization Pass2ConstantInlining
+Added new block during phi lifting main::@9(between main::@2 and main::@4)
+Adding NOP phi() at start of @begin
+Adding NOP phi() at start of @1
+Adding NOP phi() at start of @2
+Adding NOP phi() at start of @end
+Adding NOP phi() at start of main
+CALL GRAPH
+Calls in [] to main:2
+
+Created 2 initial phi equivalence classes
+Coalesced [13] main::c#9 ← main::c#2
+Coalesced [16] main::c#7 ← main::c#1
+Coalesced [17] main::c#8 ← main::c#3
+Coalesced down to 1 phi equivalence classes
+Culled Empty Block (label) @2
+Culled Empty Block (label) main::@9
+Renumbering block main::@4 to main::@3
+Renumbering block main::@7 to main::@4
+Adding NOP phi() at start of @begin
+Adding NOP phi() at start of @1
+Adding NOP phi() at start of @end
+Adding NOP phi() at start of main
+
+FINAL CONTROL FLOW GRAPH
+@begin: scope:[] from
+ [0] phi()
+ to:@1
+@1: scope:[] from @begin
+ [1] phi()
+ [2] call main
+ to:@end
+@end: scope:[] from @1
+ [3] phi()
+main: scope:[main] from @1
+ [4] phi()
+ to:main::@1
+main::@1: scope:[main] from main main::@3
+ [5] (byte) main::c#3 ← phi( main/(byte) 0 main::@3/(byte) main::c#1 )
+ [6] if((byte) main::c#3<(byte) $64) goto main::@2
+ to:main::@return
+main::@return: scope:[main] from main::@1
+ [7] return
+ to:@return
+main::@2: scope:[main] from main::@1
+ [8] *((const byte*) main::screen#0 + (byte) main::c#3) ← (byte) '*'
+ [9] (byte~) main::$1 ← (byte) main::c#3 & (byte) 4
+ [10] if((byte~) main::$1!=(byte) 0) goto main::@3
+ to:main::@4
+main::@4: scope:[main] from main::@2
+ [11] (byte) main::c#2 ← (byte) main::c#3 + (byte) 5
+ to:main::@3
+main::@3: scope:[main] from main::@2 main::@4
+ [12] (byte) main::c#5 ← phi( main::@2/(byte) main::c#3 main::@4/(byte) main::c#2 )
+ [13] (byte) main::c#1 ← ++ (byte) main::c#5
+ to:main::@1
+
+
+VARIABLE REGISTER WEIGHTS
+(void()) main()
+(byte~) main::$1 22.0
+(byte) main::c
+(byte) main::c#1 22.0
+(byte) main::c#2 22.0
+(byte) main::c#3 13.2
+(byte) main::c#5 33.0
+(byte*) main::screen
+
+Initial phi equivalence classes
+[ main::c#5 main::c#3 main::c#1 main::c#2 ]
+Added variable main::$1 to zero page equivalence class [ main::$1 ]
+Complete equivalence classes
+[ main::c#5 main::c#3 main::c#1 main::c#2 ]
+[ main::$1 ]
+Allocated zp ZP_BYTE:2 [ main::c#5 main::c#3 main::c#1 main::c#2 ]
+Allocated zp ZP_BYTE:3 [ main::$1 ]
+
+INITIAL ASM
+Target platform is c64basic / MOS6502
+ // File Comments
+// Test the 6502 CPU without support for illegal opcodes
+// By a program that normally uses illegal opcodes
+ // Upstart
+.pc = $801 "Basic"
+:BasicUpstart(bbegin)
+.pc = $80d "Program"
+ // Global Constants & labels
+ // @begin
+bbegin:
+ // [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+ jmp b1
+ // @1
+b1:
+ // [2] call main
+ // [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
+ jsr main
+ // [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
+ jmp bend
+ // @end
+bend:
+ // main
+main: {
+ .label screen = $400
+ .label _1 = 3
+ .label c = 2
+ // [5] phi from main to main::@1 [phi:main->main::@1]
+ b1_from_main:
+ // [5] phi (byte) main::c#3 = (byte) 0 [phi:main->main::@1#0] -- vbuz1=vbuc1
+ lda #0
+ sta.z c
+ jmp b1
+ // main::@1
+ b1:
+ // [6] if((byte) main::c#3<(byte) $64) goto main::@2 -- vbuz1_lt_vbuc1_then_la1
+ lda.z c
+ cmp #$64
+ bcc b2
+ jmp breturn
+ // main::@return
+ breturn:
+ // [7] return
+ rts
+ // main::@2
+ b2:
+ // [8] *((const byte*) main::screen#0 + (byte) main::c#3) ← (byte) '*' -- pbuc1_derefidx_vbuz1=vbuc2
+ lda #'*'
+ ldy.z c
+ sta screen,y
+ // [9] (byte~) main::$1 ← (byte) main::c#3 & (byte) 4 -- vbuz1=vbuz2_band_vbuc1
+ lda #4
+ and.z c
+ sta.z _1
+ // [10] if((byte~) main::$1!=(byte) 0) goto main::@3 -- vbuz1_neq_0_then_la1
+ lda.z _1
+ cmp #0
+ bne b3_from_b2
+ jmp b4
+ // main::@4
+ b4:
+ // [11] (byte) main::c#2 ← (byte) main::c#3 + (byte) 5 -- vbuz1=vbuz1_plus_vbuc1
+ lda #5
+ clc
+ adc.z c
+ sta.z c
+ // [12] phi from main::@2 main::@4 to main::@3 [phi:main::@2/main::@4->main::@3]
+ b3_from_b2:
+ b3_from_b4:
+ // [12] phi (byte) main::c#5 = (byte) main::c#3 [phi:main::@2/main::@4->main::@3#0] -- register_copy
+ jmp b3
+ // main::@3
+ b3:
+ // [13] (byte) main::c#1 ← ++ (byte) main::c#5 -- vbuz1=_inc_vbuz1
+ inc.z c
+ // [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+ b1_from_b3:
+ // [5] phi (byte) main::c#3 = (byte) main::c#1 [phi:main::@3->main::@1#0] -- register_copy
+ jmp b1
+}
+ // File Data
+
+REGISTER UPLIFT POTENTIAL REGISTERS
+Statement [8] *((const byte*) main::screen#0 + (byte) main::c#3) ← (byte) '*' [ main::c#3 ] ( main:2 [ main::c#3 ] ) always clobbers reg byte a
+Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ main::c#5 main::c#3 main::c#1 main::c#2 ]
+Statement [9] (byte~) main::$1 ← (byte) main::c#3 & (byte) 4 [ main::c#3 main::$1 ] ( main:2 [ main::c#3 main::$1 ] ) always clobbers reg byte a
+Statement [11] (byte) main::c#2 ← (byte) main::c#3 + (byte) 5 [ main::c#2 ] ( main:2 [ main::c#2 ] ) always clobbers reg byte a
+Statement [8] *((const byte*) main::screen#0 + (byte) main::c#3) ← (byte) '*' [ main::c#3 ] ( main:2 [ main::c#3 ] ) always clobbers reg byte a
+Statement [9] (byte~) main::$1 ← (byte) main::c#3 & (byte) 4 [ main::c#3 main::$1 ] ( main:2 [ main::c#3 main::$1 ] ) always clobbers reg byte a
+Statement [11] (byte) main::c#2 ← (byte) main::c#3 + (byte) 5 [ main::c#2 ] ( main:2 [ main::c#2 ] ) always clobbers reg byte a
+Potential registers zp ZP_BYTE:2 [ main::c#5 main::c#3 main::c#1 main::c#2 ] : zp ZP_BYTE:2 , reg byte x , reg byte y ,
+Potential registers zp ZP_BYTE:3 [ main::$1 ] : zp ZP_BYTE:3 , reg byte a , reg byte x , reg byte y ,
+
+REGISTER UPLIFT SCOPES
+Uplift Scope [main] 90.2: zp ZP_BYTE:2 [ main::c#5 main::c#3 main::c#1 main::c#2 ] 22: zp ZP_BYTE:3 [ main::$1 ]
+Uplift Scope []
+
+Uplifting [main] best 488 combination reg byte x [ main::c#5 main::c#3 main::c#1 main::c#2 ] reg byte a [ main::$1 ]
+Uplifting [] best 488 combination
+
+ASSEMBLER BEFORE OPTIMIZATION
+ // File Comments
+// Test the 6502 CPU without support for illegal opcodes
+// By a program that normally uses illegal opcodes
+ // Upstart
+.pc = $801 "Basic"
+:BasicUpstart(bbegin)
+.pc = $80d "Program"
+ // Global Constants & labels
+ // @begin
+bbegin:
+ // [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+ jmp b1
+ // @1
+b1:
+ // [2] call main
+ // [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
+ jsr main
+ // [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
+ jmp bend
+ // @end
+bend:
+ // main
+main: {
+ .label screen = $400
+ // [5] phi from main to main::@1 [phi:main->main::@1]
+ b1_from_main:
+ // [5] phi (byte) main::c#3 = (byte) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1
+ ldx #0
+ jmp b1
+ // main::@1
+ b1:
+ // [6] if((byte) main::c#3<(byte) $64) goto main::@2 -- vbuxx_lt_vbuc1_then_la1
+ cpx #$64
+ bcc b2
+ jmp breturn
+ // main::@return
+ breturn:
+ // [7] return
+ rts
+ // main::@2
+ b2:
+ // [8] *((const byte*) main::screen#0 + (byte) main::c#3) ← (byte) '*' -- pbuc1_derefidx_vbuxx=vbuc2
+ lda #'*'
+ sta screen,x
+ // [9] (byte~) main::$1 ← (byte) main::c#3 & (byte) 4 -- vbuaa=vbuxx_band_vbuc1
+ txa
+ and #4
+ // [10] if((byte~) main::$1!=(byte) 0) goto main::@3 -- vbuaa_neq_0_then_la1
+ cmp #0
+ bne b3_from_b2
+ jmp b4
+ // main::@4
+ b4:
+ // [11] (byte) main::c#2 ← (byte) main::c#3 + (byte) 5 -- vbuxx=vbuxx_plus_vbuc1
+ txa
+ clc
+ adc #5
+ tax
+ // [12] phi from main::@2 main::@4 to main::@3 [phi:main::@2/main::@4->main::@3]
+ b3_from_b2:
+ b3_from_b4:
+ // [12] phi (byte) main::c#5 = (byte) main::c#3 [phi:main::@2/main::@4->main::@3#0] -- register_copy
+ jmp b3
+ // main::@3
+ b3:
+ // [13] (byte) main::c#1 ← ++ (byte) main::c#5 -- vbuxx=_inc_vbuxx
+ inx
+ // [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+ b1_from_b3:
+ // [5] phi (byte) main::c#3 = (byte) main::c#1 [phi:main::@3->main::@1#0] -- register_copy
+ jmp b1
+}
+ // File Data
+
+ASSEMBLER OPTIMIZATIONS
+Removing instruction jmp b1
+Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b4
+Removing instruction jmp b3
+Succesful ASM optimization Pass5NextJumpElimination
+Replacing label b3_from_b2 with b3
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b3_from_b2:
+Removing instruction b3_from_b4:
+Succesful ASM optimization Pass5RedundantLabelElimination
+Removing instruction bend:
+Removing instruction b1_from_main:
+Removing instruction breturn:
+Removing instruction b4:
+Removing instruction b1_from_b3:
+Succesful ASM optimization Pass5UnusedLabelElimination
+Updating BasicUpstart to call main directly
+Removing instruction jsr main
+Succesful ASM optimization Pass5SkipBegin
+Removing instruction bbegin:
+Succesful ASM optimization Pass5UnusedLabelElimination
+
+FINAL SYMBOL TABLE
+(label) @1
+(label) @begin
+(label) @end
+(void()) main()
+(byte~) main::$1 reg byte a 22.0
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@return
+(byte) main::c
+(byte) main::c#1 reg byte x 22.0
+(byte) main::c#2 reg byte x 22.0
+(byte) main::c#3 reg byte x 13.2
+(byte) main::c#5 reg byte x 33.0
+(byte*) main::screen
+(const byte*) main::screen#0 screen = (byte*) 1024
+
+reg byte x [ main::c#5 main::c#3 main::c#1 main::c#2 ]
+reg byte a [ main::$1 ]
+
+
+FINAL ASSEMBLER
+Score: 356
+
+ // File Comments
+// Test the 6502 CPU without support for illegal opcodes
+// By a program that normally uses illegal opcodes
+ // Upstart
+.pc = $801 "Basic"
+:BasicUpstart(main)
+.pc = $80d "Program"
+ // Global Constants & labels
+ // @begin
+ // [1] phi from @begin to @1 [phi:@begin->@1]
+ // @1
+ // [2] call main
+ // [4] phi from @1 to main [phi:@1->main]
+ // [3] phi from @1 to @end [phi:@1->@end]
+ // @end
+ // main
+main: {
+ .label screen = $400
+ // [5] phi from main to main::@1 [phi:main->main::@1]
+ // [5] phi (byte) main::c#3 = (byte) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1
+ ldx #0
+ // main::@1
+ b1:
+ // while(c<100)
+ // [6] if((byte) main::c#3<(byte) $64) goto main::@2 -- vbuxx_lt_vbuc1_then_la1
+ cpx #$64
+ bcc b2
+ // main::@return
+ // }
+ // [7] return
+ rts
+ // main::@2
+ b2:
+ // screen[c] = '*'
+ // [8] *((const byte*) main::screen#0 + (byte) main::c#3) ← (byte) '*' -- pbuc1_derefidx_vbuxx=vbuc2
+ lda #'*'
+ sta screen,x
+ // c&4
+ // [9] (byte~) main::$1 ← (byte) main::c#3 & (byte) 4 -- vbuaa=vbuxx_band_vbuc1
+ txa
+ and #4
+ // if((c&4)==0)
+ // [10] if((byte~) main::$1!=(byte) 0) goto main::@3 -- vbuaa_neq_0_then_la1
+ cmp #0
+ bne b3
+ // main::@4
+ // c+=5
+ // [11] (byte) main::c#2 ← (byte) main::c#3 + (byte) 5 -- vbuxx=vbuxx_plus_vbuc1
+ txa
+ clc
+ adc #5
+ tax
+ // [12] phi from main::@2 main::@4 to main::@3 [phi:main::@2/main::@4->main::@3]
+ // [12] phi (byte) main::c#5 = (byte) main::c#3 [phi:main::@2/main::@4->main::@3#0] -- register_copy
+ // main::@3
+ b3:
+ // c++;
+ // [13] (byte) main::c#1 ← ++ (byte) main::c#5 -- vbuxx=_inc_vbuxx
+ inx
+ // [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+ // [5] phi (byte) main::c#3 = (byte) main::c#1 [phi:main::@3->main::@1#0] -- register_copy
+ jmp b1
+}
+ // File Data
+
diff --git a/src/test/ref/cpu-6502.sym b/src/test/ref/cpu-6502.sym
new file mode 100644
index 000000000..ee228c973
--- /dev/null
+++ b/src/test/ref/cpu-6502.sym
@@ -0,0 +1,20 @@
+(label) @1
+(label) @begin
+(label) @end
+(void()) main()
+(byte~) main::$1 reg byte a 22.0
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@return
+(byte) main::c
+(byte) main::c#1 reg byte x 22.0
+(byte) main::c#2 reg byte x 22.0
+(byte) main::c#3 reg byte x 13.2
+(byte) main::c#5 reg byte x 33.0
+(byte*) main::screen
+(const byte*) main::screen#0 screen = (byte*) 1024
+
+reg byte x [ main::c#5 main::c#3 main::c#1 main::c#2 ]
+reg byte a [ main::$1 ]
diff --git a/src/test/ref/danny-joystick-problem.log b/src/test/ref/danny-joystick-problem.log
index 3c1868fad..59e5ed089 100644
--- a/src/test/ref/danny-joystick-problem.log
+++ b/src/test/ref/danny-joystick-problem.log
@@ -107,7 +107,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::port4Value#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests problem writing/reading joystick encountered by Danny Spijksma
// https://www.protovision.games/hardw/build4player.php?language=en&fbclid=IwAR1MJLgQjOU0zVa0ax2aNeGa-xVbE9IGY9zC6b6eInTV4HQzoUAoCPoXu14
diff --git a/src/test/ref/deep-nesting.log b/src/test/ref/deep-nesting.log
index 81076e2cb..cedf65644 100644
--- a/src/test/ref/deep-nesting.log
+++ b/src/test/ref/deep-nesting.log
@@ -7179,7 +7179,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test that the compiler handles deep nesting well -- mainly a performance issue.
// Upstart
diff --git a/src/test/ref/default-font.log b/src/test/ref/default-font.log
index 98a74db8a..8b0503f13 100644
--- a/src/test/ref/default-font.log
+++ b/src/test/ref/default-font.log
@@ -450,7 +450,7 @@ Allocated zp ZP_BYTE:6 [ main::y#2 main::y#1 ]
Allocated zp ZP_WORD:7 [ memset::dst#2 memset::dst#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Show default font on screen
// Upstart
diff --git a/src/test/ref/deref-to-derefidx-2.log b/src/test/ref/deref-to-derefidx-2.log
index cd2bc0016..6dae8ca90 100644
--- a/src/test/ref/deref-to-derefidx-2.log
+++ b/src/test/ref/deref-to-derefidx-2.log
@@ -232,7 +232,7 @@ Allocated zp ZP_BYTE:4 [ screen_idx#10 screen_idx#11 ]
Allocated zp ZP_BYTE:5 [ print::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests optimizing derefs of *(ptr+b) to ptr[b - even when a noop-cast is needed
// Upstart
diff --git a/src/test/ref/deref-to-derefidx.log b/src/test/ref/deref-to-derefidx.log
index 03997b3ea..05a691e82 100644
--- a/src/test/ref/deref-to-derefidx.log
+++ b/src/test/ref/deref-to-derefidx.log
@@ -214,7 +214,7 @@ Allocated zp ZP_WORD:2 [ print::m#2 ]
Allocated zp ZP_BYTE:4 [ idx#10 idx#11 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests optimizing derefs of *(ptr+b) to ptr[b]
// Upstart
diff --git a/src/test/ref/derefidx-word-0.log b/src/test/ref/derefidx-word-0.log
index 262a47df0..72e1afc79 100644
--- a/src/test/ref/derefidx-word-0.log
+++ b/src/test/ref/derefidx-word-0.log
@@ -138,7 +138,7 @@ Allocated zp ZP_WORD:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_WORD:4 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that array-indexing by a word variable is turned into pointer addition
// Upstart
diff --git a/src/test/ref/derefidx-word-1.log b/src/test/ref/derefidx-word-1.log
index 1dd3b0ef2..d4060bb2f 100644
--- a/src/test/ref/derefidx-word-1.log
+++ b/src/test/ref/derefidx-word-1.log
@@ -82,7 +82,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that array-indexing by a constant word is turned into a constant pointer
// Upstart
diff --git a/src/test/ref/derefidx-word-2.log b/src/test/ref/derefidx-word-2.log
index 9e7b4d547..bde8bb827 100644
--- a/src/test/ref/derefidx-word-2.log
+++ b/src/test/ref/derefidx-word-2.log
@@ -133,7 +133,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that array-indexing by a word variable that is a sum of a constant word and a byte is turned back into derefidx
// Upstart
diff --git a/src/test/ref/divide-2s.log b/src/test/ref/divide-2s.log
index 524eb7c94..aac53117c 100644
--- a/src/test/ref/divide-2s.log
+++ b/src/test/ref/divide-2s.log
@@ -248,7 +248,7 @@ Allocated zp ZP_BYTE:6 [ main::sb#0 ]
Allocated zp ZP_BYTE:7 [ main::$12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Check that division by factors of 2 is converted to shifts
// Upstart
diff --git a/src/test/ref/double-assignment.log b/src/test/ref/double-assignment.log
index a8da454a5..9dfb299d8 100644
--- a/src/test/ref/double-assignment.log
+++ b/src/test/ref/double-assignment.log
@@ -111,7 +111,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test that a double-assignment works.
// Upstart
diff --git a/src/test/ref/double-import.log b/src/test/ref/double-import.log
index db732917b..f9b2390b1 100644
--- a/src/test/ref/double-import.log
+++ b/src/test/ref/double-import.log
@@ -83,7 +83,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/double-indexing-arrays.log b/src/test/ref/double-indexing-arrays.log
index 66bd8fff2..d87bc51a8 100644
--- a/src/test/ref/double-indexing-arrays.log
+++ b/src/test/ref/double-indexing-arrays.log
@@ -334,7 +334,7 @@ Complete equivalence classes
[ main::x#2 main::x#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that constant offset indexing into arrays is handled correctly
// Upstart
diff --git a/src/test/ref/duplicate-loop-problem.log b/src/test/ref/duplicate-loop-problem.log
index 575b97a03..2e901954c 100644
--- a/src/test/ref/duplicate-loop-problem.log
+++ b/src/test/ref/duplicate-loop-problem.log
@@ -163,7 +163,7 @@ Allocated zp ZP_BYTE:2 [ key#1 ]
Allocated zp ZP_BYTE:3 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Duplicate Loop Problem from Richard-William Loerakker
// Resulted in infinite loop in loop depth analysis
diff --git a/src/test/ref/dword.log b/src/test/ref/dword.log
index 238ea24c3..e3009566d 100644
--- a/src/test/ref/dword.log
+++ b/src/test/ref/dword.log
@@ -155,7 +155,7 @@ Allocated zp ZP_DWORD:3 [ main::b#0 ]
Allocated zp ZP_BYTE:7 [ main::c#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/emptyblock-error.log b/src/test/ref/emptyblock-error.log
index f6dd94b76..9fc5e4b99 100644
--- a/src/test/ref/emptyblock-error.log
+++ b/src/test/ref/emptyblock-error.log
@@ -210,7 +210,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Error cleaning up unused blocks
// Upstart
diff --git a/src/test/ref/encoding-literal-char.log b/src/test/ref/encoding-literal-char.log
index 0ca0355dc..c4a87841a 100644
--- a/src/test/ref/encoding-literal-char.log
+++ b/src/test/ref/encoding-literal-char.log
@@ -244,7 +244,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests encoding of literal chars
// Upstart
diff --git a/src/test/ref/enum-0.log b/src/test/ref/enum-0.log
index 0608d31fe..2313e5884 100644
--- a/src/test/ref/enum-0.log
+++ b/src/test/ref/enum-0.log
@@ -83,7 +83,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - two-value enum
// Upstart
diff --git a/src/test/ref/enum-1.log b/src/test/ref/enum-1.log
index f37d8ca67..c06a9972c 100644
--- a/src/test/ref/enum-1.log
+++ b/src/test/ref/enum-1.log
@@ -84,7 +84,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - three-value enum with specified integer values and increment
// Upstart
diff --git a/src/test/ref/enum-2.log b/src/test/ref/enum-2.log
index d45802a18..2f703580c 100644
--- a/src/test/ref/enum-2.log
+++ b/src/test/ref/enum-2.log
@@ -84,7 +84,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - char values with increment
// Upstart
diff --git a/src/test/ref/enum-3.log b/src/test/ref/enum-3.log
index 15267fbc9..2b3ab880f 100644
--- a/src/test/ref/enum-3.log
+++ b/src/test/ref/enum-3.log
@@ -86,7 +86,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - value with complex calculation
// Upstart
diff --git a/src/test/ref/enum-4.log b/src/test/ref/enum-4.log
index ad0aa6bd2..6766cd4cb 100644
--- a/src/test/ref/enum-4.log
+++ b/src/test/ref/enum-4.log
@@ -81,7 +81,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - inline enum definitions
// Upstart
diff --git a/src/test/ref/enum-5.log b/src/test/ref/enum-5.log
index f6124506e..e27502f7a 100644
--- a/src/test/ref/enum-5.log
+++ b/src/test/ref/enum-5.log
@@ -121,7 +121,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - multiple inline enum definitions
// Upstart
diff --git a/src/test/ref/enum-6.log b/src/test/ref/enum-6.log
index 852fed2d9..c2fba75c6 100644
--- a/src/test/ref/enum-6.log
+++ b/src/test/ref/enum-6.log
@@ -99,7 +99,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - anonymous enum definition
// Upstart
diff --git a/src/test/ref/enum-7.log b/src/test/ref/enum-7.log
index f1031987e..0d547df6e 100644
--- a/src/test/ref/enum-7.log
+++ b/src/test/ref/enum-7.log
@@ -118,7 +118,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - struct with enum
// Upstart
diff --git a/src/test/ref/enum-8.log b/src/test/ref/enum-8.log
index d465a8872..0e62f8e50 100644
--- a/src/test/ref/enum-8.log
+++ b/src/test/ref/enum-8.log
@@ -120,7 +120,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test of simple enum - struct with inline anonymous enum
// Upstart
diff --git a/src/test/ref/euclid-3.log b/src/test/ref/euclid-3.log
index a2705f44b..627470d8c 100644
--- a/src/test/ref/euclid-3.log
+++ b/src/test/ref/euclid-3.log
@@ -1251,7 +1251,7 @@ Allocated zp ZP_BYTE:15 [ print_byte::$0 ]
Allocated zp ZP_BYTE:16 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
/*
* Find greatest common denominator using subtraction-based Euclidian algorithm
diff --git a/src/test/ref/euclid-problem-2.log b/src/test/ref/euclid-problem-2.log
index b893420bf..8391ff3bd 100644
--- a/src/test/ref/euclid-problem-2.log
+++ b/src/test/ref/euclid-problem-2.log
@@ -465,7 +465,7 @@ Allocated zp ZP_BYTE:10 [ euclid::return#3 ]
Allocated zp ZP_BYTE:11 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates a problem where wrong alive ranges result in clobbering an alive variable
// The compiler does not realize that A is alive in the statement b=b-a - and thus can clobber it.
diff --git a/src/test/ref/euclid-problem.log b/src/test/ref/euclid-problem.log
index 0ae22e1f1..c216ef46e 100644
--- a/src/test/ref/euclid-problem.log
+++ b/src/test/ref/euclid-problem.log
@@ -192,7 +192,7 @@ Allocated zp ZP_BYTE:2 [ main::a#2 main::a#1 ]
Allocated zp ZP_BYTE:3 [ main::b#2 main::b#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates a problem where wrong alive ranges result in clobbering an alive variable
// The compiler does not realize that A is alive in the statement b=b-a - and thus can clobber it.
diff --git a/src/test/ref/examples/3d/3d.log b/src/test/ref/examples/3d/3d.log
index c971287c9..7d0d026e7 100644
--- a/src/test/ref/examples/3d/3d.log
+++ b/src/test/ref/examples/3d/3d.log
@@ -4747,7 +4747,7 @@ Allocated zp ZP_WORD:97 [ debug_print_init::$62 ]
Allocated zp ZP_WORD:99 [ debug_print_init::$65 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// 3D Rotation using a Rotation Matrix
// Based on:
diff --git a/src/test/ref/examples/3d/perspective.log b/src/test/ref/examples/3d/perspective.log
index 71914ac50..c94784865 100644
--- a/src/test/ref/examples/3d/perspective.log
+++ b/src/test/ref/examples/3d/perspective.log
@@ -1725,7 +1725,7 @@ Allocated zp ZP_BYTE:22 [ mulf_init::$8 ]
Allocated zp ZP_BYTE:23 [ mulf_init::$10 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// 3D Rotation using a Rotation Matrix
// Based on:
diff --git a/src/test/ref/examples/bresenham/bitmap-bresenham.log b/src/test/ref/examples/bresenham/bitmap-bresenham.log
index deb111553..ac6b14a18 100644
--- a/src/test/ref/examples/bresenham/bitmap-bresenham.log
+++ b/src/test/ref/examples/bresenham/bitmap-bresenham.log
@@ -2757,7 +2757,7 @@ Allocated zp ZP_BYTE:66 [ bitmap_init::$8 ]
Allocated zp ZP_BYTE:67 [ bitmap_init::$9 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/examples/chargen/chargen-analysis.log b/src/test/ref/examples/chargen/chargen-analysis.log
index c62407142..2d0b97664 100644
--- a/src/test/ref/examples/chargen/chargen-analysis.log
+++ b/src/test/ref/examples/chargen/chargen-analysis.log
@@ -2561,7 +2561,7 @@ Allocated zp ZP_BYTE:60 [ keyboard_matrix_read::return#0 ]
Allocated zp ZP_BYTE:61 [ keyboard_get_keycode::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Allows analysis of the CHARGEN ROM font
// Upstart
diff --git a/src/test/ref/examples/fastmultiply/fastmultiply8.log b/src/test/ref/examples/fastmultiply/fastmultiply8.log
index 7eefd17af..151f8a9c8 100644
--- a/src/test/ref/examples/fastmultiply/fastmultiply8.log
+++ b/src/test/ref/examples/fastmultiply/fastmultiply8.log
@@ -1303,7 +1303,7 @@ Allocated zp ZP_BYTE:31 [ print_byte_at::$2 ]
Allocated zp ZP_BYTE:32 [ fmul8::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Seriously fast multiply 8-bit version (8bit*8bit=8bit)
// Multiplies two signed 8-bit numbers and results in an 8-bit number
diff --git a/src/test/ref/examples/fire/fire.log b/src/test/ref/examples/fire/fire.log
index c836bc46f..049758af1 100644
--- a/src/test/ref/examples/fire/fire.log
+++ b/src/test/ref/examples/fire/fire.log
@@ -1746,7 +1746,7 @@ Allocated zp ZP_BYTE:44 [ makecharset::$12 ]
Allocated zp ZP_BYTE:45 [ makecharset::$13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A KickC version of the fire routine from the CC65 samples
// (w)2002 by groepaz/hitmen
diff --git a/src/test/ref/examples/helloworld/helloworld.log b/src/test/ref/examples/helloworld/helloworld.log
index 1e4d8a2ca..735b9dd8c 100644
--- a/src/test/ref/examples/helloworld/helloworld.log
+++ b/src/test/ref/examples/helloworld/helloworld.log
@@ -376,7 +376,7 @@ Allocated zp ZP_WORD:4 [ print_str::str#2 print_str::str#0 ]
Allocated zp ZP_WORD:6 [ print_char_cursor#10 print_char_cursor#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/examples/irq/irq-hyperscreen.log b/src/test/ref/examples/irq/irq-hyperscreen.log
index ca036482c..1252e3ebf 100644
--- a/src/test/ref/examples/irq/irq-hyperscreen.log
+++ b/src/test/ref/examples/irq/irq-hyperscreen.log
@@ -294,7 +294,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A raster IRQ that opens the top/bottom border.
// Upstart
diff --git a/src/test/ref/examples/linking/linking.log b/src/test/ref/examples/linking/linking.log
index fd8a80f24..fd3facfe1 100644
--- a/src/test/ref/examples/linking/linking.log
+++ b/src/test/ref/examples/linking/linking.log
@@ -295,7 +295,7 @@ Allocated zp ZP_BYTE:6 [ fillscreen::c#0 ]
Allocated zp ZP_BYTE:7 [ fillscreen::$2 ]
INITIAL ASM
-Target platform is custom / 6502X
+Target platform is custom / MOS6502X
// File Comments
// Example showing how to perform linking using a linker-file
// The linker file is created using KickAssembler segments.
diff --git a/src/test/ref/examples/multiplexer/simple-multiplexer.log b/src/test/ref/examples/multiplexer/simple-multiplexer.log
index 5f2bd4220..37735d74e 100644
--- a/src/test/ref/examples/multiplexer/simple-multiplexer.log
+++ b/src/test/ref/examples/multiplexer/simple-multiplexer.log
@@ -2259,7 +2259,7 @@ Allocated zp ZP_BYTE:32 [ plexSort::s#2 ]
Allocated zp ZP_BYTE:33 [ init::$8 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A simple usage of the flexible sprite multiplexer routine
// Upstart
diff --git a/src/test/ref/examples/music/music.log b/src/test/ref/examples/music/music.log
index c95997866..a9bdeb02e 100644
--- a/src/test/ref/examples/music/music.log
+++ b/src/test/ref/examples/music/music.log
@@ -138,7 +138,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A simple SID music player playing music in the main loop.
// Upstart
diff --git a/src/test/ref/examples/music/music_irq.log b/src/test/ref/examples/music/music_irq.log
index fced4571a..78c4515bf 100644
--- a/src/test/ref/examples/music/music_irq.log
+++ b/src/test/ref/examples/music/music_irq.log
@@ -209,7 +209,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A simple SID music player using RASTER IRQ
// Upstart
diff --git a/src/test/ref/examples/nmisamples/nmisamples.log b/src/test/ref/examples/nmisamples/nmisamples.log
index 28ce0daa8..4d7f66860 100644
--- a/src/test/ref/examples/nmisamples/nmisamples.log
+++ b/src/test/ref/examples/nmisamples/nmisamples.log
@@ -346,7 +346,7 @@ Allocated zp ZP_BYTE:5 [ nmi2::$2 ]
Allocated zp ZP_BYTE:6 [ nmi::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// NMI Sample Player using the SID volume register
// Code by Scan of Desire (Richard-William Loerakker)
diff --git a/src/test/ref/examples/plasma/plasma-unroll.log b/src/test/ref/examples/plasma/plasma-unroll.log
index aa6647eda..b443f6fba 100644
--- a/src/test/ref/examples/plasma/plasma-unroll.log
+++ b/src/test/ref/examples/plasma/plasma-unroll.log
@@ -3371,7 +3371,7 @@ Allocated zp ZP_BYTE:65 [ makecharset::$7 ]
Allocated zp ZP_BYTE:66 [ sid_rnd::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A KickC version of the plasma routine from the CC65 samples
// This version has an unrolled inner loop to reach 50+FPS
diff --git a/src/test/ref/examples/plasma/plasma.log b/src/test/ref/examples/plasma/plasma.log
index fc7429e46..7fe600aef 100644
--- a/src/test/ref/examples/plasma/plasma.log
+++ b/src/test/ref/examples/plasma/plasma.log
@@ -2646,7 +2646,7 @@ Allocated zp ZP_BYTE:41 [ makecharset::$7 ]
Allocated zp ZP_BYTE:42 [ sid_rnd::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A KickC version of the plasma routine from the CC65 samples
// (w)2001 by groepaz/hitmen
diff --git a/src/test/ref/examples/rasterbars/raster-bars.log b/src/test/ref/examples/rasterbars/raster-bars.log
index 97785e18a..2929c7877 100644
--- a/src/test/ref/examples/rasterbars/raster-bars.log
+++ b/src/test/ref/examples/rasterbars/raster-bars.log
@@ -273,7 +273,7 @@ Allocated zp ZP_BYTE:2 [ raster::col#2 raster::col#0 raster::col#1 ]
Allocated zp ZP_BYTE:3 [ raster::i#2 raster::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/examples/rotate/rotate.log b/src/test/ref/examples/rotate/rotate.log
index e419122df..0adb04cbe 100644
--- a/src/test/ref/examples/rotate/rotate.log
+++ b/src/test/ref/examples/rotate/rotate.log
@@ -2688,7 +2688,7 @@ Allocated zp ZP_BYTE:96 [ mulf_init::$12 ]
Allocated zp ZP_BYTE:97 [ mulf_init::$13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// 2D rotattion of 8 sprites
// Upstart
diff --git a/src/test/ref/examples/scroll/scroll.log b/src/test/ref/examples/scroll/scroll.log
index ea0982897..491377d1b 100644
--- a/src/test/ref/examples/scroll/scroll.log
+++ b/src/test/ref/examples/scroll/scroll.log
@@ -535,7 +535,7 @@ Allocated zp ZP_WORD:5 [ main::nxt#4 main::nxt#10 main::nxt#11 main::nxt#1 ]
Allocated zp ZP_WORD:7 [ fillscreen::cursor#2 fillscreen::cursor#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/examples/scrollbig/scrollbig.log b/src/test/ref/examples/scrollbig/scrollbig.log
index 25c9c80a1..47bcf4b3b 100644
--- a/src/test/ref/examples/scrollbig/scrollbig.log
+++ b/src/test/ref/examples/scrollbig/scrollbig.log
@@ -1380,7 +1380,7 @@ Allocated zp ZP_BYTE:21 [ scroll_bit::bits#0 ]
Allocated zp ZP_BYTE:22 [ scroll_bit::$9 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// An 8x8 char letter scroller
// Upstart
diff --git a/src/test/ref/examples/scrolllogo/scrolllogo.log b/src/test/ref/examples/scrolllogo/scrolllogo.log
index aed300de1..6f9567241 100644
--- a/src/test/ref/examples/scrolllogo/scrolllogo.log
+++ b/src/test/ref/examples/scrolllogo/scrolllogo.log
@@ -4300,7 +4300,7 @@ Allocated zp ZP_WORD:177 [ rem16u#1 ]
Allocated zp ZP_WORD:179 [ memset::end#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/examples/showlogo/showlogo.log b/src/test/ref/examples/showlogo/showlogo.log
index ddb235203..b65c02d3f 100644
--- a/src/test/ref/examples/showlogo/showlogo.log
+++ b/src/test/ref/examples/showlogo/showlogo.log
@@ -688,7 +688,7 @@ Allocated zp ZP_WORD:8 [ memset::dst#2 memset::dst#4 memset::dst#1 ]
Allocated zp ZP_WORD:10 [ memset::end#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/examples/sinplotter/sine-plotter.log b/src/test/ref/examples/sinplotter/sine-plotter.log
index 98d9814d4..5d4518c34 100644
--- a/src/test/ref/examples/sinplotter/sine-plotter.log
+++ b/src/test/ref/examples/sinplotter/sine-plotter.log
@@ -4002,7 +4002,7 @@ Allocated zp ZP_BYTE:191 [ bitmap_init::$5 ]
Allocated zp ZP_BYTE:192 [ bitmap_init::$6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Generate a big sinus and plot it on a bitmap
// Upstart
diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.log b/src/test/ref/examples/sinsprites/sinus-sprites.log
index 7c6a72dc8..3a3e92be0 100644
--- a/src/test/ref/examples/sinsprites/sinus-sprites.log
+++ b/src/test/ref/examples/sinsprites/sinus-sprites.log
@@ -3697,7 +3697,7 @@ Allocated zp ZP_BYTE:78 [ gen_chargen_sprite::$6 ]
Allocated zp ZP_BYTE:79 [ place_sprites::j2#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/examples/zpcode/zpcode.log b/src/test/ref/examples/zpcode/zpcode.log
index 125a54b57..c0e61cca5 100644
--- a/src/test/ref/examples/zpcode/zpcode.log
+++ b/src/test/ref/examples/zpcode/zpcode.log
@@ -356,7 +356,7 @@ Allocated zp ZP_BYTE:3 [ zpLoop::i#2 zpLoop::i#1 ]
Allocated zp ZP_BYTE:4 [ loop::i#2 loop::i#1 ]
INITIAL ASM
-Target platform is custom / 6502X
+Target platform is custom / MOS6502X
// File Comments
// Example showing how to use KickAsm segments to compile meant to be transfered to zeropage before execution.
// The linker-file defines the ZpCode segment to be on zeropage and does not include it directly in the PRG-file (by excluding it from the Program segment).
diff --git a/src/test/ref/fastmultiply-127.log b/src/test/ref/fastmultiply-127.log
index ef38ba4cf..6fe612e31 100644
--- a/src/test/ref/fastmultiply-127.log
+++ b/src/test/ref/fastmultiply-127.log
@@ -2815,7 +2815,7 @@ Allocated zp ZP_WORD:47 [ mulf8u127::return#0 ]
Allocated zp ZP_WORD:49 [ print_mulf8u127::c#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// An implementation of seriously fast multiply for integer values in the interval [-1;1] with the best possible precision
// NOTE: So far unsuccessful - since the handling of sign and values where a+b>sqrt2) makes the code slower than regular fast multiply
diff --git a/src/test/ref/fibmem.log b/src/test/ref/fibmem.log
index 3010b27e7..bc3b33098 100644
--- a/src/test/ref/fibmem.log
+++ b/src/test/ref/fibmem.log
@@ -162,7 +162,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/fill-square.log b/src/test/ref/fill-square.log
index d869ab35d..b94db5e4e 100644
--- a/src/test/ref/fill-square.log
+++ b/src/test/ref/fill-square.log
@@ -224,7 +224,7 @@ Allocated zp ZP_WORD:12 [ main::line#0 ]
Allocated zp ZP_BYTE:14 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Fill a square on the screen
// Upstart
diff --git a/src/test/ref/fillscreen.log b/src/test/ref/fillscreen.log
index 3174c024b..fd9d5c697 100644
--- a/src/test/ref/fillscreen.log
+++ b/src/test/ref/fillscreen.log
@@ -213,7 +213,7 @@ Allocated zp ZP_BYTE:3 [ main::c#0 ]
Allocated zp ZP_BYTE:4 [ fillscreen::c#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/flipper-rex2.log b/src/test/ref/flipper-rex2.log
index 068d13260..fac08bd70 100644
--- a/src/test/ref/flipper-rex2.log
+++ b/src/test/ref/flipper-rex2.log
@@ -702,7 +702,7 @@ Allocated zp ZP_BYTE:12 [ flip::i#2 flip::i#1 ]
Allocated zp ZP_BYTE:13 [ prepare::i#2 prepare::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/font-hex-show.log b/src/test/ref/font-hex-show.log
index f5a1b336c..52cba8a79 100644
--- a/src/test/ref/font-hex-show.log
+++ b/src/test/ref/font-hex-show.log
@@ -754,7 +754,7 @@ Allocated zp ZP_BYTE:15 [ init_font_hex::$2 ]
Allocated zp ZP_BYTE:16 [ init_font_hex::idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Shows a font where each char contains the number of the char (00-ff)
// Upstart
diff --git a/src/test/ref/for-empty-increment.log b/src/test/ref/for-empty-increment.log
index 5122bf81b..8756e3036 100644
--- a/src/test/ref/for-empty-increment.log
+++ b/src/test/ref/for-empty-increment.log
@@ -128,7 +128,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that for()-loops can have empty increments
// Upstart
diff --git a/src/test/ref/for-empty-init.log b/src/test/ref/for-empty-init.log
index 4ca7eefc3..97dd006fb 100644
--- a/src/test/ref/for-empty-init.log
+++ b/src/test/ref/for-empty-init.log
@@ -128,7 +128,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that for()-loops can have empty inits
// Upstart
diff --git a/src/test/ref/for-two-vars.log b/src/test/ref/for-two-vars.log
index f3931bc29..012e364cd 100644
--- a/src/test/ref/for-two-vars.log
+++ b/src/test/ref/for-two-vars.log
@@ -159,7 +159,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_WORD:3 [ main::sc#2 main::sc#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a for-loop with two iterating variables
// Illustrates that for()-loops currently cannot contain two variable declarations.
diff --git a/src/test/ref/forced-zeropage.log b/src/test/ref/forced-zeropage.log
index 57e2f0676..2eceef546 100644
--- a/src/test/ref/forced-zeropage.log
+++ b/src/test/ref/forced-zeropage.log
@@ -126,7 +126,7 @@ Allocated zp ZP_WORD:2 [ main::u#1 ]
Allocated zp ZP_WORD:4 [ main::$5 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test some forced zeropage access
// Upstart
diff --git a/src/test/ref/forclassicmin.log b/src/test/ref/forclassicmin.log
index 841452f5b..5546c2ab5 100644
--- a/src/test/ref/forclassicmin.log
+++ b/src/test/ref/forclassicmin.log
@@ -143,7 +143,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal classic for() loop
// Upstart
diff --git a/src/test/ref/forincrementassign.log b/src/test/ref/forincrementassign.log
index 8e43e9826..e66cc1642 100644
--- a/src/test/ref/forincrementassign.log
+++ b/src/test/ref/forincrementassign.log
@@ -137,7 +137,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Classic for() does not allow assignment as increment, eg. for(byte i=0;i<40;i=i+2) {}
// The following should give a program rendering a char on every second char of the first line - but results in a syntax error
diff --git a/src/test/ref/forrangedwords.log b/src/test/ref/forrangedwords.log
index 8a87e837b..3e00e97b6 100644
--- a/src/test/ref/forrangedwords.log
+++ b/src/test/ref/forrangedwords.log
@@ -214,7 +214,7 @@ Allocated zp ZP_BYTE:8 [ main::$3 ]
Allocated zp ZP_BYTE:9 [ main::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/forrangemin.log b/src/test/ref/forrangemin.log
index bddd925db..179c729f9 100644
--- a/src/test/ref/forrangemin.log
+++ b/src/test/ref/forrangemin.log
@@ -181,7 +181,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::j#3 main::j#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal range based for() loop
// Upstart
diff --git a/src/test/ref/forrangesymbolic.log b/src/test/ref/forrangesymbolic.log
index c6fa1a462..1c9b5ad9b 100644
--- a/src/test/ref/forrangesymbolic.log
+++ b/src/test/ref/forrangesymbolic.log
@@ -134,7 +134,7 @@ Complete equivalence classes
Allocated zp ZP_WORD:2 [ main::b#2 main::b#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Range-based for does not recognize symbolic constants.
// The following should work but gives a not-constant exception
diff --git a/src/test/ref/fragment-synth.log b/src/test/ref/fragment-synth.log
index dfac6118e..3a6c15493 100644
--- a/src/test/ref/fragment-synth.log
+++ b/src/test/ref/fragment-synth.log
@@ -286,7 +286,7 @@ Allocated zp ZP_BYTE:7 [ main::a2#0 ]
Allocated zp ZP_BYTE:8 [ fct::return#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a sub-optimal fragment synthesis
// vbuaa=vbuxx_band_pbuz1_derefidx_vbuc1 < vbuaa=pbuz1_derefidx_vbuc1_band_vbuxx < vbuaa=pbuz1_derefidx_vbuaa_band_vbuxx < vbuaa=pbuz1_derefidx_vbuyy_band_vbuxx < vbuaa=pbuz1_derefidx_vbuyy_band_vbuaa < vbuaa=vbuaa_band_pbuz1_derefidx_vbuyy - clobber:A Y cycles:11.5
diff --git a/src/test/ref/fragment-variations.log b/src/test/ref/fragment-variations.log
index 46f7a64b0..1ce60b186 100644
--- a/src/test/ref/fragment-variations.log
+++ b/src/test/ref/fragment-variations.log
@@ -256,7 +256,7 @@ Allocated zp ZP_DWORD:20 [ main::$1 ]
Allocated zp ZP_DWORD:24 [ mul16u::return#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that ASM fragment variations works
// ASM fragment variations "cast" constants to different types
diff --git a/src/test/ref/function-pointer-noarg-2.log b/src/test/ref/function-pointer-noarg-2.log
index b91469bbe..2386af4e6 100644
--- a/src/test/ref/function-pointer-noarg-2.log
+++ b/src/test/ref/function-pointer-noarg-2.log
@@ -195,7 +195,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating and assigning pointers to non-args no-return functions
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-3.log b/src/test/ref/function-pointer-noarg-3.log
index 0adedd6a5..766e7db29 100644
--- a/src/test/ref/function-pointer-noarg-3.log
+++ b/src/test/ref/function-pointer-noarg-3.log
@@ -259,7 +259,7 @@ Allocated zp ZP_WORD:3 [ main::f#3 ]
Allocated zp ZP_BYTE:5 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating and assigning pointers to non-args no-return functions - plus inline kickasm-based calling
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-10.log b/src/test/ref/function-pointer-noarg-call-10.log
index 9f13c5789..dc55a3052 100644
--- a/src/test/ref/function-pointer-noarg-call-10.log
+++ b/src/test/ref/function-pointer-noarg-call-10.log
@@ -383,7 +383,7 @@ Allocated zp ZP_BYTE:7 [ print::i#2 print::i#1 ]
Allocated zp ZP_BYTE:8 [ idx#11 idx#16 idx#12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests calling into different function pointers which call a common sub-method
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-2.log b/src/test/ref/function-pointer-noarg-call-2.log
index 39c95b860..9fc680349 100644
--- a/src/test/ref/function-pointer-noarg-call-2.log
+++ b/src/test/ref/function-pointer-noarg-call-2.log
@@ -247,7 +247,7 @@ Allocated zp ZP_WORD:3 [ main::f#3 ]
Allocated zp ZP_BYTE:5 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating, assigning and calling pointers to non-args no-return functions
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-3.log b/src/test/ref/function-pointer-noarg-call-3.log
index 6d8d75061..6fe598a50 100644
--- a/src/test/ref/function-pointer-noarg-call-3.log
+++ b/src/test/ref/function-pointer-noarg-call-3.log
@@ -288,7 +288,7 @@ Allocated zp ZP_WORD:8 [ main::$1 ]
Allocated zp ZP_BYTE:10 [ getfn::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating, assigning returning and calling pointers to non-args no-return functions
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-4.log b/src/test/ref/function-pointer-noarg-call-4.log
index 74f82eb20..6ed80a8d1 100644
--- a/src/test/ref/function-pointer-noarg-call-4.log
+++ b/src/test/ref/function-pointer-noarg-call-4.log
@@ -210,7 +210,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating, assigning returning and calling pointers to non-args no-return functions
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-5.log b/src/test/ref/function-pointer-noarg-call-5.log
index c05e20ad4..51441bcde 100644
--- a/src/test/ref/function-pointer-noarg-call-5.log
+++ b/src/test/ref/function-pointer-noarg-call-5.log
@@ -218,7 +218,7 @@ Allocated zp ZP_BYTE:4 [ main::$2 ]
Allocated zp ZP_WORD:5 [ main::f#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests calling into arrays of pointers to non-args no-return functions
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-6.log b/src/test/ref/function-pointer-noarg-call-6.log
index ed2143df6..51db07856 100644
--- a/src/test/ref/function-pointer-noarg-call-6.log
+++ b/src/test/ref/function-pointer-noarg-call-6.log
@@ -208,7 +208,7 @@ Allocated zp ZP_WORD:2 [ main::cols#2 main::cols#1 ]
Allocated zp ZP_WORD:4 [ fn1::screen#2 fn1::screen#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests calling into a function pointer with local variables
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-7.log b/src/test/ref/function-pointer-noarg-call-7.log
index 690717a0c..075924c25 100644
--- a/src/test/ref/function-pointer-noarg-call-7.log
+++ b/src/test/ref/function-pointer-noarg-call-7.log
@@ -282,7 +282,7 @@ Allocated zp ZP_BYTE:3 [ hello::i#2 hello::i#1 ]
Allocated zp ZP_BYTE:4 [ idx#0 idx#3 idx#7 idx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests calling into a function pointer with local variables
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-8.log b/src/test/ref/function-pointer-noarg-call-8.log
index 8b3d43506..61672a795 100644
--- a/src/test/ref/function-pointer-noarg-call-8.log
+++ b/src/test/ref/function-pointer-noarg-call-8.log
@@ -345,7 +345,7 @@ Allocated zp ZP_WORD:4 [ msg#0 msg#1 msg#10 ]
Allocated zp ZP_BYTE:6 [ idx#0 idx#3 idx#7 idx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests calling into a function pointer with local variables
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call-9.log b/src/test/ref/function-pointer-noarg-call-9.log
index a07f3c6a3..f4c989a63 100644
--- a/src/test/ref/function-pointer-noarg-call-9.log
+++ b/src/test/ref/function-pointer-noarg-call-9.log
@@ -145,7 +145,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ idx#0 idx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests calling into a function pointer which modifies global volatile
// Upstart
diff --git a/src/test/ref/function-pointer-noarg-call.log b/src/test/ref/function-pointer-noarg-call.log
index 1fb35c655..fd76000ac 100644
--- a/src/test/ref/function-pointer-noarg-call.log
+++ b/src/test/ref/function-pointer-noarg-call.log
@@ -109,7 +109,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating, assigning and calling pointers to non-args no-return functions
// Upstart
diff --git a/src/test/ref/function-pointer-noarg.log b/src/test/ref/function-pointer-noarg.log
index 7eee9c044..8b21b2a18 100644
--- a/src/test/ref/function-pointer-noarg.log
+++ b/src/test/ref/function-pointer-noarg.log
@@ -223,7 +223,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating pointers to non-args no-return functions
// Upstart
diff --git a/src/test/ref/function-pointer-return.log b/src/test/ref/function-pointer-return.log
index c433ab47d..2023eade4 100644
--- a/src/test/ref/function-pointer-return.log
+++ b/src/test/ref/function-pointer-return.log
@@ -289,7 +289,7 @@ Allocated zp ZP_BYTE:5 [ main::$0 ]
Allocated zp ZP_BYTE:6 [ main::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating and assigning pointers to non-args return with function value
// Upstart
diff --git a/src/test/ref/gfxbank.log b/src/test/ref/gfxbank.log
index 7d2458586..d402a1e20 100644
--- a/src/test/ref/gfxbank.log
+++ b/src/test/ref/gfxbank.log
@@ -211,7 +211,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test minimization of constants
// Upstart
diff --git a/src/test/ref/global-pc-multiple.log b/src/test/ref/global-pc-multiple.log
index da450a8a8..40e4778f3 100644
--- a/src/test/ref/global-pc-multiple.log
+++ b/src/test/ref/global-pc-multiple.log
@@ -155,7 +155,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test setting the program PC through a #pc directive
// Upstart
diff --git a/src/test/ref/global-pc.log b/src/test/ref/global-pc.log
index d0c4f410d..6a9270077 100644
--- a/src/test/ref/global-pc.log
+++ b/src/test/ref/global-pc.log
@@ -107,7 +107,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::col#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test setting the program PC through a #pc directive
// Upstart
diff --git a/src/test/ref/halfscii.log b/src/test/ref/halfscii.log
index 09b112526..2886144f8 100644
--- a/src/test/ref/halfscii.log
+++ b/src/test/ref/halfscii.log
@@ -870,7 +870,7 @@ Allocated zp ZP_BYTE:36 [ main::bits#3 ]
Allocated zp ZP_BYTE:37 [ main::bits_gen#7 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/helloworld0.log b/src/test/ref/helloworld0.log
index 303f7e507..218ae068a 100644
--- a/src/test/ref/helloworld0.log
+++ b/src/test/ref/helloworld0.log
@@ -125,7 +125,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests minimal hello world
// Upstart
diff --git a/src/test/ref/helloworld2-inline.log b/src/test/ref/helloworld2-inline.log
index 9813ca591..e0e43a1a6 100644
--- a/src/test/ref/helloworld2-inline.log
+++ b/src/test/ref/helloworld2-inline.log
@@ -342,7 +342,7 @@ Allocated zp ZP_BYTE:4 [ main::print22_i#2 main::print22_i#1 ]
Allocated zp ZP_BYTE:5 [ main::print22_j#2 main::print22_j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/helloworld2.log b/src/test/ref/helloworld2.log
index ce8520a1d..58c9e56d8 100644
--- a/src/test/ref/helloworld2.log
+++ b/src/test/ref/helloworld2.log
@@ -258,7 +258,7 @@ Allocated zp ZP_BYTE:4 [ print2::i#2 print2::i#1 ]
Allocated zp ZP_BYTE:5 [ print2::j#2 print2::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/hex2dec-ptrptr.log b/src/test/ref/hex2dec-ptrptr.log
index e4e4580f0..bd575935e 100644
--- a/src/test/ref/hex2dec-ptrptr.log
+++ b/src/test/ref/hex2dec-ptrptr.log
@@ -769,7 +769,7 @@ Allocated zp ZP_BYTE:16 [ utoa16w::$8 ]
Allocated zp ZP_BYTE:17 [ utoa16w::$12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Testing binary to hex conversion using pointer to pointer
// Upstart
diff --git a/src/test/ref/hex2dec.log b/src/test/ref/hex2dec.log
index fbb763f7a..7971e70b6 100644
--- a/src/test/ref/hex2dec.log
+++ b/src/test/ref/hex2dec.log
@@ -1449,7 +1449,7 @@ Allocated zp ZP_BYTE:36 [ utoa16w::$8 ]
Allocated zp ZP_BYTE:37 [ utoa16w::$12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Testing hex to decimal conversion
// Upstart
diff --git a/src/test/ref/ifmin.log b/src/test/ref/ifmin.log
index 04ec563cd..aaedd70aa 100644
--- a/src/test/ref/ifmin.log
+++ b/src/test/ref/ifmin.log
@@ -149,7 +149,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal if() test
// Upstart
diff --git a/src/test/ref/immzero.log b/src/test/ref/immzero.log
index e4607c0a2..3557c8389 100644
--- a/src/test/ref/immzero.log
+++ b/src/test/ref/immzero.log
@@ -136,7 +136,7 @@ Allocated zp ZP_WORD:2 [ main::w#2 main::w#1 ]
Allocated zp ZP_BYTE:4 [ main::j#2 main::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that immediate zero values are reused - even when assigning to words
// Upstart
diff --git a/src/test/ref/importing.log b/src/test/ref/importing.log
index f432b2b16..94948fff3 100644
--- a/src/test/ref/importing.log
+++ b/src/test/ref/importing.log
@@ -97,7 +97,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/incd020.log b/src/test/ref/incd020.log
index 720bb2403..e27a8a4bb 100644
--- a/src/test/ref/incd020.log
+++ b/src/test/ref/incd020.log
@@ -86,7 +86,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Incrementing / decrementing pointer content should result in code modifying the memory location - eg. inc $d020.
// Currently it does not but instead leads to just reading the value a few times.
diff --git a/src/test/ref/incrementinarray.log b/src/test/ref/incrementinarray.log
index 691f0eb91..3b8957f85 100644
--- a/src/test/ref/incrementinarray.log
+++ b/src/test/ref/incrementinarray.log
@@ -712,7 +712,7 @@ Allocated zp ZP_WORD:7 [ print_char_cursor#12 print_char_cursor#25 print_char_cu
Allocated zp ZP_WORD:9 [ memset::dst#2 memset::dst#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/infloop-error.log b/src/test/ref/infloop-error.log
index 2752c0f86..c07533555 100644
--- a/src/test/ref/infloop-error.log
+++ b/src/test/ref/infloop-error.log
@@ -277,7 +277,7 @@ Allocated zp ZP_BYTE:3 [ main::min#2 main::min#3 main::min#9 ]
Allocated zp ZP_BYTE:4 [ main::max#2 main::max#3 main::max#9 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Results in infinite compile loop as the compiler keeps trying to remove the same (empty) alias
// Upstart
diff --git a/src/test/ref/init-volatiles.log b/src/test/ref/init-volatiles.log
index 2f0490ed0..84e2b20af 100644
--- a/src/test/ref/init-volatiles.log
+++ b/src/test/ref/init-volatiles.log
@@ -140,7 +140,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ x#5 x#0 x#1 x#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates a problem where volatiles with initializers are initialized outside the main()-routine
// Upstart
diff --git a/src/test/ref/initializer-0.log b/src/test/ref/initializer-0.log
index 9f7ca490e..75306a26e 100644
--- a/src/test/ref/initializer-0.log
+++ b/src/test/ref/initializer-0.log
@@ -154,7 +154,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::idx#2 main::idx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates initializing an object using = { ... } syntax
// Array of chars
diff --git a/src/test/ref/initializer-1.log b/src/test/ref/initializer-1.log
index 4b4131bd8..5fb3317b9 100644
--- a/src/test/ref/initializer-1.log
+++ b/src/test/ref/initializer-1.log
@@ -197,7 +197,7 @@ Allocated zp ZP_BYTE:6 [ main::idx#1 ]
Allocated zp ZP_BYTE:7 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates initializing an object using = { ... } syntax
// Array of words
diff --git a/src/test/ref/initializer-2.log b/src/test/ref/initializer-2.log
index 60d0e83ed..d7b6f9afe 100644
--- a/src/test/ref/initializer-2.log
+++ b/src/test/ref/initializer-2.log
@@ -216,7 +216,7 @@ Allocated zp ZP_BYTE:4 [ main::$2 ]
Allocated zp ZP_BYTE:5 [ main::idx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates initializing an array of structs
// Array of structs containing chars
diff --git a/src/test/ref/initializer-3.log b/src/test/ref/initializer-3.log
index 5dea183db..82f6aa2bb 100644
--- a/src/test/ref/initializer-3.log
+++ b/src/test/ref/initializer-3.log
@@ -256,7 +256,7 @@ Allocated zp ZP_BYTE:8 [ main::idx#2 ]
Allocated zp ZP_BYTE:9 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates initializing an array of structs
// Array of structs containing words
diff --git a/src/test/ref/inline-asm-clobber-none.log b/src/test/ref/inline-asm-clobber-none.log
index e05649e73..801a45121 100644
--- a/src/test/ref/inline-asm-clobber-none.log
+++ b/src/test/ref/inline-asm-clobber-none.log
@@ -211,7 +211,7 @@ Allocated zp ZP_BYTE:3 [ main::j#4 main::j#1 ]
Allocated zp ZP_BYTE:4 [ main::k#2 main::k#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that inline ASM JSR clobbers all registers
// Upstart
diff --git a/src/test/ref/inline-asm-clobber.log b/src/test/ref/inline-asm-clobber.log
index 7c36a70ce..656ba6df0 100644
--- a/src/test/ref/inline-asm-clobber.log
+++ b/src/test/ref/inline-asm-clobber.log
@@ -262,7 +262,7 @@ Allocated zp ZP_BYTE:4 [ main::k#4 main::k#1 ]
Allocated zp ZP_BYTE:5 [ main::l#2 main::l#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that inline ASM clobbering is taken into account when assigning registers
// Upstart
diff --git a/src/test/ref/inline-asm-jsr-clobber.log b/src/test/ref/inline-asm-jsr-clobber.log
index 620d9a900..39470c7f9 100644
--- a/src/test/ref/inline-asm-jsr-clobber.log
+++ b/src/test/ref/inline-asm-jsr-clobber.log
@@ -109,7 +109,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that inline ASM JSR clobbers all registers
// Upstart
diff --git a/src/test/ref/inline-asm-label.log b/src/test/ref/inline-asm-label.log
index f238807c7..c50a7e027 100644
--- a/src/test/ref/inline-asm-label.log
+++ b/src/test/ref/inline-asm-label.log
@@ -80,7 +80,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates how inline assembler use internal labels and external references
// Upstart
diff --git a/src/test/ref/inline-asm-optimized.log b/src/test/ref/inline-asm-optimized.log
index 2d95f8f64..be0c2d6a2 100644
--- a/src/test/ref/inline-asm-optimized.log
+++ b/src/test/ref/inline-asm-optimized.log
@@ -93,7 +93,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that inline assembler is optimized
// Upstart
diff --git a/src/test/ref/inline-asm-param.log b/src/test/ref/inline-asm-param.log
index da05b84f0..48bcde1b1 100644
--- a/src/test/ref/inline-asm-param.log
+++ b/src/test/ref/inline-asm-param.log
@@ -118,7 +118,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/inline-asm-ref-scoped.log b/src/test/ref/inline-asm-ref-scoped.log
index 83847b9c6..e9238ade7 100644
--- a/src/test/ref/inline-asm-ref-scoped.log
+++ b/src/test/ref/inline-asm-ref-scoped.log
@@ -87,7 +87,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that references to labels in other scopes is possible from inline ASM
// Upstart
diff --git a/src/test/ref/inline-asm-refout-const.log b/src/test/ref/inline-asm-refout-const.log
index cb6446177..0d9866bfe 100644
--- a/src/test/ref/inline-asm-refout-const.log
+++ b/src/test/ref/inline-asm-refout-const.log
@@ -80,7 +80,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates how inline assembler can reference data from the outside program without the data being optimized away as unused
// Upstart
diff --git a/src/test/ref/inline-asm-refout.log b/src/test/ref/inline-asm-refout.log
index b1fe79844..0916a0f7a 100644
--- a/src/test/ref/inline-asm-refout.log
+++ b/src/test/ref/inline-asm-refout.log
@@ -100,7 +100,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates how inline assembler can reference data from the outside program
// Upstart
diff --git a/src/test/ref/inline-asm.log b/src/test/ref/inline-asm.log
index 0f59ddc53..39ea76382 100644
--- a/src/test/ref/inline-asm.log
+++ b/src/test/ref/inline-asm.log
@@ -62,7 +62,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/inline-assignment.log b/src/test/ref/inline-assignment.log
index e39ef4253..1cd763fcf 100644
--- a/src/test/ref/inline-assignment.log
+++ b/src/test/ref/inline-assignment.log
@@ -142,7 +142,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::a#1 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/inline-function-if.log b/src/test/ref/inline-function-if.log
index ee2ab721e..e8f7de98d 100644
--- a/src/test/ref/inline-function-if.log
+++ b/src/test/ref/inline-function-if.log
@@ -267,7 +267,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test inlining a slightly complex print function (containing an if)
// Upstart
diff --git a/src/test/ref/inline-function-level2.log b/src/test/ref/inline-function-level2.log
index 38662b845..274610320 100644
--- a/src/test/ref/inline-function-level2.log
+++ b/src/test/ref/inline-function-level2.log
@@ -657,7 +657,7 @@ Allocated zp ZP_BYTE:14 [ main::plot2_xpos#0 ]
Allocated zp ZP_BYTE:15 [ main::plot1_xpos#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Inline functions in two levels
// Upstart
diff --git a/src/test/ref/inline-function-min.log b/src/test/ref/inline-function-min.log
index 4587e96e2..9bd9ca6c7 100644
--- a/src/test/ref/inline-function-min.log
+++ b/src/test/ref/inline-function-min.log
@@ -290,7 +290,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test minimal inline function
// Upstart
diff --git a/src/test/ref/inline-function-print.log b/src/test/ref/inline-function-print.log
index aa7500087..f70ecef4e 100644
--- a/src/test/ref/inline-function-print.log
+++ b/src/test/ref/inline-function-print.log
@@ -340,7 +340,7 @@ Allocated zp ZP_BYTE:4 [ main::print2_i#2 main::print2_i#1 ]
Allocated zp ZP_BYTE:5 [ main::print2_j#2 main::print2_j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// TEst inlining a slightly complex print function (containing a loop)
// Upstart
diff --git a/src/test/ref/inline-function.log b/src/test/ref/inline-function.log
index ef3a4ade7..394eba3ea 100644
--- a/src/test/ref/inline-function.log
+++ b/src/test/ref/inline-function.log
@@ -419,7 +419,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test inline function
// Splits screen so upper half is lower case and lower half lower case
diff --git a/src/test/ref/inline-kasm-clobber.log b/src/test/ref/inline-kasm-clobber.log
index 499c2ffec..20555aaf0 100644
--- a/src/test/ref/inline-kasm-clobber.log
+++ b/src/test/ref/inline-kasm-clobber.log
@@ -226,7 +226,7 @@ Allocated zp ZP_BYTE:3 [ main::l#4 main::l#1 ]
Allocated zp ZP_BYTE:4 [ main::m#2 main::m#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that inline kickasm supports the clobbering directive
// Upstart
diff --git a/src/test/ref/inline-kasm-data.log b/src/test/ref/inline-kasm-data.log
index b60dbf147..e4ffbc4fc 100644
--- a/src/test/ref/inline-kasm-data.log
+++ b/src/test/ref/inline-kasm-data.log
@@ -183,7 +183,7 @@ Allocated zp ZP_WORD:5 [ main::cols#2 main::cols#1 ]
Allocated zp ZP_BYTE:7 [ main::sin#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Example of inline kickasm data
// Upstart
diff --git a/src/test/ref/inline-kasm-loop.log b/src/test/ref/inline-kasm-loop.log
index 02e07f505..eb2d06eeb 100644
--- a/src/test/ref/inline-kasm-loop.log
+++ b/src/test/ref/inline-kasm-loop.log
@@ -99,7 +99,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Example of inline kickasm in a function
// Upstart
diff --git a/src/test/ref/inline-kasm-refout.log b/src/test/ref/inline-kasm-refout.log
index 163c5db4d..3c305e5ab 100644
--- a/src/test/ref/inline-kasm-refout.log
+++ b/src/test/ref/inline-kasm-refout.log
@@ -94,7 +94,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates how inline kickassembler can reference data from the outside program
// Upstart
diff --git a/src/test/ref/inline-kasm-resource.log b/src/test/ref/inline-kasm-resource.log
index 718b98781..907b5f7ef 100644
--- a/src/test/ref/inline-kasm-resource.log
+++ b/src/test/ref/inline-kasm-resource.log
@@ -165,7 +165,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Example of inline kickasm resource data
// Upstart
diff --git a/src/test/ref/inline-pointer-0.log b/src/test/ref/inline-pointer-0.log
index c3502f919..cfbffc9e5 100644
--- a/src/test/ref/inline-pointer-0.log
+++ b/src/test/ref/inline-pointer-0.log
@@ -100,7 +100,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating a literal pointer from two bytes
// Upstart
diff --git a/src/test/ref/inline-pointer-1.log b/src/test/ref/inline-pointer-1.log
index af84357b5..68cc9a59b 100644
--- a/src/test/ref/inline-pointer-1.log
+++ b/src/test/ref/inline-pointer-1.log
@@ -181,7 +181,7 @@ Allocated zp ZP_BYTE:3 [ puta::pl#2 ]
Allocated zp ZP_WORD:4 [ puta::screen#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating a literal pointer from two bytes
// Upstart
diff --git a/src/test/ref/inline-pointer-2.log b/src/test/ref/inline-pointer-2.log
index 9ea034540..75057582d 100644
--- a/src/test/ref/inline-pointer-2.log
+++ b/src/test/ref/inline-pointer-2.log
@@ -119,7 +119,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating a literal pointer from two bytes
// Upstart
diff --git a/src/test/ref/inline-string-2.log b/src/test/ref/inline-string-2.log
index 320507290..82a9ea855 100644
--- a/src/test/ref/inline-string-2.log
+++ b/src/test/ref/inline-string-2.log
@@ -350,7 +350,7 @@ Allocated zp ZP_WORD:5 [ print_msg::msg#3 ]
Allocated zp ZP_WORD:7 [ print::msg#2 print::msg#0 print::msg#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Inline Strings in assignments
// Upstart
diff --git a/src/test/ref/inline-string-3.log b/src/test/ref/inline-string-3.log
index 6bad5e5d8..d8d1050b3 100644
--- a/src/test/ref/inline-string-3.log
+++ b/src/test/ref/inline-string-3.log
@@ -147,7 +147,7 @@ Complete equivalence classes
Allocated zp ZP_WORD:2 [ main::ptr#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test assigning address of inline string to pointer
// The result should be an labelled .text in the ASM
diff --git a/src/test/ref/inline-string.log b/src/test/ref/inline-string.log
index e8b8ac84c..d7c99242f 100644
--- a/src/test/ref/inline-string.log
+++ b/src/test/ref/inline-string.log
@@ -264,7 +264,7 @@ Allocated zp ZP_WORD:2 [ screen#18 screen#12 screen#5 ]
Allocated zp ZP_WORD:4 [ print::msg#4 print::msg#6 print::msg#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Inline Strings in method calls are automatically converted to local constant variables byte[] st = "..."; - generating an ASM .text).
// Upstart
diff --git a/src/test/ref/inline-word-0.log b/src/test/ref/inline-word-0.log
index efa4195f5..48fce1cdd 100644
--- a/src/test/ref/inline-word-0.log
+++ b/src/test/ref/inline-word-0.log
@@ -119,7 +119,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests minimal inline word
// Upstart
diff --git a/src/test/ref/inline-word-1.log b/src/test/ref/inline-word-1.log
index f40969f78..3404401cb 100644
--- a/src/test/ref/inline-word-1.log
+++ b/src/test/ref/inline-word-1.log
@@ -119,7 +119,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests minimal inline word
// Upstart
diff --git a/src/test/ref/inline-word-2.log b/src/test/ref/inline-word-2.log
index 988ec1341..64022fa2c 100644
--- a/src/test/ref/inline-word-2.log
+++ b/src/test/ref/inline-word-2.log
@@ -119,7 +119,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests minimal inline word
// Upstart
diff --git a/src/test/ref/inline-word.log b/src/test/ref/inline-word.log
index 22ee3f7ed..ff0ecf50b 100644
--- a/src/test/ref/inline-word.log
+++ b/src/test/ref/inline-word.log
@@ -235,7 +235,7 @@ Allocated zp ZP_BYTE:3 [ main::l#2 main::l#1 ]
Allocated zp ZP_WORD:4 [ main::w#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/inlinearrayproblem.log b/src/test/ref/inlinearrayproblem.log
index 13cb61211..34f8d4770 100644
--- a/src/test/ref/inlinearrayproblem.log
+++ b/src/test/ref/inlinearrayproblem.log
@@ -148,7 +148,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Arrays / strings allocated inline destroy functions (because they are allocated where the call enters.
// The following places the text at the start of the main-function - and JSR's straight into the text - not the code.
diff --git a/src/test/ref/inmem-const-array.log b/src/test/ref/inmem-const-array.log
index 26ef3ff89..908defe29 100644
--- a/src/test/ref/inmem-const-array.log
+++ b/src/test/ref/inmem-const-array.log
@@ -241,7 +241,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::j#3 main::j#4 main::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/inmemarray.log b/src/test/ref/inmemarray.log
index daae919de..4d021d619 100644
--- a/src/test/ref/inmemarray.log
+++ b/src/test/ref/inmemarray.log
@@ -210,7 +210,7 @@ Allocated zp ZP_BYTE:2 [ main::j#3 main::j#4 main::j#1 ]
Allocated zp ZP_BYTE:3 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/inmemstring.log b/src/test/ref/inmemstring.log
index 131d3bdc7..f5c91fa92 100644
--- a/src/test/ref/inmemstring.log
+++ b/src/test/ref/inmemstring.log
@@ -203,7 +203,7 @@ Allocated zp ZP_BYTE:2 [ main::i#3 main::i#4 main::i#1 ]
Allocated zp ZP_WORD:3 [ main::cursor#2 main::cursor#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/inner-increment-problem.log b/src/test/ref/inner-increment-problem.log
index 48b9cae25..e20b12cce 100644
--- a/src/test/ref/inner-increment-problem.log
+++ b/src/test/ref/inner-increment-problem.log
@@ -161,7 +161,7 @@ Allocated zp ZP_BYTE:6 [ main::$3 ]
Allocated zp ZP_BYTE:7 [ main::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Inner increment is not being done properly (screen++)
// Upstart
diff --git a/src/test/ref/int-conversion.log b/src/test/ref/int-conversion.log
index dbf26ef36..dee6940dc 100644
--- a/src/test/ref/int-conversion.log
+++ b/src/test/ref/int-conversion.log
@@ -1647,7 +1647,7 @@ Allocated zp ZP_BYTE:5 [ assertType::t2#42 ]
Allocated zp ZP_BYTE:6 [ idx#105 idx#108 idx#26 idx#40 idx#47 idx#19 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests different integer literal types
// Upstart
diff --git a/src/test/ref/int-literals.log b/src/test/ref/int-literals.log
index 7939603e5..80ca5f50f 100644
--- a/src/test/ref/int-literals.log
+++ b/src/test/ref/int-literals.log
@@ -770,7 +770,7 @@ Allocated zp ZP_BYTE:5 [ assertType::t2#15 ]
Allocated zp ZP_BYTE:6 [ idx#41 idx#20 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests different integer literal types
// Upstart
diff --git a/src/test/ref/interrupt-volatile-reuse-problem1.log b/src/test/ref/interrupt-volatile-reuse-problem1.log
index 11c0622cf..20ea143ca 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem1.log
+++ b/src/test/ref/interrupt-volatile-reuse-problem1.log
@@ -172,7 +172,7 @@ Allocated zp ZP_BYTE:2 [ col1#0 col1#1 ]
Allocated zp ZP_BYTE:3 [ col2#0 col2#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates problem where volatiles reuse the same ZP addresses for multiple overlapping volatiles
// Upstart
diff --git a/src/test/ref/interrupt-volatile-reuse-problem2.log b/src/test/ref/interrupt-volatile-reuse-problem2.log
index 9d46d0aed..a8bc5b134 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem2.log
+++ b/src/test/ref/interrupt-volatile-reuse-problem2.log
@@ -328,7 +328,7 @@ Allocated zp ZP_BYTE:5 [ col1#0 col1#1 ]
Allocated zp ZP_BYTE:6 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates problem where volatiles reuse ZP addresses of other variables
// Upstart
diff --git a/src/test/ref/irq-hardware-clobber-jsr.log b/src/test/ref/irq-hardware-clobber-jsr.log
index 25944dd7a..d5c94d95b 100644
--- a/src/test/ref/irq-hardware-clobber-jsr.log
+++ b/src/test/ref/irq-hardware-clobber-jsr.log
@@ -292,7 +292,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A minimal working raster hardware IRQ with clobber-based register savings
// Upstart
diff --git a/src/test/ref/irq-hardware-clobber.log b/src/test/ref/irq-hardware-clobber.log
index 693038cd6..d22e90b5a 100644
--- a/src/test/ref/irq-hardware-clobber.log
+++ b/src/test/ref/irq-hardware-clobber.log
@@ -262,7 +262,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A minimal working raster hardware IRQ with clobber-based register savings
// Upstart
diff --git a/src/test/ref/irq-hardware-stack.log b/src/test/ref/irq-hardware-stack.log
index 2dfc65753..22cc27fcd 100644
--- a/src/test/ref/irq-hardware-stack.log
+++ b/src/test/ref/irq-hardware-stack.log
@@ -262,7 +262,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A minimal working raster IRQ
// Upstart
diff --git a/src/test/ref/irq-hardware.log b/src/test/ref/irq-hardware.log
index 67eb39427..06eb3b719 100644
--- a/src/test/ref/irq-hardware.log
+++ b/src/test/ref/irq-hardware.log
@@ -262,7 +262,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A minimal working raster IRQ
// Upstart
diff --git a/src/test/ref/irq-idx-problem.log b/src/test/ref/irq-idx-problem.log
index 17833a02b..e196c4214 100644
--- a/src/test/ref/irq-idx-problem.log
+++ b/src/test/ref/irq-idx-problem.log
@@ -465,7 +465,7 @@ Allocated zp ZP_BYTE:3 [ table_driven_irq::idx#0 ]
Allocated zp ZP_BYTE:4 [ table_driven_irq::val#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test interrupt routine using a variable between calls (irq_idx)
// Upstart
diff --git a/src/test/ref/irq-kernel-minimal.log b/src/test/ref/irq-kernel-minimal.log
index ba8a42e1a..61fbab03e 100644
--- a/src/test/ref/irq-kernel-minimal.log
+++ b/src/test/ref/irq-kernel-minimal.log
@@ -135,7 +135,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A minimal working IRQ
// Upstart
diff --git a/src/test/ref/irq-kernel.log b/src/test/ref/irq-kernel.log
index 71fb384c5..396bd1379 100644
--- a/src/test/ref/irq-kernel.log
+++ b/src/test/ref/irq-kernel.log
@@ -200,7 +200,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A minimal working raster IRQ
// Upstart
diff --git a/src/test/ref/irq-local-var-overlap-problem.log b/src/test/ref/irq-local-var-overlap-problem.log
index ac341f9c5..34835567a 100644
--- a/src/test/ref/irq-local-var-overlap-problem.log
+++ b/src/test/ref/irq-local-var-overlap-problem.log
@@ -898,7 +898,7 @@ Allocated zp ZP_BYTE:20 [ sub_irq::$0 ]
Allocated zp ZP_BYTE:21 [ sub_irq::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates a problem where local variables inside an IRQ are assigned the same zeropage as a variable outside the IRQ
// Upstart
diff --git a/src/test/ref/irq-raster.log b/src/test/ref/irq-raster.log
index b40754ae7..a71aae745 100644
--- a/src/test/ref/irq-raster.log
+++ b/src/test/ref/irq-raster.log
@@ -200,7 +200,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A minimal working raster IRQ
// Upstart
diff --git a/src/test/ref/irq-volatile-bool-problem.log b/src/test/ref/irq-volatile-bool-problem.log
index 2551dfd75..eda95496a 100644
--- a/src/test/ref/irq-volatile-bool-problem.log
+++ b/src/test/ref/irq-volatile-bool-problem.log
@@ -315,7 +315,7 @@ Complete equivalence classes
Allocated zp ZP_BOOL:2 [ framedone#10 framedone#1 framedone#11 framedone#0 framedone#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates a problem where a volatile bool modified at the end of an IRQ is not stored properly
// because it is assigned to the A register
diff --git a/src/test/ref/iterarray.log b/src/test/ref/iterarray.log
index d5f00e3d6..ad61492aa 100644
--- a/src/test/ref/iterarray.log
+++ b/src/test/ref/iterarray.log
@@ -150,7 +150,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/kc-ka-string-encoding.log b/src/test/ref/kc-ka-string-encoding.log
index 8d7aae470..c8ecdc529 100644
--- a/src/test/ref/kc-ka-string-encoding.log
+++ b/src/test/ref/kc-ka-string-encoding.log
@@ -116,7 +116,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/keyboard-glitch.log b/src/test/ref/keyboard-glitch.log
index b24b3e040..abc31748a 100644
--- a/src/test/ref/keyboard-glitch.log
+++ b/src/test/ref/keyboard-glitch.log
@@ -701,7 +701,7 @@ Allocated zp ZP_BYTE:16 [ keyboard_key_pressed::return#10 ]
Allocated zp ZP_BYTE:17 [ pressed::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Exploring keyboard glitch that finds "C" press when pressing space
// The glitch is caused by the "normal" C64 interrupt occuring just as the keyboard is read.
diff --git a/src/test/ref/kickasm-uses-prevent-deletion.log b/src/test/ref/kickasm-uses-prevent-deletion.log
index 04006f724..871103700 100644
--- a/src/test/ref/kickasm-uses-prevent-deletion.log
+++ b/src/test/ref/kickasm-uses-prevent-deletion.log
@@ -131,7 +131,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Ensure that an inline kickasm uses-clause is anough to prevent a function from being deleted
// Upstart
diff --git a/src/test/ref/line-anim.log b/src/test/ref/line-anim.log
index 57c04fb47..abf48d613 100644
--- a/src/test/ref/line-anim.log
+++ b/src/test/ref/line-anim.log
@@ -2781,7 +2781,7 @@ Allocated zp ZP_BYTE:92 [ bitmap_init::$5 ]
Allocated zp ZP_BYTE:93 [ bitmap_init::$6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Animated lines drawn on a single color bitmap
// Upstart
diff --git a/src/test/ref/linegen.log b/src/test/ref/linegen.log
index 40ce2d0c6..18c3cc1ab 100644
--- a/src/test/ref/linegen.log
+++ b/src/test/ref/linegen.log
@@ -2427,7 +2427,7 @@ Allocated zp ZP_BYTE:58 [ divr16u::$2 ]
Allocated zp ZP_WORD:59 [ rem16u#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Linear table generator
// Work in progress towards a sinus generator
diff --git a/src/test/ref/literal-char-minus-number.log b/src/test/ref/literal-char-minus-number.log
index b2784651a..adb41253b 100644
--- a/src/test/ref/literal-char-minus-number.log
+++ b/src/test/ref/literal-char-minus-number.log
@@ -80,7 +80,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests subtracting a number from a literal char
// Upstart
diff --git a/src/test/ref/literal-strings.log b/src/test/ref/literal-strings.log
index 79a1541b5..7993f1790 100644
--- a/src/test/ref/literal-strings.log
+++ b/src/test/ref/literal-strings.log
@@ -145,7 +145,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests literal strings with and without zero-termination
// Upstart
diff --git a/src/test/ref/literal-word-pointer-0.log b/src/test/ref/literal-word-pointer-0.log
index 29f9f2262..48ddfe264 100644
--- a/src/test/ref/literal-word-pointer-0.log
+++ b/src/test/ref/literal-word-pointer-0.log
@@ -115,7 +115,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests assigning a literal word pointer
// Upstart
diff --git a/src/test/ref/literals.log b/src/test/ref/literals.log
index e429dc3c8..da4d12f36 100644
--- a/src/test/ref/literals.log
+++ b/src/test/ref/literals.log
@@ -187,7 +187,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/liverange-call-problem.log b/src/test/ref/liverange-call-problem.log
index e128c13ff..5f1636871 100644
--- a/src/test/ref/liverange-call-problem.log
+++ b/src/test/ref/liverange-call-problem.log
@@ -300,7 +300,7 @@ Allocated zp ZP_WORD:2 [ w2#10 w2#11 ]
Allocated zp ZP_WORD:4 [ w1#11 w1#12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Live ranges were not functioning properly, when multiple method calls were chained - each modifying different vars.
// w1 and w2 ended up having the same zero-page register as their live range was not propagated properly
diff --git a/src/test/ref/liverange-problem-0.log b/src/test/ref/liverange-problem-0.log
index 3334f278e..41ef228a3 100644
--- a/src/test/ref/liverange-problem-0.log
+++ b/src/test/ref/liverange-problem-0.log
@@ -227,7 +227,7 @@ Allocated zp ZP_WORD:10 [ SCREEN_2#0 ]
Allocated zp ZP_WORD:12 [ malloc::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Error where the compiler is reusing the same ZP for two byte* variables.
// SCREEN_1 and SCREEN_2 are both allocated to ZP: 4
diff --git a/src/test/ref/liverange.log b/src/test/ref/liverange.log
index dca093009..6459bc1c1 100644
--- a/src/test/ref/liverange.log
+++ b/src/test/ref/liverange.log
@@ -272,7 +272,7 @@ Allocated zp ZP_BYTE:8 [ main::a#2 ]
Allocated zp ZP_BYTE:9 [ inci::return#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/local-string.log b/src/test/ref/local-string.log
index 6d9a564ca..e104219c6 100644
--- a/src/test/ref/local-string.log
+++ b/src/test/ref/local-string.log
@@ -137,7 +137,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Local constant strings are placed at the start of the method. This means the generated ASM jumps / calls straignt into the constant string
// Upstart
diff --git a/src/test/ref/localscope-loops.log b/src/test/ref/localscope-loops.log
index d5957d611..6d2448901 100644
--- a/src/test/ref/localscope-loops.log
+++ b/src/test/ref/localscope-loops.log
@@ -174,7 +174,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::i1#2 main::i1#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates introducing local scopes inside loops etc
// Upstart
diff --git a/src/test/ref/localscope-simple.log b/src/test/ref/localscope-simple.log
index eb8b012eb..17b4903f7 100644
--- a/src/test/ref/localscope-simple.log
+++ b/src/test/ref/localscope-simple.log
@@ -96,7 +96,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests anonymous scopes inside functions
// Upstart
diff --git a/src/test/ref/long-pointer-0.log b/src/test/ref/long-pointer-0.log
index e7a34ef66..38ff12bb0 100644
--- a/src/test/ref/long-pointer-0.log
+++ b/src/test/ref/long-pointer-0.log
@@ -99,7 +99,7 @@ Complete equivalence classes
Allocated zp ZP_DWORD:2 [ main::long_ptr#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating a long (32bit) pointer on zeropage for 45GS02 flat memory access
// Upstart
diff --git a/src/test/ref/long-pointer-1.log b/src/test/ref/long-pointer-1.log
index f6fbf89be..1c71e0a31 100644
--- a/src/test/ref/long-pointer-1.log
+++ b/src/test/ref/long-pointer-1.log
@@ -100,7 +100,7 @@ Complete equivalence classes
Allocated zp ZP_DWORD:2 [ main::long_ptr#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests creating a long (32bit) pointer on zeropage for 45GS02 flat memory access
// Upstart
diff --git a/src/test/ref/longbranch-interrupt-problem.log b/src/test/ref/longbranch-interrupt-problem.log
index 39359104e..cc17996d3 100644
--- a/src/test/ref/longbranch-interrupt-problem.log
+++ b/src/test/ref/longbranch-interrupt-problem.log
@@ -240,7 +240,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ col#10 col#12 col#0 col#1 col#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that long branch fixing works with interrupt exits (to $ea81)
// Upstart
diff --git a/src/test/ref/longjump.log b/src/test/ref/longjump.log
index f28c5612c..2eb02cb42 100644
--- a/src/test/ref/longjump.log
+++ b/src/test/ref/longjump.log
@@ -120,7 +120,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal example program generating a long jump
// Upstart
diff --git a/src/test/ref/longjump2.log b/src/test/ref/longjump2.log
index 0ddecb74d..2f4454a80 100644
--- a/src/test/ref/longjump2.log
+++ b/src/test/ref/longjump2.log
@@ -222,7 +222,7 @@ Allocated zp ZP_BYTE:2 [ long2::i#2 long2::i#1 ]
Allocated zp ZP_BYTE:3 [ long1::i#2 long1::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal example program generating two long jumps
// Upstart
diff --git a/src/test/ref/loop-break-continue.log b/src/test/ref/loop-break-continue.log
index e6bf36437..cadcac549 100644
--- a/src/test/ref/loop-break-continue.log
+++ b/src/test/ref/loop-break-continue.log
@@ -208,7 +208,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_WORD:3 [ main::screen#2 main::screen#5 main::screen#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates both break & continue statements in a loop
// Prints a message ending at NUL skipping all spaces
diff --git a/src/test/ref/loop-break-nested.log b/src/test/ref/loop-break-nested.log
index b15e4dd98..a49e3289d 100644
--- a/src/test/ref/loop-break-nested.log
+++ b/src/test/ref/loop-break-nested.log
@@ -219,7 +219,7 @@ Allocated zp ZP_WORD:2 [ main::line#2 main::line#1 ]
Allocated zp ZP_BYTE:4 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests break statement in a simple loop
// Upstart
diff --git a/src/test/ref/loop-break.log b/src/test/ref/loop-break.log
index 57d0d5eba..af78a7016 100644
--- a/src/test/ref/loop-break.log
+++ b/src/test/ref/loop-break.log
@@ -136,7 +136,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests break statement in a simple loop
// Upstart
diff --git a/src/test/ref/loop-continue.log b/src/test/ref/loop-continue.log
index 7470b20ed..24a528d64 100644
--- a/src/test/ref/loop-continue.log
+++ b/src/test/ref/loop-continue.log
@@ -144,7 +144,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests break statement in a simple loop
// Upstart
diff --git a/src/test/ref/loop-for-continue.log b/src/test/ref/loop-for-continue.log
index 8628af541..0a4ba1efd 100644
--- a/src/test/ref/loop-for-continue.log
+++ b/src/test/ref/loop-for-continue.log
@@ -203,7 +203,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::idx#2 main::idx#5 main::idx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests continue statement in a simple for()-loop
// Upstart
diff --git a/src/test/ref/loop-for-empty-body.log b/src/test/ref/loop-for-empty-body.log
index 0d5425172..e18bbeb69 100644
--- a/src/test/ref/loop-for-empty-body.log
+++ b/src/test/ref/loop-for-empty-body.log
@@ -153,7 +153,7 @@ Allocated zp ZP_BYTE:2 [ main::b#2 main::b#1 ]
Allocated zp ZP_BYTE:3 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a for-loop with an empty body
// Upstart
diff --git a/src/test/ref/loop-for-sideeffect.log b/src/test/ref/loop-for-sideeffect.log
index 6442cda4c..c05630a76 100644
--- a/src/test/ref/loop-for-sideeffect.log
+++ b/src/test/ref/loop-for-sideeffect.log
@@ -147,7 +147,7 @@ Allocated zp ZP_BYTE:2 [ main::i#3 main::i#6 ]
Allocated zp ZP_BYTE:3 [ main::i#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a for()-loop where the condition has a side-effect
// Currently not standard C compliant (since the condition is not evaluated before the body)
diff --git a/src/test/ref/loop-memset-min.log b/src/test/ref/loop-memset-min.log
index 7e3096dac..6499ea41b 100644
--- a/src/test/ref/loop-memset-min.log
+++ b/src/test/ref/loop-memset-min.log
@@ -271,7 +271,7 @@ Complete equivalence classes
Allocated zp ZP_WORD:2 [ memset::dst#2 memset::dst#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal classic for() loop - coded using while() to test optimization of loop heads
// Upstart
diff --git a/src/test/ref/loop-problem.log b/src/test/ref/loop-problem.log
index 9daefd5cd..3bb174c79 100644
--- a/src/test/ref/loop-problem.log
+++ b/src/test/ref/loop-problem.log
@@ -181,7 +181,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ b::i#2 b::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A simple loop results in NullPointerException during loop analysis
// Upstart
diff --git a/src/test/ref/loop-problem2.log b/src/test/ref/loop-problem2.log
index 4493d2938..1c3657ff8 100644
--- a/src/test/ref/loop-problem2.log
+++ b/src/test/ref/loop-problem2.log
@@ -252,7 +252,7 @@ Allocated zp ZP_WORD:2 [ print_cls::sc#2 print_cls::sc#1 ]
Allocated zp ZP_BYTE:4 [ mode_ctrl::before#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/loop-while-continue.log b/src/test/ref/loop-while-continue.log
index bcfbe778c..d4b125067 100644
--- a/src/test/ref/loop-while-continue.log
+++ b/src/test/ref/loop-while-continue.log
@@ -150,7 +150,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests break statement in a simple loop
// Upstart
diff --git a/src/test/ref/loop-while-min.log b/src/test/ref/loop-while-min.log
index 06f438eec..4dca6a2e4 100644
--- a/src/test/ref/loop-while-min.log
+++ b/src/test/ref/loop-while-min.log
@@ -129,7 +129,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal classic while() loop
// Upstart
diff --git a/src/test/ref/loop-while-sideeffect.log b/src/test/ref/loop-while-sideeffect.log
index 99b90a53b..0b0e4e80c 100644
--- a/src/test/ref/loop-while-sideeffect.log
+++ b/src/test/ref/loop-while-sideeffect.log
@@ -142,7 +142,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#5 ]
Allocated zp ZP_BYTE:3 [ main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a while()-loop where the condition has a side-effect
// Upstart
diff --git a/src/test/ref/loop100.log b/src/test/ref/loop100.log
index df2b99a04..66e2fb0ac 100644
--- a/src/test/ref/loop100.log
+++ b/src/test/ref/loop100.log
@@ -119,7 +119,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/loophead-problem-2.log b/src/test/ref/loophead-problem-2.log
index 388e36e95..d2ee5678f 100644
--- a/src/test/ref/loophead-problem-2.log
+++ b/src/test/ref/loophead-problem-2.log
@@ -372,7 +372,7 @@ Allocated zp ZP_BYTE:11 [ scan_for_lowest::$3 ]
Allocated zp ZP_BYTE:12 [ scan_for_lowest::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Call returns wrong value
// Reported by Clay Cowgill as an NPE (which has been fixed - but this return-value problem has popped up instead)
diff --git a/src/test/ref/loophead-problem-3.log b/src/test/ref/loophead-problem-3.log
index 8276ed48b..770a51282 100644
--- a/src/test/ref/loophead-problem-3.log
+++ b/src/test/ref/loophead-problem-3.log
@@ -369,7 +369,7 @@ Allocated zp ZP_BYTE:23 [ main::$3 ]
Allocated zp ZP_BYTE:24 [ mul16u::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Program where loop-head optimization produces wrong return value
// Reported by Richard-William Loerakker
diff --git a/src/test/ref/loophead-problem.log b/src/test/ref/loophead-problem.log
index cad01f012..64828d332 100644
--- a/src/test/ref/loophead-problem.log
+++ b/src/test/ref/loophead-problem.log
@@ -223,7 +223,7 @@ Allocated zp ZP_BYTE:2 [ popup_selector::k#2 popup_selector::k#1 ]
Allocated zp ZP_BYTE:3 [ opcode#12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates a problem where constant loophead unrolling results in an error
// The result is a NullPointerException
diff --git a/src/test/ref/loopmin.log b/src/test/ref/loopmin.log
index 15bf5f8c9..b69c8cf85 100644
--- a/src/test/ref/loopmin.log
+++ b/src/test/ref/loopmin.log
@@ -185,7 +185,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::s#2 main::s#4 main::s#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/loopnest.log b/src/test/ref/loopnest.log
index 4cae1d47c..c2538d738 100644
--- a/src/test/ref/loopnest.log
+++ b/src/test/ref/loopnest.log
@@ -189,7 +189,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ nest::j#2 nest::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/loopnest2.log b/src/test/ref/loopnest2.log
index 0e16a3622..f67cbec5a 100644
--- a/src/test/ref/loopnest2.log
+++ b/src/test/ref/loopnest2.log
@@ -409,7 +409,7 @@ Allocated zp ZP_BYTE:6 [ nest2::i#4 nest2::i#1 ]
Allocated zp ZP_BYTE:7 [ nest2::j#2 nest2::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/loopnest3.log b/src/test/ref/loopnest3.log
index 25b23c82f..1cef22c9d 100644
--- a/src/test/ref/loopnest3.log
+++ b/src/test/ref/loopnest3.log
@@ -239,7 +239,7 @@ Allocated zp ZP_BYTE:4 [ b::i#0 ]
Allocated zp ZP_BYTE:5 [ c::i#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/loopsplit.log b/src/test/ref/loopsplit.log
index b4ad2f914..80216101e 100644
--- a/src/test/ref/loopsplit.log
+++ b/src/test/ref/loopsplit.log
@@ -204,7 +204,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::s#3 main::s#1 main::s#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/malloc-0.log b/src/test/ref/malloc-0.log
index 320714f83..ea75c2a2e 100644
--- a/src/test/ref/malloc-0.log
+++ b/src/test/ref/malloc-0.log
@@ -275,7 +275,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Experiments with malloc() - a byte array
// Upstart
diff --git a/src/test/ref/malloc-1.log b/src/test/ref/malloc-1.log
index 897cf92b4..0e8742edf 100644
--- a/src/test/ref/malloc-1.log
+++ b/src/test/ref/malloc-1.log
@@ -294,7 +294,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_WORD:3 [ main::w#2 main::w#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Experiments with malloc() - a word array
// Upstart
diff --git a/src/test/ref/mem-alignment.log b/src/test/ref/mem-alignment.log
index 480f8b4e0..70230d84c 100644
--- a/src/test/ref/mem-alignment.log
+++ b/src/test/ref/mem-alignment.log
@@ -192,7 +192,7 @@ Allocated zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
Allocated zp ZP_BYTE:4 [ main::i1#2 main::i1#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test that memory alignment of arrays work
// Upstart
diff --git a/src/test/ref/memcpy-0.log b/src/test/ref/memcpy-0.log
index 6d7f6511a..edc0a7602 100644
--- a/src/test/ref/memcpy-0.log
+++ b/src/test/ref/memcpy-0.log
@@ -522,7 +522,7 @@ Allocated zp ZP_WORD:10 [ memcpy::dst#2 memcpy::dst#4 memcpy::dst#1 ]
Allocated zp ZP_WORD:12 [ memcpy::src_end#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test memcpy - copy charset and screen using memcpy() from stdlib string
// Upstart
diff --git a/src/test/ref/memcpy-1.log b/src/test/ref/memcpy-1.log
index fc4347e48..84cb7d283 100644
--- a/src/test/ref/memcpy-1.log
+++ b/src/test/ref/memcpy-1.log
@@ -517,7 +517,7 @@ Allocated zp ZP_WORD:20 [ memcpy::dst#2 memcpy::dst#4 memcpy::dst#1 ]
Allocated zp ZP_WORD:22 [ memcpy::src_end#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test memcpy on strings (
// Upstart
diff --git a/src/test/ref/memory-heap.log b/src/test/ref/memory-heap.log
index 05314f5b4..8a3f93063 100644
--- a/src/test/ref/memory-heap.log
+++ b/src/test/ref/memory-heap.log
@@ -434,7 +434,7 @@ Allocated zp ZP_BYTE:9 [ main::$4 ]
Allocated zp ZP_WORD:10 [ malloc::mem#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Experiments with malloc()
// Upstart
diff --git a/src/test/ref/min-fmul-16.log b/src/test/ref/min-fmul-16.log
index 47a6478cf..72457a27b 100644
--- a/src/test/ref/min-fmul-16.log
+++ b/src/test/ref/min-fmul-16.log
@@ -1396,7 +1396,7 @@ Allocated zp ZP_BYTE:41 [ mulf_init::$12 ]
Allocated zp ZP_BYTE:42 [ mulf_init::$13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/mixed-array-0.log b/src/test/ref/mixed-array-0.log
index 28da03119..f6a3f8fe7 100644
--- a/src/test/ref/mixed-array-0.log
+++ b/src/test/ref/mixed-array-0.log
@@ -116,7 +116,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test an array with mixed byte/number types
// Upstart
diff --git a/src/test/ref/mixed-array-1.log b/src/test/ref/mixed-array-1.log
index 3b149825b..95eb3a3bc 100644
--- a/src/test/ref/mixed-array-1.log
+++ b/src/test/ref/mixed-array-1.log
@@ -117,7 +117,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test an array with mixed byte/number types
// Upstart
diff --git a/src/test/ref/modglobal.log b/src/test/ref/modglobal.log
index b938e1d69..378c9aa27 100644
--- a/src/test/ref/modglobal.log
+++ b/src/test/ref/modglobal.log
@@ -358,7 +358,7 @@ Allocated zp ZP_BYTE:9 [ cnt#12 ]
Allocated zp ZP_BYTE:10 [ inccnt::return#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/modglobalmin.log b/src/test/ref/modglobalmin.log
index fa6171a75..c0519c7b1 100644
--- a/src/test/ref/modglobalmin.log
+++ b/src/test/ref/modglobalmin.log
@@ -193,7 +193,7 @@ Allocated zp ZP_BYTE:3 [ cnt#11 ]
Allocated zp ZP_BYTE:4 [ cnt#13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/mul8u-min.log b/src/test/ref/mul8u-min.log
index 1da649949..2f908dae6 100644
--- a/src/test/ref/mul8u-min.log
+++ b/src/test/ref/mul8u-min.log
@@ -462,7 +462,7 @@ Allocated zp ZP_BYTE:15 [ main::$3 ]
Allocated zp ZP_BYTE:16 [ mul8u::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal test of mul8u
// Upstart
diff --git a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
index f1f382619..7a821677b 100644
--- a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
+++ b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
@@ -2398,7 +2398,7 @@ Allocated zp ZP_BYTE:32 [ plexShowSprite::$9 ]
Allocated zp ZP_BYTE:33 [ plexShowSprite::$5 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A simple usage of the flexible sprite multiplexer routine
// Upstart
diff --git a/src/test/ref/multiply-2s.log b/src/test/ref/multiply-2s.log
index 19787ba3c..1ea4552d7 100644
--- a/src/test/ref/multiply-2s.log
+++ b/src/test/ref/multiply-2s.log
@@ -248,7 +248,7 @@ Allocated zp ZP_BYTE:6 [ main::sb#0 ]
Allocated zp ZP_BYTE:7 [ main::$12 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Check that multiplication by factors of 2 is converted to shifts
// Upstart
diff --git a/src/test/ref/multiply-ns.log b/src/test/ref/multiply-ns.log
index 2721c1b87..bea4efbb2 100644
--- a/src/test/ref/multiply-ns.log
+++ b/src/test/ref/multiply-ns.log
@@ -542,7 +542,7 @@ Allocated zp ZP_BYTE:31 [ main::$67 ]
Allocated zp ZP_BYTE:32 [ main::$29 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Check that multiplication by constants is converted to shift/add
// Upstart
diff --git a/src/test/ref/nes-array.log b/src/test/ref/nes-array.log
index f11fb74fe..b42e90302 100644
--- a/src/test/ref/nes-array.log
+++ b/src/test/ref/nes-array.log
@@ -287,7 +287,7 @@ Allocated zp ZP_BYTE:17 [ foo::$1 ]
Allocated zp ZP_WORD:18 [ foo::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test a bit of array code from the NES forum
// https://forums.nesdev.com/viewtopic.php?f=2&t=18735
diff --git a/src/test/ref/no-recursion-heavy.log b/src/test/ref/no-recursion-heavy.log
index 1cc3dee1d..14d6cab02 100644
--- a/src/test/ref/no-recursion-heavy.log
+++ b/src/test/ref/no-recursion-heavy.log
@@ -2825,7 +2825,7 @@ Allocated zp ZP_BYTE:7 [ bd#116 bd#154 bd#114 bd#153 bd#113 bd#152 bd#112 bd#151
Allocated zp ZP_BYTE:8 [ bd#117 bd#235 bd#236 bd#237 bd#238 bd#239 bd#240 bd#241 bd#242 bd#243 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/noop-cast-elimination.log b/src/test/ref/noop-cast-elimination.log
index a8cf90baf..ba7fdd2ca 100644
--- a/src/test/ref/noop-cast-elimination.log
+++ b/src/test/ref/noop-cast-elimination.log
@@ -160,7 +160,7 @@ Allocated zp ZP_WORD:3 [ main::sw#2 main::sw#1 ]
Allocated zp ZP_BYTE:5 [ main::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test elimination of noop-casts (signed byte to byte)
// Upstart
diff --git a/src/test/ref/norom-charset.log b/src/test/ref/norom-charset.log
index a96f92bbf..031abaf75 100644
--- a/src/test/ref/norom-charset.log
+++ b/src/test/ref/norom-charset.log
@@ -568,7 +568,7 @@ Allocated zp ZP_BYTE:13 [ gen_char3::$0 ]
Allocated zp ZP_BYTE:14 [ gen_char3::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Generate a charset based on a 5x3 pattern stored in 2 bytes
// Upstart
diff --git a/src/test/ref/number-conversion.log b/src/test/ref/number-conversion.log
index 5078f8e0b..34407e107 100644
--- a/src/test/ref/number-conversion.log
+++ b/src/test/ref/number-conversion.log
@@ -1392,7 +1392,7 @@ Allocated zp ZP_BYTE:3 [ assertType::t2#35 ]
Allocated zp ZP_BYTE:4 [ idx#79 idx#40 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests conversion of numbers to correct int types
// See https://gitlab.com/camelot/kickc/issues/181
diff --git a/src/test/ref/number-inference-sum.log b/src/test/ref/number-inference-sum.log
index 12fa71057..4791cb109 100644
--- a/src/test/ref/number-inference-sum.log
+++ b/src/test/ref/number-inference-sum.log
@@ -175,7 +175,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test inference of number types using a long sum
// Currently fails - because the compiler does not handle byte+byte correctly (not truncating the result to 8 bits)
diff --git a/src/test/ref/number-type.log b/src/test/ref/number-type.log
index 9fd95f3ee..df2d1c1bd 100644
--- a/src/test/ref/number-type.log
+++ b/src/test/ref/number-type.log
@@ -528,7 +528,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the number type used for constant expressions
// Upstart
diff --git a/src/test/ref/operator-lohi-problem-1.log b/src/test/ref/operator-lohi-problem-1.log
index ba9a7676c..0ed9002a7 100644
--- a/src/test/ref/operator-lohi-problem-1.log
+++ b/src/test/ref/operator-lohi-problem-1.log
@@ -148,7 +148,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates problem with constant evaluation of lo/hi-operator
// $20000 /$400 results in a byte value - confusing the lo/hi-evaluation
diff --git a/src/test/ref/operator-lohi-problem.log b/src/test/ref/operator-lohi-problem.log
index 2ab11bf2e..af5816c1c 100644
--- a/src/test/ref/operator-lohi-problem.log
+++ b/src/test/ref/operator-lohi-problem.log
@@ -173,7 +173,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates problem with constant evaluation of lo/hi-operator
// $20000 /$400 results in a byte value - confusing the lo/hi-evaluation
diff --git a/src/test/ref/optimize-unsigned-comparisons.log b/src/test/ref/optimize-unsigned-comparisons.log
index 828ff4ce5..b439763a7 100644
--- a/src/test/ref/optimize-unsigned-comparisons.log
+++ b/src/test/ref/optimize-unsigned-comparisons.log
@@ -211,7 +211,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Examples of unsigned comparisons to values outside the range of unsigned
// These should be optimized to constants
diff --git a/src/test/ref/overlap-allocation-2.log b/src/test/ref/overlap-allocation-2.log
index 890fcc45e..2b10b1ff3 100644
--- a/src/test/ref/overlap-allocation-2.log
+++ b/src/test/ref/overlap-allocation-2.log
@@ -279,7 +279,7 @@ Allocated zp ZP_BYTE:4 [ line::l#2 line::l#0 line::l#1 ]
Allocated zp ZP_BYTE:5 [ plot::x#2 plot::x#0 plot::x#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Two levels of functions to test that register allocation handles live ranges and call-ranges optimally to allocate the fewest possible ZP-variables
// Upstart
diff --git a/src/test/ref/overlap-allocation.log b/src/test/ref/overlap-allocation.log
index 609b65e2a..2fe95f98b 100644
--- a/src/test/ref/overlap-allocation.log
+++ b/src/test/ref/overlap-allocation.log
@@ -276,7 +276,7 @@ Allocated zp ZP_BYTE:4 [ main::k#2 main::k#1 ]
Allocated zp ZP_BYTE:5 [ plot::x#3 plot::x#0 plot::x#1 plot::x#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Allocates ZP to j/k-variables even though all of i, j, k could be allocates to x and be more efficient.
// Reason: Pass4RegisterUpliftCombinations.isAllocationOverlapping() believes i/j/k variables overlaps insode plot()
diff --git a/src/test/ref/parse-negated-struct-ref.log b/src/test/ref/parse-negated-struct-ref.log
index 06134e64f..882d3eab5 100644
--- a/src/test/ref/parse-negated-struct-ref.log
+++ b/src/test/ref/parse-negated-struct-ref.log
@@ -158,7 +158,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ aa_b#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test parsing a negated struct reference - which causes problems with the ASMREL labels !a++
// https://gitlab.com/camelot/kickc/issues/266
diff --git a/src/test/ref/plasma-center.log b/src/test/ref/plasma-center.log
index de9708aec..d7f0fd94e 100644
--- a/src/test/ref/plasma-center.log
+++ b/src/test/ref/plasma-center.log
@@ -5310,7 +5310,7 @@ Allocated zp ZP_BYTE:155 [ init_squares::$4 ]
Allocated zp ZP_WORD:156 [ malloc::mem#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Plasma based on the distance/angle to the screen center
// Upstart
diff --git a/src/test/ref/platform-asm6502.log b/src/test/ref/platform-asm6502.log
index 418b1909f..10102dff2 100644
--- a/src/test/ref/platform-asm6502.log
+++ b/src/test/ref/platform-asm6502.log
@@ -128,7 +128,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is asm6502 / 6502X
+Target platform is asm6502 / MOS6502X
// File Comments
// Tests the target platform ASM6502
// Upstart
diff --git a/src/test/ref/plus-0.log b/src/test/ref/plus-0.log
index 693860182..51fdcb7fc 100644
--- a/src/test/ref/plus-0.log
+++ b/src/test/ref/plus-0.log
@@ -345,7 +345,7 @@ Allocated zp ZP_WORD:6 [ fill::$5 ]
Allocated zp ZP_WORD:8 [ fill::$7 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests elimination of plus 0
// Upstart
diff --git a/src/test/ref/pointer-anding.log b/src/test/ref/pointer-anding.log
index da1c0c5b5..427c2d853 100644
--- a/src/test/ref/pointer-anding.log
+++ b/src/test/ref/pointer-anding.log
@@ -198,7 +198,7 @@ Allocated zp ZP_WORD:10 [ main::vram_ptr#1 ]
Allocated zp ZP_BYTE:12 [ main::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test binary ANDing pointers by Clay Cowgill
// Upstart
diff --git a/src/test/ref/pointer-cast-2.log b/src/test/ref/pointer-cast-2.log
index 7b7eda01a..6744c2614 100644
--- a/src/test/ref/pointer-cast-2.log
+++ b/src/test/ref/pointer-cast-2.log
@@ -160,7 +160,7 @@ Allocated zp ZP_BYTE:2 [ main::ub#0 ]
Allocated zp ZP_BYTE:3 [ main::sb#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests casting pointer types to other pointer types
// Upstart
diff --git a/src/test/ref/pointer-cast-3.log b/src/test/ref/pointer-cast-3.log
index caaf02b7e..ead891f2a 100644
--- a/src/test/ref/pointer-cast-3.log
+++ b/src/test/ref/pointer-cast-3.log
@@ -83,7 +83,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests casting pointer types to other pointer types
// Upstart
diff --git a/src/test/ref/pointer-cast-4.log b/src/test/ref/pointer-cast-4.log
index 9382d8705..e7dadd734 100644
--- a/src/test/ref/pointer-cast-4.log
+++ b/src/test/ref/pointer-cast-4.log
@@ -152,7 +152,7 @@ Allocated zp ZP_WORD:3 [ main::$1 ]
Allocated zp ZP_BYTE:5 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests casting pointer types to other pointer types does not produce any ASM code
// Upstart
diff --git a/src/test/ref/pointer-cast.log b/src/test/ref/pointer-cast.log
index 313374780..695fb7eb8 100644
--- a/src/test/ref/pointer-cast.log
+++ b/src/test/ref/pointer-cast.log
@@ -435,7 +435,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests casting pointer types to other pointer types
// Upstart
diff --git a/src/test/ref/pointer-plus-0.log b/src/test/ref/pointer-plus-0.log
index 07fa8b6d1..a6e811dec 100644
--- a/src/test/ref/pointer-plus-0.log
+++ b/src/test/ref/pointer-plus-0.log
@@ -229,7 +229,7 @@ Allocated zp ZP_WORD:8 [ first::return#1 ]
Allocated zp ZP_WORD:10 [ main::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests pointer plus 0 elimination
// Upstart
diff --git a/src/test/ref/pointer-plus-signed-word.log b/src/test/ref/pointer-plus-signed-word.log
index 23a4478b1..9818e6a7d 100644
--- a/src/test/ref/pointer-plus-signed-word.log
+++ b/src/test/ref/pointer-plus-signed-word.log
@@ -139,7 +139,7 @@ Allocated zp ZP_WORD:4 [ main::sc#0 ]
Allocated zp ZP_BYTE:6 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test adding a signed word to a pointer
// Fragment pbuz1=pbuc1_plus_vwsz1.asm supplied by Richard-William Loerakker
diff --git a/src/test/ref/pointer-pointer-1.log b/src/test/ref/pointer-pointer-1.log
index f5ec54d71..c64c26ed6 100644
--- a/src/test/ref/pointer-pointer-1.log
+++ b/src/test/ref/pointer-pointer-1.log
@@ -109,7 +109,7 @@ Allocated zp ZP_BYTE:2 [ main::b#0 ]
Allocated zp ZP_WORD:3 [ main::pb#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a simple pointer to a pointer
// Upstart
diff --git a/src/test/ref/pointer-pointer-2.log b/src/test/ref/pointer-pointer-2.log
index 36cbf7150..6693b65a8 100644
--- a/src/test/ref/pointer-pointer-2.log
+++ b/src/test/ref/pointer-pointer-2.log
@@ -381,7 +381,7 @@ Allocated zp ZP_BYTE:7 [ main::i#5 main::i#1 ]
Allocated zp ZP_BYTE:8 [ nexttext::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests pointer to pointer in a more complex setup
// Upstart
diff --git a/src/test/ref/pointer-pointer-3.log b/src/test/ref/pointer-pointer-3.log
index d2320596c..07ca81557 100644
--- a/src/test/ref/pointer-pointer-3.log
+++ b/src/test/ref/pointer-pointer-3.log
@@ -197,7 +197,7 @@ Allocated zp ZP_WORD:2 [ setscreen::val#2 ]
Allocated zp ZP_WORD:4 [ screen#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests pointer to pointer in a more complex setup
// Upstart
diff --git a/src/test/ref/pointer-void-0.log b/src/test/ref/pointer-void-0.log
index 6e873abdd..bd60ecdf6 100644
--- a/src/test/ref/pointer-void-0.log
+++ b/src/test/ref/pointer-void-0.log
@@ -116,7 +116,7 @@ Complete equivalence classes
Allocated zp ZP_WORD:2 [ main::w#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test simple void pointer (conversion without casting)
// Upstart
diff --git a/src/test/ref/pointer-void-1.log b/src/test/ref/pointer-void-1.log
index 51d578f8d..450e0412c 100644
--- a/src/test/ref/pointer-void-1.log
+++ b/src/test/ref/pointer-void-1.log
@@ -301,7 +301,7 @@ Allocated zp ZP_WORD:9 [ main::w#0 ]
Allocated zp ZP_BYTE:11 [ main::b#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test simple void pointer - void pointer function
// Upstart
diff --git a/src/test/ref/pointer-void-2.log b/src/test/ref/pointer-void-2.log
index b89ae97ce..3e750c02f 100644
--- a/src/test/ref/pointer-void-2.log
+++ b/src/test/ref/pointer-void-2.log
@@ -282,7 +282,7 @@ Allocated zp ZP_WORD:9 [ main::w#0 ]
Allocated zp ZP_BYTE:11 [ main::b#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test simple void pointer - void pointer function
// Upstart
diff --git a/src/test/ref/pointer-void-3.log b/src/test/ref/pointer-void-3.log
index ac038dd04..76ca416fc 100644
--- a/src/test/ref/pointer-void-3.log
+++ b/src/test/ref/pointer-void-3.log
@@ -250,7 +250,7 @@ Allocated zp ZP_WORD:10 [ main::buf2#0 ]
Allocated zp ZP_WORD:12 [ malloc::return#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test void pointer - issues when assigning returns from malloc()
// Upstart
diff --git a/src/test/ref/print-problem.log b/src/test/ref/print-problem.log
index 3a46edfb5..fd3c9ec75 100644
--- a/src/test/ref/print-problem.log
+++ b/src/test/ref/print-problem.log
@@ -254,7 +254,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ line#12 line#13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/printmsg.log b/src/test/ref/printmsg.log
index f015497a1..f9e5f8ac8 100644
--- a/src/test/ref/printmsg.log
+++ b/src/test/ref/printmsg.log
@@ -496,7 +496,7 @@ Allocated zp ZP_WORD:4 [ print_str::str#4 print_str::str#6 print_str::str#0 ]
Allocated zp ZP_WORD:6 [ print_char_cursor#13 print_char_cursor#29 print_char_cursor#31 print_char_cursor#32 print_char_cursor#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/problem-negative-word-const.log b/src/test/ref/problem-negative-word-const.log
index f34332c0c..8f4cbd332 100644
--- a/src/test/ref/problem-negative-word-const.log
+++ b/src/test/ref/problem-negative-word-const.log
@@ -204,7 +204,7 @@ Allocated zp ZP_BYTE:5 [ main::$0 ]
Allocated zp ZP_BYTE:6 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Problem with assigning negative word constant (vwuz1=vbuc1)
// Upstart
diff --git a/src/test/ref/processor-port-test.log b/src/test/ref/processor-port-test.log
index e76396a4f..1cc2e7090 100644
--- a/src/test/ref/processor-port-test.log
+++ b/src/test/ref/processor-port-test.log
@@ -2530,7 +2530,7 @@ Allocated zp ZP_BYTE:15 [ print_byte::$0 ]
Allocated zp ZP_BYTE:16 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test the functionality of the C64 processor port ($00/$01)
// Tests by setting the value of the processor port - and then printing out values of $00/$01/$a000/$d000/$e000
diff --git a/src/test/ref/ptr-complex.log b/src/test/ref/ptr-complex.log
index aa02f9327..4fee3f314 100644
--- a/src/test/ref/ptr-complex.log
+++ b/src/test/ref/ptr-complex.log
@@ -277,7 +277,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test some complex pointers
// Upstart
diff --git a/src/test/ref/ptrptr-optimize-0.log b/src/test/ref/ptrptr-optimize-0.log
index 2923ece18..6b1af61b2 100644
--- a/src/test/ref/ptrptr-optimize-0.log
+++ b/src/test/ref/ptrptr-optimize-0.log
@@ -91,7 +91,7 @@ Complete equivalence classes
Allocated zp ZP_WORD:2 [ main::screen#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests optimization of constant pointers to pointers
// Upstart
diff --git a/src/test/ref/ptrptr-optimize-1.log b/src/test/ref/ptrptr-optimize-1.log
index 4233f0194..fdeed4982 100644
--- a/src/test/ref/ptrptr-optimize-1.log
+++ b/src/test/ref/ptrptr-optimize-1.log
@@ -161,7 +161,7 @@ Allocated zp ZP_BYTE:2 [ sub::ch#2 ]
Allocated zp ZP_WORD:3 [ main::screen#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests optimization of constant pointers to pointers
// Upstart
diff --git a/src/test/ref/ptrptr-optimize-2.log b/src/test/ref/ptrptr-optimize-2.log
index e5a02c01a..2124ae77e 100644
--- a/src/test/ref/ptrptr-optimize-2.log
+++ b/src/test/ref/ptrptr-optimize-2.log
@@ -161,7 +161,7 @@ Allocated zp ZP_BYTE:2 [ sub::ch#2 ]
Allocated zp ZP_WORD:3 [ main::screen#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests (non-)optimization of constant pointers to pointers
// The two examples of &screen is not detected as identical leading to ASM that could be optimized more
diff --git a/src/test/ref/ptrtest.log b/src/test/ref/ptrtest.log
index 3fc7a6189..143abda9f 100644
--- a/src/test/ref/ptrtest.log
+++ b/src/test/ref/ptrtest.log
@@ -541,7 +541,7 @@ Allocated zp ZP_BYTE:10 [ rvalue::b#3 rvalue::b#1 rvalue::b#2 ]
Allocated zp ZP_BYTE:11 [ lvalue::i#2 lvalue::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test all types of pointers
// Upstart
diff --git a/src/test/ref/ptrtestmin.log b/src/test/ref/ptrtestmin.log
index 7532dfbd3..bf4618b7c 100644
--- a/src/test/ref/ptrtestmin.log
+++ b/src/test/ref/ptrtestmin.log
@@ -164,7 +164,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::b#2 main::b#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test all types of pointers
// Upstart
diff --git a/src/test/ref/reserve-zp-global.log b/src/test/ref/reserve-zp-global.log
index 104eaa8d6..0fb63e666 100644
--- a/src/test/ref/reserve-zp-global.log
+++ b/src/test/ref/reserve-zp-global.log
@@ -188,7 +188,7 @@ Allocated zp ZP_BYTE:8 [ main::$0 ]
Allocated zp ZP_BYTE:9 [ sub1::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates global directive reserving addresses on zeropage
// Upstart
diff --git a/src/test/ref/reserve-zp-procedure-1.log b/src/test/ref/reserve-zp-procedure-1.log
index 69a6e30d7..4b13ec9b7 100644
--- a/src/test/ref/reserve-zp-procedure-1.log
+++ b/src/test/ref/reserve-zp-procedure-1.log
@@ -188,7 +188,7 @@ Allocated zp ZP_BYTE:8 [ main::$0 ]
Allocated zp ZP_BYTE:9 [ sub1::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates a procedure reserving addresses on zeropage
// Upstart
diff --git a/src/test/ref/reserve-zp-procedure-2.log b/src/test/ref/reserve-zp-procedure-2.log
index ffd5cf243..7e4bada3d 100644
--- a/src/test/ref/reserve-zp-procedure-2.log
+++ b/src/test/ref/reserve-zp-procedure-2.log
@@ -280,7 +280,7 @@ Allocated zp ZP_BYTE:16 [ sub2::return#1 ]
Allocated zp ZP_BYTE:17 [ sub1::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates a procedure reserving addresses on zeropage
// Upstart
diff --git a/src/test/ref/reserve-zp-procedure-3.log b/src/test/ref/reserve-zp-procedure-3.log
index ca961d117..49fe135b2 100644
--- a/src/test/ref/reserve-zp-procedure-3.log
+++ b/src/test/ref/reserve-zp-procedure-3.log
@@ -189,7 +189,7 @@ Allocated zp ZP_BYTE:8 [ main::$0 ]
Allocated zp ZP_BYTE:9 [ sub1::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates a procedure reserving addresses on zeropage
// Upstart
diff --git a/src/test/ref/robozzle64-label-problem.log b/src/test/ref/robozzle64-label-problem.log
index bd9e62621..a72df8e11 100644
--- a/src/test/ref/robozzle64-label-problem.log
+++ b/src/test/ref/robozzle64-label-problem.log
@@ -446,7 +446,7 @@ Allocated zp ZP_WORD:16 [ main::z2#0 ]
Allocated zp ZP_BYTE:18 [ mul8u::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/roll-sprite-msb.log b/src/test/ref/roll-sprite-msb.log
index 690deac0a..1252e58ab 100644
--- a/src/test/ref/roll-sprite-msb.log
+++ b/src/test/ref/roll-sprite-msb.log
@@ -332,7 +332,7 @@ Allocated zp ZP_BYTE:11 [ position_sprite::$5 ]
Allocated zp ZP_BYTE:12 [ position_sprite::$6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests rolling sprite MSB by variable amount
// Upstart
diff --git a/src/test/ref/roll-variable.log b/src/test/ref/roll-variable.log
index 6afb90f93..8c86ea29a 100644
--- a/src/test/ref/roll-variable.log
+++ b/src/test/ref/roll-variable.log
@@ -132,7 +132,7 @@ Allocated zp ZP_BYTE:2 [ main::b#2 main::b#1 ]
Allocated zp ZP_BYTE:3 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Rolling constants by a variable amount
// Upstart
diff --git a/src/test/ref/runtime-unused-procedure.log b/src/test/ref/runtime-unused-procedure.log
index 9d35e161c..08044064d 100644
--- a/src/test/ref/runtime-unused-procedure.log
+++ b/src/test/ref/runtime-unused-procedure.log
@@ -155,7 +155,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that a procedure that is never called, but requires static analysis is correctly eliminated
// Upstart
diff --git a/src/test/ref/sandbox-ternary-error.log b/src/test/ref/sandbox-ternary-error.log
index 992b909b1..82fcd35f1 100644
--- a/src/test/ref/sandbox-ternary-error.log
+++ b/src/test/ref/sandbox-ternary-error.log
@@ -221,7 +221,7 @@ Allocated zp ZP_BYTE:2 [ main::b#2 main::b#1 ]
Allocated zp ZP_BYTE:3 [ main::$7 main::$5 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates error with nested ternary operator
// Upstart
diff --git a/src/test/ref/sandbox.log b/src/test/ref/sandbox.log
index 2c92b2e23..ad6a05730 100644
--- a/src/test/ref/sandbox.log
+++ b/src/test/ref/sandbox.log
@@ -4426,7 +4426,7 @@ Allocated zp ZP_WORD:109 [ div10::val#3 ]
Allocated zp ZP_WORD:111 [ div10::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/scan-desire-problem.log b/src/test/ref/scan-desire-problem.log
index d2b0d4938..7df41776c 100644
--- a/src/test/ref/scan-desire-problem.log
+++ b/src/test/ref/scan-desire-problem.log
@@ -1391,7 +1391,7 @@ Allocated zp ZP_BYTE:46 [ mul8u::$1 ]
Allocated zp ZP_WORD:47 [ memset::end#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates a problem with a missing fragment - pbuc1_derefidx_vwuz1=vbuz2
// Upstart
diff --git a/src/test/ref/screen-center-angle.log b/src/test/ref/screen-center-angle.log
index 8f4a44d3d..087bc64fe 100644
--- a/src/test/ref/screen-center-angle.log
+++ b/src/test/ref/screen-center-angle.log
@@ -2736,7 +2736,7 @@ Allocated zp ZP_BYTE:90 [ init_font_hex::$2 ]
Allocated zp ZP_BYTE:91 [ init_font_hex::idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Calculate the angle to the center of the screen - and show it using font-hex
// 4.65 million cycles
diff --git a/src/test/ref/screen-center-distance.log b/src/test/ref/screen-center-distance.log
index 3c001ba85..fe88f990b 100644
--- a/src/test/ref/screen-center-distance.log
+++ b/src/test/ref/screen-center-distance.log
@@ -3230,7 +3230,7 @@ Allocated zp ZP_BYTE:104 [ init_font_hex::$2 ]
Allocated zp ZP_BYTE:105 [ init_font_hex::idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Calculate the distance to the center of the screen - and show it using font-hex
// Upstart
diff --git a/src/test/ref/screen-show-spiral-buckets.log b/src/test/ref/screen-show-spiral-buckets.log
index 656f16ae7..45cd856c2 100644
--- a/src/test/ref/screen-show-spiral-buckets.log
+++ b/src/test/ref/screen-show-spiral-buckets.log
@@ -4485,7 +4485,7 @@ Allocated zp ZP_BYTE:172 [ init_squares::$3 ]
Allocated zp ZP_BYTE:173 [ init_squares::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Fill screen using a spiral based on distance-to-center / angle-to-center
// Utilizes a bucket sort for identifying the minimum angle/distance
diff --git a/src/test/ref/screen-show-spiral.log b/src/test/ref/screen-show-spiral.log
index 87656d77b..e51694e44 100644
--- a/src/test/ref/screen-show-spiral.log
+++ b/src/test/ref/screen-show-spiral.log
@@ -3518,7 +3518,7 @@ Allocated zp ZP_BYTE:125 [ init_squares::$4 ]
Allocated zp ZP_WORD:126 [ malloc::mem#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Fill screen using a spiral based on distance-to-center / angle-to-center
// Upstart
diff --git a/src/test/ref/scroll-clobber.log b/src/test/ref/scroll-clobber.log
index ddee6f9ad..806d06e8e 100644
--- a/src/test/ref/scroll-clobber.log
+++ b/src/test/ref/scroll-clobber.log
@@ -200,7 +200,7 @@ Allocated zp ZP_BYTE:3 [ main::c#2 main::c#0 main::c#1 ]
Allocated zp ZP_WORD:4 [ main::nxt#4 main::nxt#3 main::nxt#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/scrollbig-clobber.log b/src/test/ref/scrollbig-clobber.log
index 9ca9bcb37..4dbf60de3 100644
--- a/src/test/ref/scrollbig-clobber.log
+++ b/src/test/ref/scrollbig-clobber.log
@@ -288,7 +288,7 @@ Allocated zp ZP_BYTE:6 [ next_char::return#0 ]
Allocated zp ZP_BYTE:7 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Clobber problem in next_char return value
// Upstart
diff --git a/src/test/ref/semi-struct-1.log b/src/test/ref/semi-struct-1.log
index 363e1e671..3b7b1a16a 100644
--- a/src/test/ref/semi-struct-1.log
+++ b/src/test/ref/semi-struct-1.log
@@ -1574,7 +1574,7 @@ Allocated zp ZP_WORD:21 [ init_points::getPoint1_return#0 ]
Allocated zp ZP_BYTE:23 [ init_points::pos#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Implementing a semi-struct without the struct keyword by using pointer math and inline functions
//
diff --git a/src/test/ref/semi-struct-2.log b/src/test/ref/semi-struct-2.log
index 170b82da7..dfca67858 100644
--- a/src/test/ref/semi-struct-2.log
+++ b/src/test/ref/semi-struct-2.log
@@ -5272,7 +5272,7 @@ Allocated zp ZP_BYTE:65 [ initEntry::$25 ]
Allocated zp ZP_BYTE:66 [ mul8u::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Implementing a semi-struct without the struct keyword by using pointer math and inline functions
//
diff --git a/src/test/ref/sequence-locality-0.log b/src/test/ref/sequence-locality-0.log
index 14a96cf8a..380d0e7e3 100644
--- a/src/test/ref/sequence-locality-0.log
+++ b/src/test/ref/sequence-locality-0.log
@@ -211,7 +211,7 @@ Allocated zp ZP_BYTE:3 [ main::idx#3 main::idx#6 main::idx#1 main::idx#2 ]
Allocated zp ZP_BYTE:4 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests statement sequence locality of if(cond) { stmt1; } else { stmt2; }
// Upstart
diff --git a/src/test/ref/sequence-locality-1.log b/src/test/ref/sequence-locality-1.log
index fafe2a843..779001640 100644
--- a/src/test/ref/sequence-locality-1.log
+++ b/src/test/ref/sequence-locality-1.log
@@ -209,7 +209,7 @@ Allocated zp ZP_BYTE:3 [ main::idx#2 main::idx#1 ]
Allocated zp ZP_BYTE:4 [ main::j#2 main::j#4 main::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests statement sequence locality of if(cond) { stmt1; } else { stmt2; }
// Upstart
diff --git a/src/test/ref/sieve-min.log b/src/test/ref/sieve-min.log
index 42a2b2134..3d47b3468 100644
--- a/src/test/ref/sieve-min.log
+++ b/src/test/ref/sieve-min.log
@@ -1045,7 +1045,7 @@ Allocated zp ZP_BYTE:22 [ print_byte::$0 ]
Allocated zp ZP_BYTE:23 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/sieve.log b/src/test/ref/sieve.log
index 8cc0b47ce..648f4ded8 100644
--- a/src/test/ref/sieve.log
+++ b/src/test/ref/sieve.log
@@ -4260,7 +4260,7 @@ Allocated zp ZP_DWORD:134 [ clock::return#0 ]
Allocated zp ZP_WORD:138 [ memset::end#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/signed-bytes.log b/src/test/ref/signed-bytes.log
index 17a05d950..0a426f925 100644
--- a/src/test/ref/signed-bytes.log
+++ b/src/test/ref/signed-bytes.log
@@ -160,7 +160,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/signed-indexed-subtract.log b/src/test/ref/signed-indexed-subtract.log
index 68097b888..3c5e4f74b 100644
--- a/src/test/ref/signed-indexed-subtract.log
+++ b/src/test/ref/signed-indexed-subtract.log
@@ -1209,7 +1209,7 @@ Allocated zp ZP_BYTE:20 [ print_byte::$2 ]
Allocated zp ZP_BYTE:21 [ sub::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that signed indexed subtract works as intended
// Upstart
diff --git a/src/test/ref/signed-word-minus-byte-2.log b/src/test/ref/signed-word-minus-byte-2.log
index ff29b71b0..1cac01a4f 100644
--- a/src/test/ref/signed-word-minus-byte-2.log
+++ b/src/test/ref/signed-word-minus-byte-2.log
@@ -165,7 +165,7 @@ Allocated zp ZP_BYTE:4 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:5 [ main::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests subtracting bytes from signed words
// Upstart
diff --git a/src/test/ref/signed-words.log b/src/test/ref/signed-words.log
index cd2e3b48b..9fcd504c9 100644
--- a/src/test/ref/signed-words.log
+++ b/src/test/ref/signed-words.log
@@ -970,7 +970,7 @@ Allocated zp ZP_BYTE:24 [ anim::$10 ]
Allocated zp ZP_BYTE:25 [ anim::$11 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/simple-loop.log b/src/test/ref/simple-loop.log
index 4b9fec424..9337bd99a 100644
--- a/src/test/ref/simple-loop.log
+++ b/src/test/ref/simple-loop.log
@@ -143,7 +143,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/sinus-basic.log b/src/test/ref/sinus-basic.log
index 1f1d7d945..020903c3c 100644
--- a/src/test/ref/sinus-basic.log
+++ b/src/test/ref/sinus-basic.log
@@ -1333,7 +1333,7 @@ Allocated zp ZP_BYTE:27 [ setMEMtoFAC::prepareMEM1_$0#0 ]
Allocated zp ZP_BYTE:28 [ setMEMtoFAC::prepareMEM1_$1#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/sinusgen16.log b/src/test/ref/sinusgen16.log
index 08b4a87f9..badbfa5d1 100644
--- a/src/test/ref/sinusgen16.log
+++ b/src/test/ref/sinusgen16.log
@@ -2805,7 +2805,7 @@ Allocated zp ZP_BYTE:131 [ divr16u::$2 ]
Allocated zp ZP_WORD:132 [ rem16u#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Generates a 16-bit signed sinus
// Upstart
diff --git a/src/test/ref/sinusgen16b.log b/src/test/ref/sinusgen16b.log
index 02fd0965e..ec6d681f6 100644
--- a/src/test/ref/sinusgen16b.log
+++ b/src/test/ref/sinusgen16b.log
@@ -3677,7 +3677,7 @@ Allocated zp ZP_WORD:186 [ sin16s::x5_128#0 ]
Allocated zp ZP_WORD:188 [ sin16s::usinx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Generates a 16-bit signed sinus
// Upstart
diff --git a/src/test/ref/sinusgen8.log b/src/test/ref/sinusgen8.log
index 23a063e0a..13f743401 100644
--- a/src/test/ref/sinusgen8.log
+++ b/src/test/ref/sinusgen8.log
@@ -2761,7 +2761,7 @@ Allocated zp ZP_BYTE:75 [ divr16u::$1 ]
Allocated zp ZP_BYTE:76 [ divr16u::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/sinusgen8b.log b/src/test/ref/sinusgen8b.log
index b2c451f23..57a001483 100644
--- a/src/test/ref/sinusgen8b.log
+++ b/src/test/ref/sinusgen8b.log
@@ -3945,7 +3945,7 @@ Allocated zp ZP_WORD:188 [ divr16u::return#2 ]
Allocated zp ZP_WORD:190 [ div16u::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/sinusgenscale8.log b/src/test/ref/sinusgenscale8.log
index fce2fafc9..8d6714104 100644
--- a/src/test/ref/sinusgenscale8.log
+++ b/src/test/ref/sinusgenscale8.log
@@ -3817,7 +3817,7 @@ Allocated zp ZP_BYTE:90 [ divr16u::$1 ]
Allocated zp ZP_BYTE:91 [ divr16u::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/sizeof-arrays.log b/src/test/ref/sizeof-arrays.log
index eb9514b66..4cb18bd99 100644
--- a/src/test/ref/sizeof-arrays.log
+++ b/src/test/ref/sizeof-arrays.log
@@ -354,7 +354,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the sizeof() operator on arrays
// Upstart
diff --git a/src/test/ref/sizeof-expr.log b/src/test/ref/sizeof-expr.log
index c9f0b4b99..98d9e1962 100644
--- a/src/test/ref/sizeof-expr.log
+++ b/src/test/ref/sizeof-expr.log
@@ -318,7 +318,7 @@ Allocated zp ZP_BYTE:2 [ main::b#0 ]
Allocated zp ZP_WORD:3 [ main::w#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the sizeof() operator on values/expressions
// Upstart
diff --git a/src/test/ref/sizeof-struct.log b/src/test/ref/sizeof-struct.log
index 9c3eee8cf..96192f1c9 100644
--- a/src/test/ref/sizeof-struct.log
+++ b/src/test/ref/sizeof-struct.log
@@ -350,7 +350,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the sizeof() operator on structs
// Upstart
diff --git a/src/test/ref/sizeof-types.log b/src/test/ref/sizeof-types.log
index 5b75012a0..bc681cdce 100644
--- a/src/test/ref/sizeof-types.log
+++ b/src/test/ref/sizeof-types.log
@@ -402,7 +402,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the sizeof() operator on types
// Upstart
diff --git a/src/test/ref/statement-sequence-1.log b/src/test/ref/statement-sequence-1.log
index 0f1ad021b..147418cbb 100644
--- a/src/test/ref/statement-sequence-1.log
+++ b/src/test/ref/statement-sequence-1.log
@@ -217,7 +217,7 @@ Allocated zp ZP_BYTE:3 [ main::c#2 main::c#0 main::c#1 ]
Allocated zp ZP_BYTE:4 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests statement sequence generation
// Upstart
diff --git a/src/test/ref/string-const-consolidation-noroot.log b/src/test/ref/string-const-consolidation-noroot.log
index 8546d8716..4aa82f2aa 100644
--- a/src/test/ref/string-const-consolidation-noroot.log
+++ b/src/test/ref/string-const-consolidation-noroot.log
@@ -264,7 +264,7 @@ Allocated zp ZP_WORD:2 [ screen#18 screen#12 screen#5 ]
Allocated zp ZP_WORD:4 [ print::string#4 print::string#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that identical strings are consolidated
// Upstart
diff --git a/src/test/ref/string-const-consolidation.log b/src/test/ref/string-const-consolidation.log
index 064da5add..b17d8fedf 100644
--- a/src/test/ref/string-const-consolidation.log
+++ b/src/test/ref/string-const-consolidation.log
@@ -264,7 +264,7 @@ Allocated zp ZP_WORD:2 [ screen#18 screen#12 screen#5 ]
Allocated zp ZP_WORD:4 [ print::string#4 print::string#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that identical strings are consolidated
// Upstart
diff --git a/src/test/ref/string-encoding-literals.log b/src/test/ref/string-encoding-literals.log
index 09413e0a5..7c1139721 100644
--- a/src/test/ref/string-encoding-literals.log
+++ b/src/test/ref/string-encoding-literals.log
@@ -227,7 +227,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test string encoding via literals
// Upstart
diff --git a/src/test/ref/string-encoding-pragma.log b/src/test/ref/string-encoding-pragma.log
index 243c098b0..306114396 100644
--- a/src/test/ref/string-encoding-pragma.log
+++ b/src/test/ref/string-encoding-pragma.log
@@ -212,7 +212,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test string encoding via literals
// Upstart
diff --git a/src/test/ref/string-escapes-0.log b/src/test/ref/string-escapes-0.log
index f47e4d138..ce668eafb 100644
--- a/src/test/ref/string-escapes-0.log
+++ b/src/test/ref/string-escapes-0.log
@@ -138,7 +138,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test using some simple supported string escapes \r \f \n \' \"
// Upstart
diff --git a/src/test/ref/string-escapes-1.log b/src/test/ref/string-escapes-1.log
index 0171f76f7..f35577b1c 100644
--- a/src/test/ref/string-escapes-1.log
+++ b/src/test/ref/string-escapes-1.log
@@ -231,7 +231,7 @@ Allocated zp ZP_WORD:4 [ main::line#2 main::line#5 main::line#8 ]
Allocated zp ZP_WORD:6 [ main::cursor#3 main::cursor#6 main::cursor#1 main::cursor#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test using some simple supported string escape \n in both string and char
// Upstart
diff --git a/src/test/ref/string-escapes-2.log b/src/test/ref/string-escapes-2.log
index 6bd37f739..2f6821c48 100644
--- a/src/test/ref/string-escapes-2.log
+++ b/src/test/ref/string-escapes-2.log
@@ -178,7 +178,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ chrout::c#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test using some simple supported string escape characters in PETSCII
// Upstart
diff --git a/src/test/ref/string-escapes-3.log b/src/test/ref/string-escapes-3.log
index 401c84eed..20240c963 100644
--- a/src/test/ref/string-escapes-3.log
+++ b/src/test/ref/string-escapes-3.log
@@ -243,7 +243,7 @@ Allocated zp ZP_WORD:6 [ main::cursor#3 main::cursor#6 main::cursor#1 main::curs
Allocated zp ZP_BYTE:8 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test using some simple supported string escape \n in both string and char
// Uses encoding PETSCII mixed
diff --git a/src/test/ref/strip.log b/src/test/ref/strip.log
index 769309f6c..c136f48fc 100644
--- a/src/test/ref/strip.log
+++ b/src/test/ref/strip.log
@@ -408,7 +408,7 @@ Allocated zp ZP_WORD:9 [ strip::dest#2 strip::dest#0 strip::dest#4 strip::dest#1
Allocated zp ZP_WORD:11 [ strip::p#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests of strip() function from https://news.ycombinator.com/item?id=12080871
// Upstart
diff --git a/src/test/ref/struct-0.log b/src/test/ref/struct-0.log
index b201e8779..9429fd52b 100644
--- a/src/test/ref/struct-0.log
+++ b/src/test/ref/struct-0.log
@@ -156,7 +156,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - declaration, instantiation and usage
// Upstart
diff --git a/src/test/ref/struct-1.log b/src/test/ref/struct-1.log
index 8b1fc17ae..503a8a95c 100644
--- a/src/test/ref/struct-1.log
+++ b/src/test/ref/struct-1.log
@@ -207,7 +207,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - two instances being used.
// Upstart
diff --git a/src/test/ref/struct-10.log b/src/test/ref/struct-10.log
index c71fceb8d..d1380c4c8 100644
--- a/src/test/ref/struct-10.log
+++ b/src/test/ref/struct-10.log
@@ -148,7 +148,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates a problem with pointer sizeof()-rewriting for pointers inside structs
// Upstart
diff --git a/src/test/ref/struct-11.log b/src/test/ref/struct-11.log
index 767142e58..687ca2b6b 100644
--- a/src/test/ref/struct-11.log
+++ b/src/test/ref/struct-11.log
@@ -1508,7 +1508,7 @@ Allocated zp ZP_DWORD:41 [ ultoa_append::sub#0 ]
Allocated zp ZP_DWORD:45 [ ultoa_append::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Example of a struct containing an array
// Upstart
diff --git a/src/test/ref/struct-2.log b/src/test/ref/struct-2.log
index 965c4f753..8bfaa613c 100644
--- a/src/test/ref/struct-2.log
+++ b/src/test/ref/struct-2.log
@@ -228,7 +228,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - two instances being copied (using assignment)
// Upstart
diff --git a/src/test/ref/struct-3.log b/src/test/ref/struct-3.log
index 19d52394f..31216ec73 100644
--- a/src/test/ref/struct-3.log
+++ b/src/test/ref/struct-3.log
@@ -280,7 +280,7 @@ Allocated zp ZP_BYTE:3 [ idx#11 idx#12 ]
Allocated zp ZP_BYTE:4 [ idx#4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - passing struct value parameter
// Upstart
diff --git a/src/test/ref/struct-4.log b/src/test/ref/struct-4.log
index 6153cb116..3aaa3736f 100644
--- a/src/test/ref/struct-4.log
+++ b/src/test/ref/struct-4.log
@@ -139,7 +139,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - initializing using a value list
// Upstart
diff --git a/src/test/ref/struct-5.log b/src/test/ref/struct-5.log
index e07de9fdb..16a2fa686 100644
--- a/src/test/ref/struct-5.log
+++ b/src/test/ref/struct-5.log
@@ -243,7 +243,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - struct return value
// Upstart
diff --git a/src/test/ref/struct-6.log b/src/test/ref/struct-6.log
index 88c1959c8..2f9d6b89d 100644
--- a/src/test/ref/struct-6.log
+++ b/src/test/ref/struct-6.log
@@ -161,7 +161,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - nesting structs
// Upstart
diff --git a/src/test/ref/struct-7.log b/src/test/ref/struct-7.log
index b4d97cf15..0a2c7371a 100644
--- a/src/test/ref/struct-7.log
+++ b/src/test/ref/struct-7.log
@@ -223,7 +223,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - nesting structs 3 levels
// Upstart
diff --git a/src/test/ref/struct-8.log b/src/test/ref/struct-8.log
index 6fd9fc829..8ed53cdfe 100644
--- a/src/test/ref/struct-8.log
+++ b/src/test/ref/struct-8.log
@@ -173,7 +173,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - nested struct where a sub-struct is assigned out
// Upstart
diff --git a/src/test/ref/struct-9.log b/src/test/ref/struct-9.log
index 95b99bb4b..8f01af36e 100644
--- a/src/test/ref/struct-9.log
+++ b/src/test/ref/struct-9.log
@@ -177,7 +177,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - nesting structs
// Upstart
diff --git a/src/test/ref/struct-pos-fill.log b/src/test/ref/struct-pos-fill.log
index d4a9608ba..c8b07f24b 100644
--- a/src/test/ref/struct-pos-fill.log
+++ b/src/test/ref/struct-pos-fill.log
@@ -453,7 +453,7 @@ Allocated zp ZP_BYTE:6 [ row#12 row#2 ]
Allocated zp ZP_BYTE:7 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Example of structs that can be optimized by going planar
// https://cc65.github.io/mailarchive/2010-09/8593.html?fbclid=IwAR1IF_cTdyWcFeKU93VfL2Un1EuLjkGh7O7dQ4EVj4kpJzJAj01dbmEFQt8
diff --git a/src/test/ref/struct-ptr-0.log b/src/test/ref/struct-ptr-0.log
index f80431b48..1cdf959d8 100644
--- a/src/test/ref/struct-ptr-0.log
+++ b/src/test/ref/struct-ptr-0.log
@@ -268,7 +268,7 @@ Allocated zp ZP_BYTE:5 [ main::$0 ]
Allocated zp ZP_BYTE:6 [ main::$7 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - array of struct
// Upstart
diff --git a/src/test/ref/struct-ptr-1.log b/src/test/ref/struct-ptr-1.log
index 588ebb91c..455adeec6 100644
--- a/src/test/ref/struct-ptr-1.log
+++ b/src/test/ref/struct-ptr-1.log
@@ -321,7 +321,7 @@ Allocated zp ZP_BYTE:5 [ main::$8 ]
Allocated zp ZP_BYTE:6 [ main::$17 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - array of struct - near pointer math indexing
// Upstart
diff --git a/src/test/ref/struct-ptr-10.log b/src/test/ref/struct-ptr-10.log
index e426744cb..e216d24ac 100644
--- a/src/test/ref/struct-ptr-10.log
+++ b/src/test/ref/struct-ptr-10.log
@@ -298,7 +298,7 @@ Allocated zp ZP_WORD:19 [ main::$15 ]
Allocated zp ZP_WORD:21 [ main::$16 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - array with 256+ structs
// Upstart
diff --git a/src/test/ref/struct-ptr-11.log b/src/test/ref/struct-ptr-11.log
index bb1f8be42..df71e1e42 100644
--- a/src/test/ref/struct-ptr-11.log
+++ b/src/test/ref/struct-ptr-11.log
@@ -306,7 +306,7 @@ Allocated zp ZP_BYTE:7 [ main::$19 ]
Allocated zp ZP_BYTE:8 [ main::$7 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - array of 3-byte structs (required *3)
// Upstart
diff --git a/src/test/ref/struct-ptr-12-ref.log b/src/test/ref/struct-ptr-12-ref.log
index 8794ab609..b8bf1c934 100644
--- a/src/test/ref/struct-ptr-12-ref.log
+++ b/src/test/ref/struct-ptr-12-ref.log
@@ -144,7 +144,7 @@ Allocated zp ZP_BYTE:4 [ main::$1 ]
Allocated zp ZP_BYTE:5 [ main::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Reference file for Minimal struct - using address-of
// Upstart
diff --git a/src/test/ref/struct-ptr-12.log b/src/test/ref/struct-ptr-12.log
index ed90cb364..97764ccc3 100644
--- a/src/test/ref/struct-ptr-12.log
+++ b/src/test/ref/struct-ptr-12.log
@@ -160,7 +160,7 @@ Allocated zp ZP_BYTE:2 [ main::p_x#0 ]
Allocated zp ZP_BYTE:3 [ main::p_y#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - using address-of
// Upstart
diff --git a/src/test/ref/struct-ptr-13.log b/src/test/ref/struct-ptr-13.log
index 9a2c8482d..e97fdb17b 100644
--- a/src/test/ref/struct-ptr-13.log
+++ b/src/test/ref/struct-ptr-13.log
@@ -159,7 +159,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - modifying pointer to struct in memory using arrow operator
// Upstart
diff --git a/src/test/ref/struct-ptr-14.log b/src/test/ref/struct-ptr-14.log
index c31aa615d..cd2f6d721 100644
--- a/src/test/ref/struct-ptr-14.log
+++ b/src/test/ref/struct-ptr-14.log
@@ -224,7 +224,7 @@ Allocated zp ZP_BYTE:2 [ main::p_x#0 ]
Allocated zp ZP_BYTE:3 [ main::p_y#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - using address-of and passing it to a function
// Upstart
diff --git a/src/test/ref/struct-ptr-15.log b/src/test/ref/struct-ptr-15.log
index cc4dda6f9..21543ad9e 100644
--- a/src/test/ref/struct-ptr-15.log
+++ b/src/test/ref/struct-ptr-15.log
@@ -428,7 +428,7 @@ Allocated zp ZP_BYTE:9 [ main::y#0 ]
Allocated zp ZP_BYTE:10 [ main::idx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - using pointers to nested structs
// Upstart
diff --git a/src/test/ref/struct-ptr-16.log b/src/test/ref/struct-ptr-16.log
index 8f3ffb74c..c7b730127 100644
--- a/src/test/ref/struct-ptr-16.log
+++ b/src/test/ref/struct-ptr-16.log
@@ -524,7 +524,7 @@ Allocated zp ZP_BYTE:13 [ main::$1_y ]
Allocated zp ZP_BYTE:14 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates problem with returning a dereferenced pointer to a struct
// Upstart
diff --git a/src/test/ref/struct-ptr-17.log b/src/test/ref/struct-ptr-17.log
index b56317b55..58cee06e9 100644
--- a/src/test/ref/struct-ptr-17.log
+++ b/src/test/ref/struct-ptr-17.log
@@ -371,7 +371,7 @@ Allocated zp ZP_BYTE:7 [ main::$1_x ]
Allocated zp ZP_BYTE:8 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates problem with returning a struct into a dereferenced pointer to a struct
// Upstart
diff --git a/src/test/ref/struct-ptr-18.log b/src/test/ref/struct-ptr-18.log
index 42dc4d078..eaf87b49e 100644
--- a/src/test/ref/struct-ptr-18.log
+++ b/src/test/ref/struct-ptr-18.log
@@ -363,7 +363,7 @@ Allocated zp ZP_BYTE:6 [ print::p_y#0 ]
Allocated zp ZP_BYTE:7 [ idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates problem with passing struct array element as parameter to call
// Upstart
diff --git a/src/test/ref/struct-ptr-19.log b/src/test/ref/struct-ptr-19.log
index 24498848d..30bf3e324 100644
--- a/src/test/ref/struct-ptr-19.log
+++ b/src/test/ref/struct-ptr-19.log
@@ -297,7 +297,7 @@ Allocated zp ZP_BYTE:6 [ main::point_y#0 ]
Allocated zp ZP_BYTE:7 [ idx#4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates problem with passing struct pointer deref as parameter to call
// Upstart
diff --git a/src/test/ref/struct-ptr-2.log b/src/test/ref/struct-ptr-2.log
index 7e438ddde..061f36873 100644
--- a/src/test/ref/struct-ptr-2.log
+++ b/src/test/ref/struct-ptr-2.log
@@ -313,7 +313,7 @@ Allocated zp ZP_BYTE:8 [ main::$15 ]
Allocated zp ZP_WORD:9 [ main::point_i1#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - array of struct - far pointer math indexing
// Upstart
diff --git a/src/test/ref/struct-ptr-20.log b/src/test/ref/struct-ptr-20.log
index f40367e9c..1dfcab42d 100644
--- a/src/test/ref/struct-ptr-20.log
+++ b/src/test/ref/struct-ptr-20.log
@@ -285,7 +285,7 @@ Allocated zp ZP_WORD:2 [ main::setting#2 main::setting#1 ]
Allocated zp ZP_BYTE:4 [ main::idx#2 main::idx#5 main::idx#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates problem with conditions using negated struct references
// Upstart
diff --git a/src/test/ref/struct-ptr-21.log b/src/test/ref/struct-ptr-21.log
index b659d37d7..2c27c7f4e 100644
--- a/src/test/ref/struct-ptr-21.log
+++ b/src/test/ref/struct-ptr-21.log
@@ -246,7 +246,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates problem with conditions using negated struct references
// Upstart
diff --git a/src/test/ref/struct-ptr-22.log b/src/test/ref/struct-ptr-22.log
index 7af33dfc0..7bb806af3 100644
--- a/src/test/ref/struct-ptr-22.log
+++ b/src/test/ref/struct-ptr-22.log
@@ -1011,7 +1011,7 @@ Allocated zp ZP_BYTE:14 [ print_byte::$0 ]
Allocated zp ZP_BYTE:15 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Demonstrates problem with missing parenthesis in double-dereferencing
// https://gitlab.com/camelot/kickc/issues/270
diff --git a/src/test/ref/struct-ptr-24.log b/src/test/ref/struct-ptr-24.log
index 4ce2dabc8..583acf2a6 100644
--- a/src/test/ref/struct-ptr-24.log
+++ b/src/test/ref/struct-ptr-24.log
@@ -197,7 +197,7 @@ Allocated zp ZP_WORD:2 [ main::file#2 main::file#1 ]
Allocated zp ZP_WORD:4 [ PrintName::file#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/struct-ptr-25.log b/src/test/ref/struct-ptr-25.log
index c1d8007e9..f5a995d95 100644
--- a/src/test/ref/struct-ptr-25.log
+++ b/src/test/ref/struct-ptr-25.log
@@ -232,7 +232,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/struct-ptr-26.log b/src/test/ref/struct-ptr-26.log
index 17642d0e8..9e4dabf99 100644
--- a/src/test/ref/struct-ptr-26.log
+++ b/src/test/ref/struct-ptr-26.log
@@ -472,7 +472,7 @@ Allocated zp ZP_BYTE:10 [ print_byte::$0 ]
Allocated zp ZP_BYTE:11 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/struct-ptr-3.log b/src/test/ref/struct-ptr-3.log
index dd5c5f182..eaddbf6cc 100644
--- a/src/test/ref/struct-ptr-3.log
+++ b/src/test/ref/struct-ptr-3.log
@@ -178,7 +178,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - accessing pointer to struct in memory
// Upstart
diff --git a/src/test/ref/struct-ptr-4.log b/src/test/ref/struct-ptr-4.log
index 4dc148b49..7251eb70a 100644
--- a/src/test/ref/struct-ptr-4.log
+++ b/src/test/ref/struct-ptr-4.log
@@ -300,7 +300,7 @@ Allocated zp ZP_BYTE:10 [ main::idx#1 ]
Allocated zp ZP_BYTE:11 [ main::idx#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - accessing pointer to struct in memory in a loop
// Upstart
diff --git a/src/test/ref/struct-ptr-5.log b/src/test/ref/struct-ptr-5.log
index fc7fd82f4..950153e18 100644
--- a/src/test/ref/struct-ptr-5.log
+++ b/src/test/ref/struct-ptr-5.log
@@ -359,7 +359,7 @@ Allocated zp ZP_BYTE:9 [ main::$4 ]
Allocated zp ZP_BYTE:10 [ main::idx#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - simple linked list implemented using pointers
// Upstart
diff --git a/src/test/ref/struct-ptr-6.log b/src/test/ref/struct-ptr-6.log
index 991e7f8ce..b6403d2cc 100644
--- a/src/test/ref/struct-ptr-6.log
+++ b/src/test/ref/struct-ptr-6.log
@@ -178,7 +178,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - accessing pointer to struct in memory using arrow operator
// Upstart
diff --git a/src/test/ref/struct-ptr-7.log b/src/test/ref/struct-ptr-7.log
index 827a7582f..67782b1a2 100644
--- a/src/test/ref/struct-ptr-7.log
+++ b/src/test/ref/struct-ptr-7.log
@@ -299,7 +299,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - direct (constant) array access
// Upstart
diff --git a/src/test/ref/struct-ptr-8.log b/src/test/ref/struct-ptr-8.log
index e8357cb11..37370f841 100644
--- a/src/test/ref/struct-ptr-8.log
+++ b/src/test/ref/struct-ptr-8.log
@@ -311,7 +311,7 @@ Allocated zp ZP_BYTE:9 [ main::idx#1 ]
Allocated zp ZP_BYTE:10 [ main::idx#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - variable array access
// Upstart
diff --git a/src/test/ref/struct-ptr-9.log b/src/test/ref/struct-ptr-9.log
index a167ef6ce..b60a1df39 100644
--- a/src/test/ref/struct-ptr-9.log
+++ b/src/test/ref/struct-ptr-9.log
@@ -253,7 +253,7 @@ Allocated zp ZP_BYTE:4 [ main::$2 ]
Allocated zp ZP_BYTE:5 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal struct - array access with struct value copying (and initializing)
// Upstart
diff --git a/src/test/ref/subexpr-optimize-0.log b/src/test/ref/subexpr-optimize-0.log
index e44a84eda..891a51d61 100644
--- a/src/test/ref/subexpr-optimize-0.log
+++ b/src/test/ref/subexpr-optimize-0.log
@@ -167,7 +167,7 @@ Allocated zp ZP_BYTE:5 [ main::$1 ]
Allocated zp ZP_WORD:6 [ main::screen#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests optimization of identical sub-expressions
// The two examples of i*2 is detected as identical leading to optimized ASM where *2 is only calculated once
diff --git a/src/test/ref/subexpr-optimize-1.log b/src/test/ref/subexpr-optimize-1.log
index c52688a3a..73a0b7622 100644
--- a/src/test/ref/subexpr-optimize-1.log
+++ b/src/test/ref/subexpr-optimize-1.log
@@ -211,7 +211,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// A sub-expression that should not be optimized (+1 to a pointer)
// Upstart
diff --git a/src/test/ref/subexpr-optimize-2.log b/src/test/ref/subexpr-optimize-2.log
index e4e29f82c..7c48d05b9 100644
--- a/src/test/ref/subexpr-optimize-2.log
+++ b/src/test/ref/subexpr-optimize-2.log
@@ -193,7 +193,7 @@ Allocated zp ZP_BYTE:9 [ main::$2 ]
Allocated zp ZP_BYTE:10 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests optimization of identical sub-expressions
// Upstart
diff --git a/src/test/ref/subexpr-optimize-3.log b/src/test/ref/subexpr-optimize-3.log
index 9b86ba98e..47c3308ac 100644
--- a/src/test/ref/subexpr-optimize-3.log
+++ b/src/test/ref/subexpr-optimize-3.log
@@ -209,7 +209,7 @@ Allocated zp ZP_BYTE:10 [ main::$4 ]
Allocated zp ZP_BYTE:11 [ main::$5 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests optimization of identical sub-expressions
// Upstart
diff --git a/src/test/ref/subexpr-optimize-4.log b/src/test/ref/subexpr-optimize-4.log
index b3952ddbe..2e429d6c9 100644
--- a/src/test/ref/subexpr-optimize-4.log
+++ b/src/test/ref/subexpr-optimize-4.log
@@ -336,7 +336,7 @@ Allocated zp ZP_WORD:8 [ main::screen#1 ]
Allocated zp ZP_BYTE:10 [ main::$6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests optimization of identical sub-expressions
// Upstart
diff --git a/src/test/ref/summin.log b/src/test/ref/summin.log
index 959aa4375..9f641dc96 100644
--- a/src/test/ref/summin.log
+++ b/src/test/ref/summin.log
@@ -297,7 +297,7 @@ Allocated zp ZP_BYTE:11 [ main::s4#0 ]
Allocated zp ZP_BYTE:12 [ sum::return#3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/switch-0.log b/src/test/ref/switch-0.log
index bca153236..955372e06 100644
--- a/src/test/ref/switch-0.log
+++ b/src/test/ref/switch-0.log
@@ -222,7 +222,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#10 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple switch()-statement
// Expected output 'd1444d'
diff --git a/src/test/ref/switch-1.log b/src/test/ref/switch-1.log
index 4a4b374dd..9bcd666f0 100644
--- a/src/test/ref/switch-1.log
+++ b/src/test/ref/switch-1.log
@@ -188,7 +188,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple switch()-statement - including a continue statement for the enclosing loop
// Expected output 'a1aa1a' (numbers should be inverted)
diff --git a/src/test/ref/switch-2.log b/src/test/ref/switch-2.log
index 20023bdca..81b3e7ce7 100644
--- a/src/test/ref/switch-2.log
+++ b/src/test/ref/switch-2.log
@@ -138,7 +138,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple switch()-statement - not inside a loop
// Upstart
diff --git a/src/test/ref/switch-4.log b/src/test/ref/switch-4.log
index 0e6bc3e7c..9a22b99aa 100644
--- a/src/test/ref/switch-4.log
+++ b/src/test/ref/switch-4.log
@@ -174,7 +174,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple switch()-statement - switch without default
// Expected output " 1 4 "
diff --git a/src/test/ref/ternary-1.log b/src/test/ref/ternary-1.log
index 055abdea2..b4da7374e 100644
--- a/src/test/ref/ternary-1.log
+++ b/src/test/ref/ternary-1.log
@@ -173,7 +173,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the ternary operator
// Upstart
diff --git a/src/test/ref/ternary-2.log b/src/test/ref/ternary-2.log
index 629f71f13..382830312 100644
--- a/src/test/ref/ternary-2.log
+++ b/src/test/ref/ternary-2.log
@@ -156,7 +156,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the ternary operator - when the condition is constant
// Upstart
diff --git a/src/test/ref/ternary-3.log b/src/test/ref/ternary-3.log
index 727391202..1d40a0c2a 100644
--- a/src/test/ref/ternary-3.log
+++ b/src/test/ref/ternary-3.log
@@ -383,7 +383,7 @@ Allocated zp ZP_BYTE:12 [ m2::return#1 ]
Allocated zp ZP_BOOL:13 [ cond::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the ternary operator - when the condition is constant
// Upstart
diff --git a/src/test/ref/ternary-inference.log b/src/test/ref/ternary-inference.log
index f7197e6c8..9f2af3608 100644
--- a/src/test/ref/ternary-inference.log
+++ b/src/test/ref/ternary-inference.log
@@ -194,7 +194,7 @@ Allocated zp ZP_BYTE:3 [ main::$3 ]
Allocated zp ZP_BYTE:4 [ main::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Type inference into the ternary operator
// Upstart
diff --git a/src/test/ref/test-comments-block.log b/src/test/ref/test-comments-block.log
index 0db1d05f9..dfd2a27e9 100644
--- a/src/test/ref/test-comments-block.log
+++ b/src/test/ref/test-comments-block.log
@@ -240,7 +240,7 @@ Allocated zp ZP_BYTE:6 [ main::$0 ]
Allocated zp ZP_BYTE:7 [ sum::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
/* Tests that block comments are compiled correctly
* Has a bunch of comments that will be moved into the generated ASM
diff --git a/src/test/ref/test-comments-loop.log b/src/test/ref/test-comments-loop.log
index b9064da1e..942d1933e 100644
--- a/src/test/ref/test-comments-loop.log
+++ b/src/test/ref/test-comments-loop.log
@@ -117,7 +117,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::b#2 main::b#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/test-comments-single.log b/src/test/ref/test-comments-single.log
index b28f5fa18..aedc89ffe 100644
--- a/src/test/ref/test-comments-single.log
+++ b/src/test/ref/test-comments-single.log
@@ -240,7 +240,7 @@ Allocated zp ZP_BYTE:6 [ main::$0 ]
Allocated zp ZP_BYTE:7 [ sum::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that single-line comments are compiled correctly
// Has a bunch of comments that will be moved into the generated ASM
diff --git a/src/test/ref/test-comments-usage.log b/src/test/ref/test-comments-usage.log
index e14de0ea2..2d4747846 100644
--- a/src/test/ref/test-comments-usage.log
+++ b/src/test/ref/test-comments-usage.log
@@ -72,7 +72,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that single-line comments are only included once in the output
// Upstart
diff --git a/src/test/ref/test-comparisons-sword.log b/src/test/ref/test-comparisons-sword.log
index 25b630904..c7fcfa203 100644
--- a/src/test/ref/test-comparisons-sword.log
+++ b/src/test/ref/test-comparisons-sword.log
@@ -2395,7 +2395,7 @@ Allocated zp ZP_BYTE:34 [ print_byte::$0 ]
Allocated zp ZP_BYTE:35 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test signed word comparisons
// Upstart
diff --git a/src/test/ref/test-comparisons-word.log b/src/test/ref/test-comparisons-word.log
index f85647452..162a0bc05 100644
--- a/src/test/ref/test-comparisons-word.log
+++ b/src/test/ref/test-comparisons-word.log
@@ -2085,7 +2085,7 @@ Allocated zp ZP_BYTE:32 [ print_byte::$0 ]
Allocated zp ZP_BYTE:33 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/test-comparisons.log b/src/test/ref/test-comparisons.log
index 9bc64d34b..9358a5cb7 100644
--- a/src/test/ref/test-comparisons.log
+++ b/src/test/ref/test-comparisons.log
@@ -3410,7 +3410,7 @@ Allocated zp ZP_BYTE:40 [ print_byte::$0 ]
Allocated zp ZP_BYTE:41 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/test-division.log b/src/test/ref/test-division.log
index acffa1289..e411259eb 100644
--- a/src/test/ref/test-division.log
+++ b/src/test/ref/test-division.log
@@ -5085,7 +5085,7 @@ Allocated zp ZP_BYTE:122 [ div8u::return#3 ]
Allocated zp ZP_BYTE:123 [ test_8u::res#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test the binary division library
// Upstart
diff --git a/src/test/ref/test-interrupt-notype.log b/src/test/ref/test-interrupt-notype.log
index b5448c2f8..990ae095f 100644
--- a/src/test/ref/test-interrupt-notype.log
+++ b/src/test/ref/test-interrupt-notype.log
@@ -132,7 +132,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/test-interrupt-volatile-write.log b/src/test/ref/test-interrupt-volatile-write.log
index a30494e71..d3afa82e7 100644
--- a/src/test/ref/test-interrupt-volatile-write.log
+++ b/src/test/ref/test-interrupt-volatile-write.log
@@ -252,7 +252,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ col#14 col#0 col#1 col#12 col#3 col#4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that volatile variables can be both read & written inside & outside interrupts
// Currently fails because the modification is optimized away
diff --git a/src/test/ref/test-interrupt-volatile.log b/src/test/ref/test-interrupt-volatile.log
index db1110821..6d2e5ac1b 100644
--- a/src/test/ref/test-interrupt-volatile.log
+++ b/src/test/ref/test-interrupt-volatile.log
@@ -168,7 +168,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ col#2 col#0 col#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/test-interrupt.log b/src/test/ref/test-interrupt.log
index b5448c2f8..990ae095f 100644
--- a/src/test/ref/test-interrupt.log
+++ b/src/test/ref/test-interrupt.log
@@ -132,7 +132,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/test-kasm-pc.log b/src/test/ref/test-kasm-pc.log
index ff12ba601..1102d5075 100644
--- a/src/test/ref/test-kasm-pc.log
+++ b/src/test/ref/test-kasm-pc.log
@@ -131,7 +131,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test inline KickAssembler code with PC location specification
// Upstart
diff --git a/src/test/ref/test-kasm.log b/src/test/ref/test-kasm.log
index 0ad5816d0..40a1b4728 100644
--- a/src/test/ref/test-kasm.log
+++ b/src/test/ref/test-kasm.log
@@ -85,7 +85,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test inline KickAssembler code
// Upstart
diff --git a/src/test/ref/test-keyboard-space.log b/src/test/ref/test-keyboard-space.log
index 830040d3b..4c5315ac8 100644
--- a/src/test/ref/test-keyboard-space.log
+++ b/src/test/ref/test-keyboard-space.log
@@ -457,7 +457,7 @@ Allocated zp ZP_BYTE:6 [ keyboard_key_pressed::return#0 ]
Allocated zp ZP_BYTE:7 [ keyboard_matrix_read::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test keyboard input - test the space bar
// Upstart
diff --git a/src/test/ref/test-keyboard.log b/src/test/ref/test-keyboard.log
index 4684694dc..9ef9d01fe 100644
--- a/src/test/ref/test-keyboard.log
+++ b/src/test/ref/test-keyboard.log
@@ -1461,7 +1461,7 @@ Allocated zp ZP_BYTE:27 [ keyboard_matrix_read::return#0 ]
Allocated zp ZP_BYTE:28 [ keyboard_get_keycode::return#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test keyboard input - in the keyboard matrix and mapping screen codes to key codes
// Upstart
diff --git a/src/test/ref/test-lohiconst.log b/src/test/ref/test-lohiconst.log
index a35f0ef70..46270e068 100644
--- a/src/test/ref/test-lohiconst.log
+++ b/src/test/ref/test-lohiconst.log
@@ -153,7 +153,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// PI in u[4.28] format
// Upstart
diff --git a/src/test/ref/test-lowhigh.log b/src/test/ref/test-lowhigh.log
index a355a7850..be72ce13e 100644
--- a/src/test/ref/test-lowhigh.log
+++ b/src/test/ref/test-lowhigh.log
@@ -1361,7 +1361,7 @@ Allocated zp ZP_BYTE:46 [ print_byte::$0 ]
Allocated zp ZP_BYTE:47 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/test-multiply-16bit.log b/src/test/ref/test-multiply-16bit.log
index 02477fb2f..7fa12ac0b 100644
--- a/src/test/ref/test-multiply-16bit.log
+++ b/src/test/ref/test-multiply-16bit.log
@@ -5284,7 +5284,7 @@ Allocated zp ZP_BYTE:228 [ mulf_init::$12 ]
Allocated zp ZP_BYTE:229 [ mulf_init::$13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test the fast multiplication library
// Upstart
diff --git a/src/test/ref/test-multiply-8bit.log b/src/test/ref/test-multiply-8bit.log
index 6fa088f8e..3e7e82351 100644
--- a/src/test/ref/test-multiply-8bit.log
+++ b/src/test/ref/test-multiply-8bit.log
@@ -5511,7 +5511,7 @@ Allocated zp ZP_BYTE:134 [ mulf_init::$12 ]
Allocated zp ZP_BYTE:135 [ mulf_init::$13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test the fast multiplication library
// Upstart
diff --git a/src/test/ref/test-scroll-up.log b/src/test/ref/test-scroll-up.log
index c34a4604b..3bf5ac403 100644
--- a/src/test/ref/test-scroll-up.log
+++ b/src/test/ref/test-scroll-up.log
@@ -623,7 +623,7 @@ Allocated zp ZP_WORD:24 [ scrollup1::$5 ]
Allocated zp ZP_WORD:26 [ scrollup1::$6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests different ways of scrolling up the screen
// Upstart
diff --git a/src/test/ref/test-signed-word-minus-byte.log b/src/test/ref/test-signed-word-minus-byte.log
index c9aea0bb2..442045805 100644
--- a/src/test/ref/test-signed-word-minus-byte.log
+++ b/src/test/ref/test-signed-word-minus-byte.log
@@ -1088,7 +1088,7 @@ Allocated zp ZP_BYTE:19 [ print_byte::$0 ]
Allocated zp ZP_BYTE:20 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests subtracting bytes from signed words
// Upstart
diff --git a/src/test/ref/test-word-size-arrays.log b/src/test/ref/test-word-size-arrays.log
index 76796491b..362649061 100644
--- a/src/test/ref/test-word-size-arrays.log
+++ b/src/test/ref/test-word-size-arrays.log
@@ -314,7 +314,7 @@ Allocated zp ZP_WORD:14 [ main::$7 ]
Allocated zp ZP_WORD:16 [ main::$8 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/tetris-npe.log b/src/test/ref/tetris-npe.log
index 97b1daf34..2307309e9 100644
--- a/src/test/ref/tetris-npe.log
+++ b/src/test/ref/tetris-npe.log
@@ -251,7 +251,7 @@ Allocated zp ZP_BYTE:2 [ counter#3 counter#1 ]
Allocated zp ZP_BYTE:3 [ ypos#2 ypos#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// NullPointerException using current_movedown_rate in the main loop
// Upstart
diff --git a/src/test/ref/textbox.log b/src/test/ref/textbox.log
index 56380427e..5229b2173 100644
--- a/src/test/ref/textbox.log
+++ b/src/test/ref/textbox.log
@@ -2000,7 +2000,7 @@ Allocated zp ZP_WORD:89 [ draw_window::$15 ]
Allocated zp ZP_WORD:91 [ draw_window::$28 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
/* Textbox routine with word wrap for KickC by Scan/Desire */
// Upstart
diff --git a/src/test/ref/tod018-problem.log b/src/test/ref/tod018-problem.log
index aa0812123..819cbb800 100644
--- a/src/test/ref/tod018-problem.log
+++ b/src/test/ref/tod018-problem.log
@@ -116,7 +116,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a problem with tod018 not calculating types correctly
// Upstart
diff --git a/src/test/ref/travis1.log b/src/test/ref/travis1.log
index a613bd3f1..ab16e76f3 100644
--- a/src/test/ref/travis1.log
+++ b/src/test/ref/travis1.log
@@ -783,7 +783,7 @@ Allocated zp ZP_BOOL:13 [ main::$0 ]
Allocated zp ZP_BOOL:14 [ game_ready::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Adding a missing word-fragment for Travis Fisher
// Upstart
diff --git a/src/test/ref/true-inline-words.log b/src/test/ref/true-inline-words.log
index c6233bea3..9be682780 100644
--- a/src/test/ref/true-inline-words.log
+++ b/src/test/ref/true-inline-words.log
@@ -227,7 +227,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/type-inference.log b/src/test/ref/type-inference.log
index 7af96d8de..0ce874a45 100644
--- a/src/test/ref/type-inference.log
+++ b/src/test/ref/type-inference.log
@@ -144,7 +144,7 @@ Allocated zp ZP_BYTE:3 [ main::$0 ]
Allocated zp ZP_BYTE:4 [ main::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test inference of integer types in expressions
// Upstart
diff --git a/src/test/ref/type-mix.log b/src/test/ref/type-mix.log
index 9dd77fd5f..5c99baa2a 100644
--- a/src/test/ref/type-mix.log
+++ b/src/test/ref/type-mix.log
@@ -159,7 +159,7 @@ Allocated zp ZP_BYTE:4 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:5 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests that mixing types can synthesize a fragment correctly
// Upstart
diff --git a/src/test/ref/type-signed.log b/src/test/ref/type-signed.log
index 67b7b5168..22094e5e8 100644
--- a/src/test/ref/type-signed.log
+++ b/src/test/ref/type-signed.log
@@ -845,7 +845,7 @@ Allocated zp ZP_BYTE:17 [ print_byte::$0 ]
Allocated zp ZP_BYTE:18 [ print_byte::$2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests the special "signed" / "unsigned" without a simple type name
// Upstart
diff --git a/src/test/ref/typedef-0.log b/src/test/ref/typedef-0.log
index 1cf3f70e8..657381628 100644
--- a/src/test/ref/typedef-0.log
+++ b/src/test/ref/typedef-0.log
@@ -79,7 +79,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/typedef-1.log b/src/test/ref/typedef-1.log
index c0cf198a8..791cc9080 100644
--- a/src/test/ref/typedef-1.log
+++ b/src/test/ref/typedef-1.log
@@ -129,7 +129,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/typedef-2.log b/src/test/ref/typedef-2.log
index 9f52a57cc..1c20c4507 100644
--- a/src/test/ref/typedef-2.log
+++ b/src/test/ref/typedef-2.log
@@ -134,7 +134,7 @@ Complete equivalence classes
Allocated zp ZP_WORD:2 [ ptr#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/typeid-plus-byte-problem.log b/src/test/ref/typeid-plus-byte-problem.log
index 8ae0af508..702cb3254 100644
--- a/src/test/ref/typeid-plus-byte-problem.log
+++ b/src/test/ref/typeid-plus-byte-problem.log
@@ -107,7 +107,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test that byte+byte creates a byte - even when there is a value overflow
// Upstart
diff --git a/src/test/ref/typeid-plus-bytes.log b/src/test/ref/typeid-plus-bytes.log
index 3d2157401..847d97f42 100644
--- a/src/test/ref/typeid-plus-bytes.log
+++ b/src/test/ref/typeid-plus-bytes.log
@@ -1158,7 +1158,7 @@ Allocated zp ZP_BYTE:14 [ testUnsignedVals::$5 ]
Allocated zp ZP_BYTE:15 [ testUnsignedVals::$6 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test that plus creates the expected type for all legal combinations of bytes (signed/unsigned - constant/variable)
// Upstart
diff --git a/src/test/ref/typeid-simple.log b/src/test/ref/typeid-simple.log
index a419394df..7ac2388df 100644
--- a/src/test/ref/typeid-simple.log
+++ b/src/test/ref/typeid-simple.log
@@ -454,7 +454,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test typeid() of the different types
// Upstart
diff --git a/src/test/ref/typeinference-problem.log b/src/test/ref/typeinference-problem.log
index 9e344a65d..ee22b1273 100644
--- a/src/test/ref/typeinference-problem.log
+++ b/src/test/ref/typeinference-problem.log
@@ -135,7 +135,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// java.lang.NullPointerException during Pass2TypeInference.java
// Upstart
diff --git a/src/test/ref/uninitialized.log b/src/test/ref/uninitialized.log
index 3ba5c3185..b826059b9 100644
--- a/src/test/ref/uninitialized.log
+++ b/src/test/ref/uninitialized.log
@@ -164,7 +164,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests uninitialized values of variables.
// Upstart
diff --git a/src/test/ref/unroll-for-min.log b/src/test/ref/unroll-for-min.log
index df660a32b..8f508e96f 100644
--- a/src/test/ref/unroll-for-min.log
+++ b/src/test/ref/unroll-for-min.log
@@ -170,7 +170,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal unrolled ranged for() loop
// Upstart
diff --git a/src/test/ref/unroll-loop-modifyvar.log b/src/test/ref/unroll-loop-modifyvar.log
index c925b7b56..52fb81cdc 100644
--- a/src/test/ref/unroll-loop-modifyvar.log
+++ b/src/test/ref/unroll-loop-modifyvar.log
@@ -387,7 +387,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// An unrolled loop modifying a var used later
// Upstart
diff --git a/src/test/ref/unroll-screenfill-for-double.log b/src/test/ref/unroll-screenfill-for-double.log
index 3d82f1e29..87d9c2ea4 100644
--- a/src/test/ref/unroll-screenfill-for-double.log
+++ b/src/test/ref/unroll-screenfill-for-double.log
@@ -1331,7 +1331,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Fills the screen using two unrolled ranged for()-loops
// Upstart
diff --git a/src/test/ref/unroll-screenfill-for.log b/src/test/ref/unroll-screenfill-for.log
index 08cf346c5..afb40f652 100644
--- a/src/test/ref/unroll-screenfill-for.log
+++ b/src/test/ref/unroll-screenfill-for.log
@@ -848,7 +848,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::x#4 main::x#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Fills the screen using an unrolled inner ranged for()-loop
// Upstart
diff --git a/src/test/ref/unroll-screenfill-while.log b/src/test/ref/unroll-screenfill-while.log
index 5bddf9d47..200496a3b 100644
--- a/src/test/ref/unroll-screenfill-while.log
+++ b/src/test/ref/unroll-screenfill-while.log
@@ -883,7 +883,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::x#5 main::x#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Fills the screen using an unrolled inner while()-loop
// Upstart
diff --git a/src/test/ref/unroll-while-min.log b/src/test/ref/unroll-while-min.log
index c7b0cdde8..e0ae71155 100644
--- a/src/test/ref/unroll-while-min.log
+++ b/src/test/ref/unroll-while-min.log
@@ -177,7 +177,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Minimal unrolled while() loop
// Upstart
diff --git a/src/test/ref/unused-irq.log b/src/test/ref/unused-irq.log
index 2b8b7f2ca..02a25a612 100644
--- a/src/test/ref/unused-irq.log
+++ b/src/test/ref/unused-irq.log
@@ -129,7 +129,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Unused interrupts pointing to each other but never used from main loop - should be optimized away
// Upstart
diff --git a/src/test/ref/unused-method.log b/src/test/ref/unused-method.log
index 54a96f743..615ceb628 100644
--- a/src/test/ref/unused-method.log
+++ b/src/test/ref/unused-method.log
@@ -86,7 +86,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/unused-vars.log b/src/test/ref/unused-vars.log
index 95b216ae2..1a03203fb 100644
--- a/src/test/ref/unused-vars.log
+++ b/src/test/ref/unused-vars.log
@@ -254,7 +254,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// used vars
// Upstart
diff --git a/src/test/ref/unusedblockproblem.log b/src/test/ref/unusedblockproblem.log
index e6d321848..cb02b81c3 100644
--- a/src/test/ref/unusedblockproblem.log
+++ b/src/test/ref/unusedblockproblem.log
@@ -123,7 +123,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Problem with eliminating unused blocks/vars after the infinite loop (symbol line#2 not removed from symbol table)
// Upstart
diff --git a/src/test/ref/useglobal.log b/src/test/ref/useglobal.log
index cc2e7daa9..b405b2002 100644
--- a/src/test/ref/useglobal.log
+++ b/src/test/ref/useglobal.log
@@ -79,7 +79,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests procedures using global variables (should not fail)
// Upstart
diff --git a/src/test/ref/useuninitialized.log b/src/test/ref/useuninitialized.log
index 583fe996e..d66d459bd 100644
--- a/src/test/ref/useuninitialized.log
+++ b/src/test/ref/useuninitialized.log
@@ -154,7 +154,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Use an uninitialized variable - should use the default value (0)!
// Upstart
diff --git a/src/test/ref/var-export.log b/src/test/ref/var-export.log
index 389748ba9..5d603fdcd 100644
--- a/src/test/ref/var-export.log
+++ b/src/test/ref/var-export.log
@@ -88,7 +88,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test the export directive usable for ensuring a data variable is always added to the output - even if it is never used
// Upstart
diff --git a/src/test/ref/var-forward-problem.log b/src/test/ref/var-forward-problem.log
index 9835d1a07..a1d638959 100644
--- a/src/test/ref/var-forward-problem.log
+++ b/src/test/ref/var-forward-problem.log
@@ -79,7 +79,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates the problem with variable forward references not working
// Upstart
diff --git a/src/test/ref/var-forward-problem2.log b/src/test/ref/var-forward-problem2.log
index bc20e5186..f36f2bdc2 100644
--- a/src/test/ref/var-forward-problem2.log
+++ b/src/test/ref/var-forward-problem2.log
@@ -114,7 +114,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates the problem with variable forward references not working
// Upstart
diff --git a/src/test/ref/var-init-problem.log b/src/test/ref/var-init-problem.log
index 62bcdc98b..1c4af5214 100644
--- a/src/test/ref/var-init-problem.log
+++ b/src/test/ref/var-init-problem.log
@@ -93,7 +93,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Variables without initialization causes problems when compiling
// Upstart
diff --git a/src/test/ref/var-register-noarg.log b/src/test/ref/var-register-noarg.log
index 8090d2e9f..9d62a3801 100644
--- a/src/test/ref/var-register-noarg.log
+++ b/src/test/ref/var-register-noarg.log
@@ -146,7 +146,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
Allocated zp ZP_BYTE:3 [ main::$1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test declaring a variable as register with no information about which register (for compatibility with standard C)
// Upstart
diff --git a/src/test/ref/var-register-zp-3.log b/src/test/ref/var-register-zp-3.log
index bd24f830d..73c32878f 100644
--- a/src/test/ref/var-register-zp-3.log
+++ b/src/test/ref/var-register-zp-3.log
@@ -305,7 +305,7 @@ Allocated zp ZP_BYTE:2 [ print2::i#2 print2::i#1 ]
Allocated zp ZP_BYTE:3 [ print2::j#2 print2::j#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test declaring a variable as register on a specific ZP address
// Upstart
diff --git a/src/test/ref/var-register-zp.log b/src/test/ref/var-register-zp.log
index 7dfd37915..6c9392cd5 100644
--- a/src/test/ref/var-register-zp.log
+++ b/src/test/ref/var-register-zp.log
@@ -211,7 +211,7 @@ Allocated zp ZP_WORD:8 [ main::k#0 ]
Allocated zp ZP_BYTE:10 [ main::$4 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test declaring a variable as register on a specific ZP address
// Upstart
diff --git a/src/test/ref/var-register.log b/src/test/ref/var-register.log
index afeb89f4a..c74633d39 100644
--- a/src/test/ref/var-register.log
+++ b/src/test/ref/var-register.log
@@ -291,7 +291,7 @@ Allocated zp ZP_BYTE:3 [ main::a#2 main::a#1 ]
Allocated zp ZP_BYTE:4 [ print::val#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/void-parameter.log b/src/test/ref/void-parameter.log
index 38ba384e7..852e2eb2f 100644
--- a/src/test/ref/void-parameter.log
+++ b/src/test/ref/void-parameter.log
@@ -188,7 +188,7 @@ Complete equivalence classes
Allocated zp ZP_BYTE:2 [ idx#12 idx#13 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test that void-parameter works top specify function takes no parameters
// Output is "..." in the top left corner of the screen
diff --git a/src/test/ref/voronoi.log b/src/test/ref/voronoi.log
index dfcb518d7..93e481224 100644
--- a/src/test/ref/voronoi.log
+++ b/src/test/ref/voronoi.log
@@ -1333,7 +1333,7 @@ Allocated zp ZP_BYTE:26 [ findcol::$9 ]
Allocated zp ZP_BYTE:27 [ findcol::$11 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// The screen
// Upstart
diff --git a/src/test/ref/wfragment1.log b/src/test/ref/wfragment1.log
index 05b5d5df6..1d50beaab 100644
--- a/src/test/ref/wfragment1.log
+++ b/src/test/ref/wfragment1.log
@@ -263,7 +263,7 @@ Allocated zp ZP_BYTE:3 [ move_enemy::obj_slot#0 ]
Allocated zp ZP_BYTE:4 [ move_enemy::$0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Adding a missing word-fragment for Travis Fisher
// Upstart
diff --git a/src/test/ref/word-array-0.log b/src/test/ref/word-array-0.log
index 1c5aaff32..18ad857d6 100644
--- a/src/test/ref/word-array-0.log
+++ b/src/test/ref/word-array-0.log
@@ -178,7 +178,7 @@ Allocated zp ZP_BYTE:8 [ main::$2 ]
Allocated zp ZP_BYTE:9 [ main::$3 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a simple word array
// Upstart
diff --git a/src/test/ref/word-array-1.log b/src/test/ref/word-array-1.log
index 984589e10..8a38d7e3d 100644
--- a/src/test/ref/word-array-1.log
+++ b/src/test/ref/word-array-1.log
@@ -207,7 +207,7 @@ Allocated zp ZP_BYTE:9 [ main::$1 ]
Allocated zp ZP_BYTE:10 [ main::idx#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a simple word array
// Upstart
diff --git a/src/test/ref/word-array-2.log b/src/test/ref/word-array-2.log
index 354d7de0c..95cf0b7f9 100644
--- a/src/test/ref/word-array-2.log
+++ b/src/test/ref/word-array-2.log
@@ -224,7 +224,7 @@ Allocated zp ZP_WORD:11 [ main::$6 ]
Allocated zp ZP_WORD:13 [ main::$9 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests a word-array with 128+ elements
// Upstart
diff --git a/src/test/ref/word-pointer-compound.log b/src/test/ref/word-pointer-compound.log
index d2a0d0bf8..9bb0e34a0 100644
--- a/src/test/ref/word-pointer-compound.log
+++ b/src/test/ref/word-pointer-compound.log
@@ -307,7 +307,7 @@ Allocated zp ZP_BYTE:8 [ main::$4 ]
Allocated zp ZP_BYTE:9 [ main::$5 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Test word pointer compound assignment
// Upstart
diff --git a/src/test/ref/word-pointer-iteration-0.log b/src/test/ref/word-pointer-iteration-0.log
index 0adff3f60..9671cdab5 100644
--- a/src/test/ref/word-pointer-iteration-0.log
+++ b/src/test/ref/word-pointer-iteration-0.log
@@ -191,7 +191,7 @@ Allocated zp ZP_BYTE:6 [ main::$4 ]
Allocated zp ZP_BYTE:7 [ main::$5 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple word pointer iteration
// Upstart
diff --git a/src/test/ref/word-pointer-iteration.log b/src/test/ref/word-pointer-iteration.log
index d69678a63..ccff8b3e4 100644
--- a/src/test/ref/word-pointer-iteration.log
+++ b/src/test/ref/word-pointer-iteration.log
@@ -214,7 +214,7 @@ Allocated zp ZP_BYTE:10 [ main::$1 ]
Allocated zp ZP_BYTE:11 [ main::idx#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple word pointer iteration
// Upstart
diff --git a/src/test/ref/word-pointer-math-0.log b/src/test/ref/word-pointer-math-0.log
index 730d3a729..f2005b359 100644
--- a/src/test/ref/word-pointer-math-0.log
+++ b/src/test/ref/word-pointer-math-0.log
@@ -189,7 +189,7 @@ Allocated zp ZP_BYTE:8 [ main::$4 ]
Allocated zp ZP_BYTE:9 [ main::$5 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple word pointer math
// Upstart
diff --git a/src/test/ref/word-pointer-math-1.log b/src/test/ref/word-pointer-math-1.log
index 43a494d96..ef7b629c8 100644
--- a/src/test/ref/word-pointer-math-1.log
+++ b/src/test/ref/word-pointer-math-1.log
@@ -110,7 +110,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests word pointer math - subtracting two word pointers
// Upstart
diff --git a/src/test/ref/word-pointer-math.log b/src/test/ref/word-pointer-math.log
index 27a5c1df3..c7861bb21 100644
--- a/src/test/ref/word-pointer-math.log
+++ b/src/test/ref/word-pointer-math.log
@@ -213,7 +213,7 @@ Allocated zp ZP_BYTE:9 [ main::$2 ]
Allocated zp ZP_BYTE:10 [ main::idx#2 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Tests simple word pointer math
// Upstart
diff --git a/src/test/ref/wordexpr.log b/src/test/ref/wordexpr.log
index b3dac336d..724fb7aa9 100644
--- a/src/test/ref/wordexpr.log
+++ b/src/test/ref/wordexpr.log
@@ -140,7 +140,7 @@ Allocated zp ZP_WORD:2 [ main::b#2 main::b#1 ]
Allocated zp ZP_BYTE:4 [ main::i#2 main::i#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Expressions based on bytes but resulting in words are as words - eg. b = b + 40*8;
// Upstart
diff --git a/src/test/ref/zeropage-detect-advanced.log b/src/test/ref/zeropage-detect-advanced.log
index e008139fb..d7d70f179 100644
--- a/src/test/ref/zeropage-detect-advanced.log
+++ b/src/test/ref/zeropage-detect-advanced.log
@@ -107,7 +107,7 @@ Complete equivalence classes
Allocated zp ZP_DWORD:2 [ main::t#0 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Illustrates a problem where absolute addressing is used for zeropage-access
// This is caused by the compiler believing the pointer is into memory" (not knowing the upper part is 0x00 )
diff --git a/src/test/ref/zeropage-sinus.log b/src/test/ref/zeropage-sinus.log
index 3a6a0a68e..f4608d6f8 100644
--- a/src/test/ref/zeropage-sinus.log
+++ b/src/test/ref/zeropage-sinus.log
@@ -330,7 +330,7 @@ Initial phi equivalence classes
Complete equivalence classes
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Attempt to store and use a sinus on zeropage
// $00/$11 is carefully chosen to be $ff - which plays well with the processor port
diff --git a/src/test/ref/zpparammin.log b/src/test/ref/zpparammin.log
index 6d1b31ef7..bac70cdab 100644
--- a/src/test/ref/zpparammin.log
+++ b/src/test/ref/zpparammin.log
@@ -370,7 +370,7 @@ Allocated zp ZP_BYTE:15 [ sum::$0 ]
Allocated zp ZP_BYTE:16 [ sum::return#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"
diff --git a/src/test/ref/zpptr.log b/src/test/ref/zpptr.log
index 5e1da538f..5dba8ea59 100644
--- a/src/test/ref/zpptr.log
+++ b/src/test/ref/zpptr.log
@@ -255,7 +255,7 @@ Allocated zp ZP_WORD:7 [ main::w#0 ]
Allocated zp ZP_WORD:9 [ main::zpptr2#1 ]
INITIAL ASM
-Target platform is c64basic / 6502X
+Target platform is c64basic / MOS6502X
// File Comments
// Upstart
.pc = $801 "Basic"