diff --git a/src/main/fragment/cache/fragment-cache-csg65ce02.asm b/src/main/fragment/cache/fragment-cache-csg65ce02.asm index c0accbe04..81939c85f 100644 --- a/src/main/fragment/cache/fragment-cache-csg65ce02.asm +++ b/src/main/fragment/cache/fragment-cache-csg65ce02.asm @@ -1,4 +1,4 @@ -//KICKC FRAGMENT CACHE 1098941965 1098943491 +//KICKC FRAGMENT CACHE 112243579e 11224372f4 //FRAGMENT vbuz1=vbuc1 lda #{c1} sta {z1} @@ -119,8 +119,8 @@ lda {c1},y ldy #0 sta ({z1}),y //FRAGMENT pbuz1=_inc_pbuz2 -lda {z2} clc +lda {z2} adc #1 sta {z1} lda {z2}+1 @@ -301,8 +301,8 @@ lda {z1} cmp {z2} bcs {la1} //FRAGMENT pbuz1=pbuz2_plus_vwuc1 -lda {z2} clc +lda {z2} adc #<{c1} sta {z1} lda {z2}+1 diff --git a/src/main/fragment/cache/fragment-cache-mega45gs02.asm b/src/main/fragment/cache/fragment-cache-mega45gs02.asm index b551a89ff..de96895c5 100644 --- a/src/main/fragment/cache/fragment-cache-mega45gs02.asm +++ b/src/main/fragment/cache/fragment-cache-mega45gs02.asm @@ -1,4 +1,4 @@ -//KICKC FRAGMENT CACHE 1098941965 1098943491 +//KICKC FRAGMENT CACHE 112243579e 11224372f4 //FRAGMENT _deref_pbuc1=vbuc2 lda #{c2} sta {c1} @@ -1217,8 +1217,8 @@ rol {z1}+1 asl {z1} rol {z1}+1 //FRAGMENT pbuz1=pbuc1_plus_vwuz2 -lda {z2} clc +lda {z2} adc #<{c1} sta {z1} lda {z2}+1 @@ -1263,8 +1263,8 @@ lda {z1}+1 sbc #0 sta {z1}+1 //FRAGMENT pbuz1=pbuz2_plus_vwuc1 -lda {z2} clc +lda {z2} adc #<{c1} sta {z1} lda {z2}+1 diff --git a/src/main/fragment/cache/fragment-cache-mos6502.asm b/src/main/fragment/cache/fragment-cache-mos6502.asm index fe39abb2e..832d29237 100644 --- a/src/main/fragment/cache/fragment-cache-mos6502.asm +++ b/src/main/fragment/cache/fragment-cache-mos6502.asm @@ -1,4 +1,4 @@ -//KICKC FRAGMENT CACHE 1098941965 1098943491 +//KICKC FRAGMENT CACHE 112243579e 11224372f4 //FRAGMENT vbuz1=vbuc1 lda #{c1} sta {z1} diff --git a/src/main/fragment/cache/fragment-cache-wdc65c02.asm b/src/main/fragment/cache/fragment-cache-wdc65c02.asm index 8fa81728f..d829c77bb 100644 --- a/src/main/fragment/cache/fragment-cache-wdc65c02.asm +++ b/src/main/fragment/cache/fragment-cache-wdc65c02.asm @@ -1,4 +1,4 @@ -//KICKC FRAGMENT CACHE 1098941965 1098943491 +//KICKC FRAGMENT CACHE 112243579e 11224372f4 //FRAGMENT vbuz1=_deref_pbuc1 lda {c1} sta {z1} diff --git a/src/main/fragment/mos6502-common/vwsm1=_deref_pwsz2_plus_vwsc1.asm b/src/main/fragment/mos6502-common/vwsm1=_deref_pwsz2_plus_vwsc1.asm index ba5c20026..ff15e17e3 100644 --- a/src/main/fragment/mos6502-common/vwsm1=_deref_pwsz2_plus_vwsc1.asm +++ b/src/main/fragment/mos6502-common/vwsm1=_deref_pwsz2_plus_vwsc1.asm @@ -1,6 +1,6 @@ ldy #0 -lda ({z2}),y clc +lda ({z2}),y adc #<{c1} sta {m1} iny diff --git a/src/main/fragment/mos6502-common/vwsm1=vwsm1_plus_1.asm b/src/main/fragment/mos6502-common/vwsm1=vwsm1_plus_1.asm index 8cc9474c6..3865e370f 100644 --- a/src/main/fragment/mos6502-common/vwsm1=vwsm1_plus_1.asm +++ b/src/main/fragment/mos6502-common/vwsm1=vwsm1_plus_1.asm @@ -1,5 +1,5 @@ -lda {m1} clc +lda {m1} adc #1 sta {m1} bcc !+ diff --git a/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_1.asm b/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_1.asm index b5a1be60a..591e39001 100644 --- a/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_1.asm +++ b/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_1.asm @@ -1,5 +1,5 @@ -lda {m2} clc +lda {m2} adc #1 sta {m1} bcc !+ diff --git a/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_vbsc1.asm b/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_vbsc1.asm index 4f400fa59..6ec3a3ca5 100644 --- a/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_vbsc1.asm +++ b/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_vbsc1.asm @@ -1,5 +1,5 @@ -lda {m2} clc +lda {m2} adc #<{c1} sta {m1} lda {m2}+1 diff --git a/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_vwsc1.asm b/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_vwsc1.asm index 4f400fa59..6ec3a3ca5 100644 --- a/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_vwsc1.asm +++ b/src/main/fragment/mos6502-common/vwsm1=vwsm2_plus_vwsc1.asm @@ -1,5 +1,5 @@ -lda {m2} clc +lda {m2} adc #<{c1} sta {m1} lda {m2}+1 diff --git a/src/main/fragment/mos6502-common/vwsz1=_deref_pwsz1_plus_vwsc1.asm b/src/main/fragment/mos6502-common/vwsz1=_deref_pwsz1_plus_vwsc1.asm index 42160c964..1ee6644c1 100644 --- a/src/main/fragment/mos6502-common/vwsz1=_deref_pwsz1_plus_vwsc1.asm +++ b/src/main/fragment/mos6502-common/vwsz1=_deref_pwsz1_plus_vwsc1.asm @@ -1,6 +1,6 @@ ldy #0 -lda ({z1}),y clc +lda ({z1}),y adc #<{c1} pha iny diff --git a/src/main/fragment/mos6502-common/vwsz1=pwsc1_derefidx_vbuxx_plus__deref_pwsz1.asm b/src/main/fragment/mos6502-common/vwsz1=pwsc1_derefidx_vbuxx_plus__deref_pwsz1.asm index 4b2e391da..f3fc4ffe5 100644 --- a/src/main/fragment/mos6502-common/vwsz1=pwsc1_derefidx_vbuxx_plus__deref_pwsz1.asm +++ b/src/main/fragment/mos6502-common/vwsz1=pwsc1_derefidx_vbuxx_plus__deref_pwsz1.asm @@ -1,5 +1,5 @@ -clc ldy #0 +clc lda {c1},x adc ({z1}),y pha diff --git a/src/main/fragment/mos6502-common/vwum1=_deref_pwuc1_plus_1.asm b/src/main/fragment/mos6502-common/vwum1=_deref_pwuc1_plus_1.asm new file mode 100644 index 000000000..dde900783 --- /dev/null +++ b/src/main/fragment/mos6502-common/vwum1=_deref_pwuc1_plus_1.asm @@ -0,0 +1,7 @@ +clc +lda {c1} +adc #1 +sta {m1} +lda {c1}+1 +adc #0 +sta {m1}+1 \ No newline at end of file diff --git a/src/main/fragment/mos6502-common/vwum1=_deref_pwuc1_plus_vbuaa.asm b/src/main/fragment/mos6502-common/vwum1=_deref_pwuc1_plus_vbuaa.asm new file mode 100644 index 000000000..1c8de35b5 --- /dev/null +++ b/src/main/fragment/mos6502-common/vwum1=_deref_pwuc1_plus_vbuaa.asm @@ -0,0 +1,6 @@ +clc +adc {c1} +sta {m1} +lda #0 +adc {c1}+1 +sta {m1}+1 diff --git a/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuxx_plus_1.asm b/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuxx_plus_1.asm index 296bea2b4..9697f03e4 100644 --- a/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuxx_plus_1.asm +++ b/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuxx_plus_1.asm @@ -1,5 +1,5 @@ -lda {c1},x clc +lda {c1},x adc #1 sta {m1} lda {c1}+1,x diff --git a/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuxx_plus_pwuc1_derefidx_vbuyy.asm b/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuxx_plus_pwuc1_derefidx_vbuyy.asm index f4b0c17b2..2dce2cafa 100644 --- a/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuxx_plus_pwuc1_derefidx_vbuyy.asm +++ b/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuxx_plus_pwuc1_derefidx_vbuyy.asm @@ -1,5 +1,5 @@ -lda {c1},x clc +lda {c1},x adc {c1},y sta {m1} lda {c1}+1,x diff --git a/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuyy_plus_1.asm b/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuyy_plus_1.asm index c5414e620..ff483ff87 100644 --- a/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuyy_plus_1.asm +++ b/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuyy_plus_1.asm @@ -1,5 +1,5 @@ -lda {c1},y clc +lda {c1},y adc #1 sta {m1} lda {c1}+1,y diff --git a/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuyy_plus_pwuc1_derefidx_vbuxx.asm b/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuyy_plus_pwuc1_derefidx_vbuxx.asm index b63d36d80..e35827260 100644 --- a/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuyy_plus_pwuc1_derefidx_vbuxx.asm +++ b/src/main/fragment/mos6502-common/vwum1=pwuc1_derefidx_vbuyy_plus_pwuc1_derefidx_vbuxx.asm @@ -1,5 +1,5 @@ -lda {c1},y clc +lda {c1},y adc {c1},x sta {m1} lda {c1}+1,y diff --git a/src/main/fragment/mos6502-common/vwum1=pwuz2_derefidx_vbuyy_plus_1.asm b/src/main/fragment/mos6502-common/vwum1=pwuz2_derefidx_vbuyy_plus_1.asm index 7b52ea611..115650cbc 100644 --- a/src/main/fragment/mos6502-common/vwum1=pwuz2_derefidx_vbuyy_plus_1.asm +++ b/src/main/fragment/mos6502-common/vwum1=pwuz2_derefidx_vbuyy_plus_1.asm @@ -1,5 +1,5 @@ -lda ({z2}),y clc +lda ({z2}),y adc #1 sta {m1} iny diff --git a/src/main/fragment/mos6502-common/vwum1=vwum2_plus_1.asm b/src/main/fragment/mos6502-common/vwum1=vwum2_plus_1.asm index c331fd997..62d6bb892 100644 --- a/src/main/fragment/mos6502-common/vwum1=vwum2_plus_1.asm +++ b/src/main/fragment/mos6502-common/vwum1=vwum2_plus_1.asm @@ -1,5 +1,5 @@ -lda {m2} clc +lda {m2} adc #1 sta {m1} lda {m2}+1 diff --git a/src/main/fragment/mos6502-common/vwum1=vwum2_plus__deref_qvoc1.asm b/src/main/fragment/mos6502-common/vwum1=vwum2_plus__deref_qvoc1.asm index 4fbfb412c..8f036555f 100644 --- a/src/main/fragment/mos6502-common/vwum1=vwum2_plus__deref_qvoc1.asm +++ b/src/main/fragment/mos6502-common/vwum1=vwum2_plus__deref_qvoc1.asm @@ -1,5 +1,5 @@ -lda {m2} clc +lda {m2} adc {c1} sta {m1} lda {m2}+1 diff --git a/src/main/fragment/mos6502-common/vwum1=vwum2_plus_vwuc1.asm b/src/main/fragment/mos6502-common/vwum1=vwum2_plus_vwuc1.asm index 4f400fa59..6ec3a3ca5 100644 --- a/src/main/fragment/mos6502-common/vwum1=vwum2_plus_vwuc1.asm +++ b/src/main/fragment/mos6502-common/vwum1=vwum2_plus_vwuc1.asm @@ -1,5 +1,5 @@ -lda {m2} clc +lda {m2} adc #<{c1} sta {m1} lda {m2}+1 diff --git a/src/test/ref/atoi-1.asm b/src/test/ref/atoi-1.asm index 3e80e8e38..c0b1af7f9 100644 --- a/src/test/ref/atoi-1.asm +++ b/src/test/ref/atoi-1.asm @@ -560,8 +560,8 @@ memcpy: { .label source = 7 .label destination = $11 // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/atoi-1.log b/src/test/ref/atoi-1.log index 7118e3e81..4750d9063 100644 --- a/src/test/ref/atoi-1.log +++ b/src/test/ref/atoi-1.log @@ -4681,8 +4681,8 @@ memcpy: { .label source = 7 .label destination = $11 // [141] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -6012,8 +6012,8 @@ memcpy: { .label destination = $11 // src_end = (char*)source+num // [141] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/bitmap-circle-2.asm b/src/test/ref/bitmap-circle-2.asm index 316e8a7df..ea000a224 100644 --- a/src/test/ref/bitmap-circle-2.asm +++ b/src/test/ref/bitmap-circle-2.asm @@ -70,8 +70,8 @@ main: { sta.z circle.r+1 jsr circle // i += 5 - lda.z i clc + lda.z i adc #<5 sta.z i lda.z i+1 @@ -195,8 +195,8 @@ circle: { adc.z __6+1 sta.z __7+1 // p = p + ((x-y) << 2) + 10 - lda.z p clc + lda.z p adc #<$a sta.z p lda.z p+1 @@ -204,8 +204,8 @@ circle: { sta.z p+1 __b4: // plot(xc+x,yc-y) - lda.z x1 clc + lda.z x1 adc #xc sta.z plot.x+1 - lda.z y clc + lda.z y adc #xc sbc.z x1+1 sta.z plot.x+1 - lda.z y clc + lda.z y adc #xc sta.z plot.x+1 - lda.z x1 clc + lda.z x1 adc #xc sbc.z y+1 sta.z plot.x+1 - lda.z x1 clc + lda.z x1 adc #xc sta.z plot.x+1 // [39] plot::y#2 = circle::yc#0 + circle::y#10 -- vwsz1=vwsc1_plus_vwsz2 - lda.z y clc + lda.z y adc #xc sta.z plot.x+1 // [51] plot::y#6 = circle::yc#0 + circle::x1#10 -- vwsz1=vwsc1_plus_vwsz2 - lda.z x1 clc + lda.z x1 adc #xc sta.z plot.x+1 // [39] plot::y#2 = circle::yc#0 + circle::y#10 -- vwsz1=vwsc1_plus_vwsz2 - lda.z y clc + lda.z y adc #xc sta.z plot.x+1 // [51] plot::y#6 = circle::yc#0 + circle::x1#10 -- vwsz1=vwsc1_plus_vwsz2 - lda.z x1 clc + lda.z x1 adc #xc sta.z plot.x+1 - lda.z y clc + lda.z y adc #xc sbc.z x1+1 sta.z plot.x+1 - lda.z y clc + lda.z y adc #xc sta.z plot.x+1 - lda.z x1 clc + lda.z x1 adc #xc sbc.z y+1 sta.z plot.x+1 - lda.z x1 clc + lda.z x1 adc #xc sta.z plot.x+1 // [34] plot::y#2 = circle::yc#0 + circle::y#10 -- vwsz1=vwsc1_plus_vwsz2 - lda.z y clc + lda.z y adc #xc sta.z plot.x+1 // [46] plot::y#6 = circle::yc#0 + circle::x1#10 -- vwsz1=vwsc1_plus_vwsz2 - lda.z x1 clc + lda.z x1 adc #xc sta.z plot.x+1 // [34] plot::y#2 = circle::yc#0 + circle::y#10 -- vwsz1=vwsc1_plus_vwsz2 - lda.z y clc + lda.z y adc #xc sta.z plot.x+1 // [46] plot::y#6 = circle::yc#0 + circle::x1#10 -- vwsz1=vwsc1_plus_vwsz2 - lda.z x1 clc + lda.z x1 adc #ypos)>>2 - lda.z y clc + lda.z y adc #<$64 sta.z y lda.z y+1 diff --git a/src/test/ref/bitmap-plot-2.log b/src/test/ref/bitmap-plot-2.log index 2ee8320a8..6e42315b6 100644 --- a/src/test/ref/bitmap-plot-2.log +++ b/src/test/ref/bitmap-plot-2.log @@ -4588,8 +4588,8 @@ main: { ror.z __11+1 ror.z __11 // [43] main::y#0 = $64 + main::$11 -- vwsz1=vbsc1_plus_vwsz1 - lda.z y clc + lda.z y adc #<$64 sta.z y lda.z y+1 @@ -6814,8 +6814,8 @@ main: { ror.z __11 // 100 + ((signed word)>ypos)>>2 // [43] main::y#0 = $64 + main::$11 -- vwsz1=vbsc1_plus_vwsz1 - lda.z y clc + lda.z y adc #<$64 sta.z y lda.z y+1 diff --git a/src/test/ref/bresenhamarr.asm b/src/test/ref/bresenhamarr.asm index c8f66f36e..b4952163f 100644 --- a/src/test/ref/bresenhamarr.asm +++ b/src/test/ref/bresenhamarr.asm @@ -22,8 +22,8 @@ main: { sta.z idx+1 __b1: // screen[idx] = STAR - lda.z idx clc + lda.z idx adc #$d000 sta.z __111+1 - lda.z c_1 clc + lda.z c_1 adc #<$f800 sta.z __112 lda.z c_1+1 @@ -573,8 +573,8 @@ main: { jmp __b8 __b7: // scrPtr[c]=32 - lda.z c clc + lda.z c adc #<$e000 sta.z __109 lda.z c+1 @@ -584,8 +584,8 @@ main: { ldy #0 sta (__109),y // colPtr[c]=14 - lda.z c clc + lda.z c adc #<$d800 sta.z __110 lda.z c+1 diff --git a/src/test/ref/complex/bubbles64/bubbles64.log b/src/test/ref/complex/bubbles64/bubbles64.log index c12a9ee92..9263a5099 100644 --- a/src/test/ref/complex/bubbles64/bubbles64.log +++ b/src/test/ref/complex/bubbles64/bubbles64.log @@ -4120,16 +4120,16 @@ main: { // main::@9 __b9: // [101] main::$111 = (byte*) 53248 + main::c#11 -- pbuz1=pbuc1_plus_vwuz2 - lda.z c_1 clc + lda.z c_1 adc #<$d000 sta.z __111 lda.z c_1+1 adc #>$d000 sta.z __111+1 // [102] main::$112 = (byte*) 63488 + main::c#11 -- pbuz1=pbuc1_plus_vwuz2 - lda.z c_1 clc + lda.z c_1 adc #<$f800 sta.z __112 lda.z c_1+1 @@ -4152,8 +4152,8 @@ main: { // main::@7 __b7: // [105] main::$109 = (byte*) 57344 + main::c#10 -- pbuz1=pbuc1_plus_vwuz2 - lda.z c clc + lda.z c adc #<$e000 sta.z __109 lda.z c+1 @@ -4164,8 +4164,8 @@ main: { ldy #0 sta (__109),y // [107] main::$110 = (byte*) 55296 + main::c#10 -- pbuz1=pbuc1_plus_vwuz2 - lda.z c clc + lda.z c adc #<$d800 sta.z __110 lda.z c+1 @@ -5440,16 +5440,16 @@ main: { __b9: // chrPtr[c]=vicPtr[c] // [101] main::$111 = (byte*) 53248 + main::c#11 -- pbuz1=pbuc1_plus_vwuz2 - lda.z c_1 clc + lda.z c_1 adc #<$d000 sta.z __111 lda.z c_1+1 adc #>$d000 sta.z __111+1 // [102] main::$112 = (byte*) 63488 + main::c#11 -- pbuz1=pbuc1_plus_vwuz2 - lda.z c_1 clc + lda.z c_1 adc #<$f800 sta.z __112 lda.z c_1+1 @@ -5472,8 +5472,8 @@ main: { __b7: // scrPtr[c]=32 // [105] main::$109 = (byte*) 57344 + main::c#10 -- pbuz1=pbuc1_plus_vwuz2 - lda.z c clc + lda.z c adc #<$e000 sta.z __109 lda.z c+1 @@ -5485,8 +5485,8 @@ main: { sta (__109),y // colPtr[c]=14 // [107] main::$110 = (byte*) 55296 + main::c#10 -- pbuz1=pbuc1_plus_vwuz2 - lda.z c clc + lda.z c adc #<$d800 sta.z __110 lda.z c+1 diff --git a/src/test/ref/complex/clearscreen/clearscreen.asm b/src/test/ref/complex/clearscreen/clearscreen.asm index 5b5e0f4cb..09f22475c 100644 --- a/src/test/ref/complex/clearscreen/clearscreen.asm +++ b/src/test/ref/complex/clearscreen/clearscreen.asm @@ -1038,8 +1038,8 @@ startProcessing: { inc.z offset+1 !: // colPtr = COLS+offset - lda.z offset clc + lda.z offset adc #> 8 - lda.z __44 clc + lda.z __44 adc #> 8 // [79] main::$69 = (word*)balls + main::$44 -- pwuz1=pwuc1_plus_vwuz2 - lda.z __44 clc + lda.z __44 adc #$64 sta.z current_x_1+1 - lda.z to_y_1 clc + lda.z to_y_1 adc #<$64 sta.z current_y_1 lda.z to_y_1+1 @@ -409,15 +409,15 @@ show_letter: { // rotate(via, angle) // via = rotate(via, angle) // via = { via.x + 100, via.y + 100} - lda.z segment_via_x clc + lda.z segment_via_x adc #<$64 sta.z segment_via_x lda.z segment_via_x+1 adc #>$64 sta.z segment_via_x+1 - lda.z segment_via_y clc + lda.z segment_via_y adc #<$64 sta.z segment_via_y lda.z segment_via_y+1 @@ -1037,8 +1037,8 @@ spline_8segB: { tay __b1: // p.x+0x20 - lda.z p_x clc + lda.z p_x adc #<$20 sta.z __22 lda.z p_x+1 @@ -1062,8 +1062,8 @@ spline_8segB: { rol.z __23 rol.z __23+1 // p.y+0x20 - lda.z p_y clc + lda.z p_y adc #<$20 sta.z __24 lda.z p_y+1 @@ -1136,8 +1136,8 @@ spline_8segB: { jmp __b1 !__b1: // p.x+0x20 - lda.z __18 clc + lda.z __18 adc #<$20 sta.z __18 lda.z __18+1 @@ -1161,8 +1161,8 @@ spline_8segB: { rol.z __19 rol.z __19+1 // p.y+0x20 - lda.z __20 clc + lda.z __20 adc #<$20 sta.z __20 lda.z __20+1 diff --git a/src/test/ref/complex/splines/truetype-splines.log b/src/test/ref/complex/splines/truetype-splines.log index ac524a1b3..8ee4231a0 100644 --- a/src/test/ref/complex/splines/truetype-splines.log +++ b/src/test/ref/complex/splines/truetype-splines.log @@ -6334,16 +6334,16 @@ show_letter: { // [93] show_letter::to_x#2 = rotate::return_x#0 // [94] show_letter::to_y#2 = rotate::return_y#0 // [95] show_letter::current_x#10 = show_letter::to_x#2 + $64 -- vwsz1=vwsz2_plus_vbsc1 - lda.z to_x_1 clc + lda.z to_x_1 adc #<$64 sta.z current_x_1 lda.z to_x_1+1 adc #>$64 sta.z current_x_1+1 // [96] show_letter::current_y#10 = show_letter::to_y#2 + $64 -- vwsz1=vwsz2_plus_vbsc1 - lda.z to_y_1 clc + lda.z to_y_1 adc #<$64 sta.z current_y_1 lda.z to_y_1+1 @@ -6396,16 +6396,16 @@ show_letter: { // [107] show_letter::via_x#2 = rotate::return_x#1 // [108] show_letter::via_y#2 = rotate::return_y#1 // [109] show_letter::segment_via_x#0 = show_letter::via_x#2 + $64 -- vwsz1=vwsz1_plus_vbsc1 - lda.z segment_via_x clc + lda.z segment_via_x adc #<$64 sta.z segment_via_x lda.z segment_via_x+1 adc #>$64 sta.z segment_via_x+1 // [110] show_letter::segment_via_y#0 = show_letter::via_y#2 + $64 -- vwsz1=vwsz1_plus_vbsc1 - lda.z segment_via_y clc + lda.z segment_via_y adc #<$64 sta.z segment_via_y lda.z segment_via_y+1 @@ -7264,8 +7264,8 @@ spline_8segB: { // spline_8segB::@1 __b1: // [251] spline_8segB::$22 = spline_8segB::p_x#2 + $20 -- vwsz1=vwsz2_plus_vbsc1 - lda.z p_x clc + lda.z p_x adc #<$20 sta.z __22 lda.z p_x+1 @@ -7289,8 +7289,8 @@ spline_8segB: { rol.z __23 rol.z __23+1 // [253] spline_8segB::$24 = spline_8segB::p_y#2 + $20 -- vwsz1=vwsz2_plus_vbsc1 - lda.z p_y clc + lda.z p_y adc #<$20 sta.z __24 lda.z p_y+1 @@ -7369,8 +7369,8 @@ spline_8segB: { // spline_8segB::@2 __b2: // [264] spline_8segB::$18 = spline_8segB::p_x#1 + $20 -- vwsz1=vwsz1_plus_vbsc1 - lda.z __18 clc + lda.z __18 adc #<$20 sta.z __18 lda.z __18+1 @@ -7394,8 +7394,8 @@ spline_8segB: { rol.z __19 rol.z __19+1 // [266] spline_8segB::$20 = spline_8segB::p_y#1 + $20 -- vwsz1=vwsz1_plus_vbsc1 - lda.z __20 clc + lda.z __20 adc #<$20 sta.z __20 lda.z __20+1 @@ -9268,16 +9268,16 @@ show_letter: { // [94] show_letter::to_y#2 = rotate::return_y#0 // to = { to.x + 100, to.y + 100} // [95] show_letter::current_x#10 = show_letter::to_x#2 + $64 -- vwsz1=vwsz2_plus_vbsc1 - lda.z to_x_1 clc + lda.z to_x_1 adc #<$64 sta.z current_x_1 lda.z to_x_1+1 adc #>$64 sta.z current_x_1+1 // [96] show_letter::current_y#10 = show_letter::to_y#2 + $64 -- vwsz1=vwsz2_plus_vbsc1 - lda.z to_y_1 clc + lda.z to_y_1 adc #<$64 sta.z current_y_1 lda.z to_y_1+1 @@ -9332,16 +9332,16 @@ show_letter: { // [108] show_letter::via_y#2 = rotate::return_y#1 // via = { via.x + 100, via.y + 100} // [109] show_letter::segment_via_x#0 = show_letter::via_x#2 + $64 -- vwsz1=vwsz1_plus_vbsc1 - lda.z segment_via_x clc + lda.z segment_via_x adc #<$64 sta.z segment_via_x lda.z segment_via_x+1 adc #>$64 sta.z segment_via_x+1 // [110] show_letter::segment_via_y#0 = show_letter::via_y#2 + $64 -- vwsz1=vwsz1_plus_vbsc1 - lda.z segment_via_y clc + lda.z segment_via_y adc #<$64 sta.z segment_via_y lda.z segment_via_y+1 @@ -10204,8 +10204,8 @@ spline_8segB: { __b1: // p.x+0x20 // [251] spline_8segB::$22 = spline_8segB::p_x#2 + $20 -- vwsz1=vwsz2_plus_vbsc1 - lda.z p_x clc + lda.z p_x adc #<$20 sta.z __22 lda.z p_x+1 @@ -10231,8 +10231,8 @@ spline_8segB: { rol.z __23+1 // p.y+0x20 // [253] spline_8segB::$24 = spline_8segB::p_y#2 + $20 -- vwsz1=vwsz2_plus_vbsc1 - lda.z p_y clc + lda.z p_y adc #<$20 sta.z __24 lda.z p_y+1 @@ -10317,8 +10317,8 @@ spline_8segB: { // spline_8segB::@2 // p.x+0x20 // [264] spline_8segB::$18 = spline_8segB::p_x#1 + $20 -- vwsz1=vwsz1_plus_vbsc1 - lda.z __18 clc + lda.z __18 adc #<$20 sta.z __18 lda.z __18+1 @@ -10344,8 +10344,8 @@ spline_8segB: { rol.z __19+1 // p.y+0x20 // [266] spline_8segB::$20 = spline_8segB::p_y#1 + $20 -- vwsz1=vwsz1_plus_vbsc1 - lda.z __20 clc + lda.z __20 adc #<$20 sta.z __20 lda.z __20+1 diff --git a/src/test/ref/complex/spritescroller/spritescroller.asm b/src/test/ref/complex/spritescroller/spritescroller.asm index 75c078676..75a69ac94 100644 --- a/src/test/ref/complex/spritescroller/spritescroller.asm +++ b/src/test/ref/complex/spritescroller/spritescroller.asm @@ -379,8 +379,8 @@ font_2x2: { sta.z next_2x2_left+1 __b1: // next_2x2_right = next_2x2 + 0x40*8 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$40*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -467,16 +467,16 @@ font_2x2: { cmp.z l2 bne __b8 // next_2x2_left = next_2x2 + 0x80*8 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$80*8 sta.z next_2x2_left_1 lda.z next_2x2_left+1 adc #>$80*8 sta.z next_2x2_left_1+1 // next_2x2_right = next_2x2 + 0xc0*8 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$c0*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -547,8 +547,8 @@ font_2x2_to_sprites: { rts __b2: // char_right = char_current + 0x40*8 - lda.z char_current clc + lda.z char_current adc #<$40*8 sta.z char_right lda.z char_current+1 @@ -625,16 +625,16 @@ font_2x2_to_sprites: { jmp __b1 __b4: // char_left = char_current + 0x80*8 - lda.z char_current clc + lda.z char_current adc #<$80*8 sta.z char_left lda.z char_current+1 adc #>$80*8 sta.z char_left+1 // char_right = char_current + 0xc0*8 - lda.z char_current clc + lda.z char_current adc #<$c0*8 sta.z char_right lda.z char_current+1 diff --git a/src/test/ref/complex/spritescroller/spritescroller.log b/src/test/ref/complex/spritescroller/spritescroller.log index 3d95f2847..a59db0426 100644 --- a/src/test/ref/complex/spritescroller/spritescroller.log +++ b/src/test/ref/complex/spritescroller/spritescroller.log @@ -4392,8 +4392,8 @@ font_2x2: { // font_2x2::@1 __b1: // [93] font_2x2::next_2x2_right#0 = font_2x2::next_2x2_left#0 + (word)$40*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$40*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -4533,16 +4533,16 @@ font_2x2: { // font_2x2::@7 __b7: // [121] font_2x2::next_2x2_left#1 = font_2x2::next_2x2_left#0 + (word)$80*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$80*8 sta.z next_2x2_left_1 lda.z next_2x2_left+1 adc #>$80*8 sta.z next_2x2_left_1+1 // [122] font_2x2::next_2x2_right#1 = font_2x2::next_2x2_left#0 + (word)$c0*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$c0*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -4645,8 +4645,8 @@ font_2x2_to_sprites: { // font_2x2_to_sprites::@2 __b2: // [135] font_2x2_to_sprites::char_right#0 = font_2x2_to_sprites::char_current#2 + (word)$40*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z char_current clc + lda.z char_current adc #<$40*8 sta.z char_right lda.z char_current+1 @@ -4770,16 +4770,16 @@ font_2x2_to_sprites: { // font_2x2_to_sprites::@4 __b4: // [154] font_2x2_to_sprites::char_left#1 = font_2x2_to_sprites::char_current#2 + (word)$80*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z char_current clc + lda.z char_current adc #<$80*8 sta.z char_left lda.z char_current+1 adc #>$80*8 sta.z char_left+1 // [155] font_2x2_to_sprites::char_right#1 = font_2x2_to_sprites::char_current#2 + (word)$c0*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z char_current clc + lda.z char_current adc #<$c0*8 sta.z char_right lda.z char_current+1 @@ -6177,8 +6177,8 @@ font_2x2: { __b1: // next_2x2_right = next_2x2 + 0x40*8 // [93] font_2x2::next_2x2_right#0 = font_2x2::next_2x2_left#0 + (word)$40*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$40*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -6318,8 +6318,8 @@ font_2x2: { // font_2x2::@7 // next_2x2_left = next_2x2 + 0x80*8 // [121] font_2x2::next_2x2_left#1 = font_2x2::next_2x2_left#0 + (word)$80*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$80*8 sta.z next_2x2_left_1 lda.z next_2x2_left+1 @@ -6327,8 +6327,8 @@ font_2x2: { sta.z next_2x2_left_1+1 // next_2x2_right = next_2x2 + 0xc0*8 // [122] font_2x2::next_2x2_right#1 = font_2x2::next_2x2_left#0 + (word)$c0*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$c0*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -6428,8 +6428,8 @@ font_2x2_to_sprites: { __b2: // char_right = char_current + 0x40*8 // [135] font_2x2_to_sprites::char_right#0 = font_2x2_to_sprites::char_current#2 + (word)$40*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z char_current clc + lda.z char_current adc #<$40*8 sta.z char_right lda.z char_current+1 @@ -6549,8 +6549,8 @@ font_2x2_to_sprites: { __b4: // char_left = char_current + 0x80*8 // [154] font_2x2_to_sprites::char_left#1 = font_2x2_to_sprites::char_current#2 + (word)$80*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z char_current clc + lda.z char_current adc #<$80*8 sta.z char_left lda.z char_current+1 @@ -6558,8 +6558,8 @@ font_2x2_to_sprites: { sta.z char_left+1 // char_right = char_current + 0xc0*8 // [155] font_2x2_to_sprites::char_right#1 = font_2x2_to_sprites::char_current#2 + (word)$c0*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z char_current clc + lda.z char_current adc #<$c0*8 sta.z char_right lda.z char_current+1 diff --git a/src/test/ref/complex/xmega65/xmega65.asm b/src/test/ref/complex/xmega65/xmega65.asm index 8e7a000b6..7a208da02 100644 --- a/src/test/ref/complex/xmega65/xmega65.asm +++ b/src/test/ref/complex/xmega65/xmega65.asm @@ -109,8 +109,8 @@ memset: { .label dst = 6 .label str = 6 // end = (char*)str + num - lda.z str clc + lda.z str adc #<$28*$19 sta.z end lda.z str+1 diff --git a/src/test/ref/complex/xmega65/xmega65.log b/src/test/ref/complex/xmega65/xmega65.log index 32c33ff4c..e587f709e 100644 --- a/src/test/ref/complex/xmega65/xmega65.log +++ b/src/test/ref/complex/xmega65/xmega65.log @@ -671,8 +671,8 @@ memset: { // memset::@1 __b1: // [18] memset::end#0 = (byte*)memset::str#3 + (word)$28*$19 -- pbuz1=pbuz2_plus_vwuc1 - lda.z str clc + lda.z str adc #<$28*$19 sta.z end lda.z str+1 @@ -961,8 +961,8 @@ memset: { // memset::@1 // end = (char*)str + num // [18] memset::end#0 = (byte*)memset::str#3 + (word)$28*$19 -- pbuz1=pbuz2_plus_vwuc1 - lda.z str clc + lda.z str adc #<$28*$19 sta.z end lda.z str+1 diff --git a/src/test/ref/complex/xy-scroller/xy-scroller.asm b/src/test/ref/complex/xy-scroller/xy-scroller.asm index 3a8e1febe..a7d27c51a 100644 --- a/src/test/ref/complex/xy-scroller/xy-scroller.asm +++ b/src/test/ref/complex/xy-scroller/xy-scroller.asm @@ -406,8 +406,8 @@ main: { // petscii_ptr(x_pos_coarse-20, y_pos_coarse+12) // petscii = petscii_ptr(x_pos_coarse-20, y_pos_coarse+12) // scrn = screen_hidden+24*40 - lda.z screen_hidden clc + lda.z screen_hidden adc #<$18*$28 sta.z scrn lda.z screen_hidden+1 @@ -623,32 +623,32 @@ screencpy: { adc.z dst+1 sta.z dst_250+1 // src_500 = src+500 - lda.z src clc + lda.z src adc #<$1f4 sta.z src_500 lda.z src+1 adc #>$1f4 sta.z src_500+1 // dst_500 = dst+500 - lda.z dst clc + lda.z dst adc #<$1f4 sta.z dst_500 lda.z dst+1 adc #>$1f4 sta.z dst_500+1 // src_750 = src+750 - lda.z src clc + lda.z src adc #<$2ee sta.z src_750 lda.z src+1 adc #>$2ee sta.z src_750+1 // dst_750 = dst+750 - lda.z dst clc + lda.z dst adc #<$2ee sta.z dst_750 lda.z dst+1 diff --git a/src/test/ref/complex/xy-scroller/xy-scroller.log b/src/test/ref/complex/xy-scroller/xy-scroller.log index cf6198b4d..9cd185e47 100644 --- a/src/test/ref/complex/xy-scroller/xy-scroller.log +++ b/src/test/ref/complex/xy-scroller/xy-scroller.log @@ -4678,8 +4678,8 @@ main: { __b34: // [87] main::petscii#1 = petscii_ptr::return#0 // [88] main::scrn#1 = main::screen_hidden#0 + (word)$18*$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z screen_hidden clc + lda.z screen_hidden adc #<$18*$28 sta.z scrn lda.z screen_hidden+1 @@ -4937,32 +4937,32 @@ screencpy: { adc.z dst+1 sta.z dst_250+1 // [123] screencpy::src_500#0 = screencpy::src#0 + $1f4 -- pbuz1=pbuz2_plus_vwuc1 - lda.z src clc + lda.z src adc #<$1f4 sta.z src_500 lda.z src+1 adc #>$1f4 sta.z src_500+1 // [124] screencpy::dst_500#0 = screencpy::dst#0 + $1f4 -- pbuz1=pbuz2_plus_vwuc1 - lda.z dst clc + lda.z dst adc #<$1f4 sta.z dst_500 lda.z dst+1 adc #>$1f4 sta.z dst_500+1 // [125] screencpy::src_750#0 = screencpy::src#0 + $2ee -- pbuz1=pbuz2_plus_vwuc1 - lda.z src clc + lda.z src adc #<$2ee sta.z src_750 lda.z src+1 adc #>$2ee sta.z src_750+1 // [126] screencpy::dst_750#0 = screencpy::dst#0 + $2ee -- pbuz1=pbuz2_plus_vwuc1 - lda.z dst clc + lda.z dst adc #<$2ee sta.z dst_750 lda.z dst+1 @@ -6037,8 +6037,8 @@ main: { // [87] main::petscii#1 = petscii_ptr::return#0 // scrn = screen_hidden+24*40 // [88] main::scrn#1 = main::screen_hidden#0 + (word)$18*$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z screen_hidden clc + lda.z screen_hidden adc #<$18*$28 sta.z scrn lda.z screen_hidden+1 @@ -6303,8 +6303,8 @@ screencpy: { sta.z dst_250+1 // src_500 = src+500 // [123] screencpy::src_500#0 = screencpy::src#0 + $1f4 -- pbuz1=pbuz2_plus_vwuc1 - lda.z src clc + lda.z src adc #<$1f4 sta.z src_500 lda.z src+1 @@ -6312,8 +6312,8 @@ screencpy: { sta.z src_500+1 // dst_500 = dst+500 // [124] screencpy::dst_500#0 = screencpy::dst#0 + $1f4 -- pbuz1=pbuz2_plus_vwuc1 - lda.z dst clc + lda.z dst adc #<$1f4 sta.z dst_500 lda.z dst+1 @@ -6321,8 +6321,8 @@ screencpy: { sta.z dst_500+1 // src_750 = src+750 // [125] screencpy::src_750#0 = screencpy::src#0 + $2ee -- pbuz1=pbuz2_plus_vwuc1 - lda.z src clc + lda.z src adc #<$2ee sta.z src_750 lda.z src+1 @@ -6330,8 +6330,8 @@ screencpy: { sta.z src_750+1 // dst_750 = dst+750 // [126] screencpy::dst_750#0 = screencpy::dst#0 + $2ee -- pbuz1=pbuz2_plus_vwuc1 - lda.z dst clc + lda.z dst adc #<$2ee sta.z dst_750 lda.z dst+1 diff --git a/src/test/ref/cpu-65ce02-eightqueens.asm b/src/test/ref/cpu-65ce02-eightqueens.asm index b71400880..559fa1120 100644 --- a/src/test/ref/cpu-65ce02-eightqueens.asm +++ b/src/test/ref/cpu-65ce02-eightqueens.asm @@ -1174,8 +1174,8 @@ memcpy: { .label source = $14 .label destination = $1d // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/cpu-65ce02-eightqueens.log b/src/test/ref/cpu-65ce02-eightqueens.log index 2feb5280c..5d65a3b4a 100644 --- a/src/test/ref/cpu-65ce02-eightqueens.log +++ b/src/test/ref/cpu-65ce02-eightqueens.log @@ -8941,8 +8941,8 @@ memcpy: { .label source = $14 .label destination = $1d // [311] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -11775,8 +11775,8 @@ memcpy: { .label destination = $1d // src_end = (char*)source+num // [311] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/derefidx-word-0.asm b/src/test/ref/derefidx-word-0.asm index 5f3388715..6b4df3dd0 100644 --- a/src/test/ref/derefidx-word-0.asm +++ b/src/test/ref/derefidx-word-0.asm @@ -23,8 +23,8 @@ main: { rts __b2: // screen[i] = 'a' - lda.z i clc + lda.z i adc #Msg) - lda.z T clc + lda.z T adc #1 sta.z strlen.str lda.z T+1 @@ -199,8 +199,8 @@ MakeNiceScreen: { lsr tax // cputsxy (X, T->Y, T->Msg) - lda.z T clc + lda.z T adc #1 sta.z cputsxy.s lda.z T+1 @@ -577,8 +577,8 @@ gotoxy: { asl.z line_offset rol.z line_offset+1 // CONIO_SCREEN_TEXT + line_offset - lda.z line_offset clc + lda.z line_offset adc #Msg) // [60] strlen::str#1 = (byte*)MakeNiceScreen::T#3 + 1 -- pbuz1=pbuz2_plus_1 - lda.z T clc + lda.z T adc #1 sta.z strlen.str lda.z T+1 @@ -5355,8 +5355,8 @@ MakeNiceScreen: { tax // cputsxy (X, T->Y, T->Msg) // [67] cputsxy::s#0 = (byte*)MakeNiceScreen::T#3 + 1 -- pbuz1=pbuz2_plus_1 - lda.z T clc + lda.z T adc #1 sta.z cputsxy.s lda.z T+1 @@ -5919,8 +5919,8 @@ gotoxy: { rol.z line_offset+1 // CONIO_SCREEN_TEXT + line_offset // [163] gotoxy::$5 = DEFAULT_SCREEN + gotoxy::line_offset#0 -- pbuz1=pbuc1_plus_vwuz2 - lda.z line_offset clc + lda.z line_offset adc #$80*8 sta.z next_2x2_left_1+1 // next_2x2_right = next_2x2 + 0xc0*8 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$c0*8 sta.z next_2x2_right lda.z next_2x2_left+1 diff --git a/src/test/ref/examples/font-2x2/font-2x2.log b/src/test/ref/examples/font-2x2/font-2x2.log index 15f6d3624..32f445e59 100644 --- a/src/test/ref/examples/font-2x2/font-2x2.log +++ b/src/test/ref/examples/font-2x2/font-2x2.log @@ -2477,8 +2477,8 @@ font_2x2: { // font_2x2::@1 __b1: // [24] font_2x2::next_2x2_right#0 = font_2x2::next_2x2_left#0 + (word)$40*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$40*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -2618,16 +2618,16 @@ font_2x2: { // font_2x2::@7 __b7: // [52] font_2x2::next_2x2_left#1 = font_2x2::next_2x2_left#0 + (word)$80*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$80*8 sta.z next_2x2_left_1 lda.z next_2x2_left+1 adc #>$80*8 sta.z next_2x2_left_1+1 // [53] font_2x2::next_2x2_right#1 = font_2x2::next_2x2_left#0 + (word)$c0*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$c0*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -3525,8 +3525,8 @@ font_2x2: { __b1: // next_2x2_right = next_2x2 + 0x40*8 // [24] font_2x2::next_2x2_right#0 = font_2x2::next_2x2_left#0 + (word)$40*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$40*8 sta.z next_2x2_right lda.z next_2x2_left+1 @@ -3666,8 +3666,8 @@ font_2x2: { // font_2x2::@7 // next_2x2_left = next_2x2 + 0x80*8 // [52] font_2x2::next_2x2_left#1 = font_2x2::next_2x2_left#0 + (word)$80*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$80*8 sta.z next_2x2_left_1 lda.z next_2x2_left+1 @@ -3675,8 +3675,8 @@ font_2x2: { sta.z next_2x2_left_1+1 // next_2x2_right = next_2x2 + 0xc0*8 // [53] font_2x2::next_2x2_right#1 = font_2x2::next_2x2_left#0 + (word)$c0*8 -- pbuz1=pbuz2_plus_vwuc1 - lda.z next_2x2_left clc + lda.z next_2x2_left adc #<$c0*8 sta.z next_2x2_right lda.z next_2x2_left+1 diff --git a/src/test/ref/examples/helloworld/helloworld.asm b/src/test/ref/examples/helloworld/helloworld.asm index 73513a526..16b2ef378 100644 --- a/src/test/ref/examples/helloworld/helloworld.asm +++ b/src/test/ref/examples/helloworld/helloworld.asm @@ -196,8 +196,8 @@ memcpy: { .label source = 4 .label destination = $e // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/examples/helloworld/helloworld.log b/src/test/ref/examples/helloworld/helloworld.log index a2ce4d21d..e6a507585 100644 --- a/src/test/ref/examples/helloworld/helloworld.log +++ b/src/test/ref/examples/helloworld/helloworld.log @@ -1425,8 +1425,8 @@ memcpy: { .label source = 4 .label destination = $e // [49] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -1960,8 +1960,8 @@ memcpy: { .label destination = $e // src_end = (char*)source+num // [49] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/examples/mega65/helloworld-mega65.asm b/src/test/ref/examples/mega65/helloworld-mega65.asm index 68d7dbb72..fd07a1a24 100644 --- a/src/test/ref/examples/mega65/helloworld-mega65.asm +++ b/src/test/ref/examples/mega65/helloworld-mega65.asm @@ -149,8 +149,8 @@ gotoxy: { asw line_offset asw line_offset // CONIO_SCREEN_TEXT + line_offset - lda.z line_offset clc + lda.z line_offset adc #fibs sta.z __4+1 - lda.z i clc + lda.z i adc #fibs sta.z __4+1 // [6] main::$5 = fibs+1 + main::i#2 -- pbuz1=pbuc1_plus_vwuz2 - lda.z i clc + lda.z i adc #fibs sta.z __4+1 // [6] main::$5 = fibs+1 + main::i#2 -- pbuz1=pbuc1_plus_vwuz2 - lda.z i clc + lda.z i adc #SCREEN - adc.z i+1 + lda.z i+1 + adc #>SCREEN sta.z sc+1 // *sc = (char)i lda.z i diff --git a/src/test/ref/pointer-plus-signed-word.log b/src/test/ref/pointer-plus-signed-word.log index 06eccd313..0d8010e14 100644 --- a/src/test/ref/pointer-plus-signed-word.log +++ b/src/test/ref/pointer-plus-signed-word.log @@ -157,12 +157,12 @@ main: { // main::@1 __b1: // [2] main::sc#0 = SCREEN + main::i#2 -- pbuz1=pbuc1_plus_vwsz2 - lda #SCREEN - adc.z i+1 + lda.z i+1 + adc #>SCREEN sta.z sc+1 // [3] *main::sc#0 = (byte)main::i#2 -- _deref_pbuz1=_byte_vwsz2 lda.z i @@ -243,12 +243,12 @@ main: { __b1: // sc = SCREEN + i // [2] main::sc#0 = SCREEN + main::i#2 -- pbuz1=pbuc1_plus_vwsz2 - lda #SCREEN - adc.z i+1 + lda.z i+1 + adc #>SCREEN sta.z sc+1 // *sc = (char)i // [3] *main::sc#0 = (byte)main::i#2 -- _deref_pbuz1=_byte_vwsz2 diff --git a/src/test/ref/primes-1000.asm b/src/test/ref/primes-1000.asm index ffcee28af..4d290e843 100644 --- a/src/test/ref/primes-1000.asm +++ b/src/test/ref/primes-1000.asm @@ -97,8 +97,8 @@ main: { !: __b2: // testnum +=2 - lda.z testnum clc + lda.z testnum adc #<2 sta.z testnum lda.z testnum+1 @@ -143,8 +143,8 @@ main: { lda.z rem16s bne __b4 // testnum +=2 - lda.z testnum clc + lda.z testnum adc #<2 sta.z testnum lda.z testnum+1 diff --git a/src/test/ref/primes-1000.log b/src/test/ref/primes-1000.log index faa282756..c0e33649e 100644 --- a/src/test/ref/primes-1000.log +++ b/src/test/ref/primes-1000.log @@ -3428,8 +3428,8 @@ main: { // main::@2 __b2: // [15] testnum#1 = testnum#15 + 2 -- vwsz1=vwsz1_plus_vbsc1 - lda.z testnum clc + lda.z testnum adc #<2 sta.z testnum lda.z testnum+1 @@ -3495,8 +3495,8 @@ main: { // main::@5 __b5: // [24] testnum#2 = testnum#10 + 2 -- vwsz1=vwsz1_plus_vbsc1 - lda.z testnum clc + lda.z testnum adc #<2 sta.z testnum lda.z testnum+1 @@ -4913,8 +4913,8 @@ main: { __b2: // testnum +=2 // [15] testnum#1 = testnum#15 + 2 -- vwsz1=vwsz1_plus_vbsc1 - lda.z testnum clc + lda.z testnum adc #<2 sta.z testnum lda.z testnum+1 @@ -4976,8 +4976,8 @@ main: { // main::@5 // testnum +=2 // [24] testnum#2 = testnum#10 + 2 -- vwsz1=vwsz1_plus_vbsc1 - lda.z testnum clc + lda.z testnum adc #<2 sta.z testnum lda.z testnum+1 diff --git a/src/test/ref/printf-1.asm b/src/test/ref/printf-1.asm index e5cb796df..02eb919ac 100644 --- a/src/test/ref/printf-1.asm +++ b/src/test/ref/printf-1.asm @@ -419,8 +419,8 @@ memcpy: { .label source = $b .label destination = $15 // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-1.log b/src/test/ref/printf-1.log index 7aa504ac9..5fea0bfec 100644 --- a/src/test/ref/printf-1.log +++ b/src/test/ref/printf-1.log @@ -2794,8 +2794,8 @@ memcpy: { .label source = $b .label destination = $15 // [114] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -3833,8 +3833,8 @@ memcpy: { .label destination = $15 // src_end = (char*)source+num // [114] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-12.asm b/src/test/ref/printf-12.asm index 152e14213..a9da27474 100644 --- a/src/test/ref/printf-12.asm +++ b/src/test/ref/printf-12.asm @@ -1269,8 +1269,8 @@ memcpy: { .label source = $18 .label destination = $21 // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-12.log b/src/test/ref/printf-12.log index 3b36f4c3e..0753c0b12 100644 --- a/src/test/ref/printf-12.log +++ b/src/test/ref/printf-12.log @@ -9095,8 +9095,8 @@ memcpy: { .label source = $18 .label destination = $21 // [313] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -12076,8 +12076,8 @@ memcpy: { .label destination = $21 // src_end = (char*)source+num // [313] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-13.asm b/src/test/ref/printf-13.asm index a5a0e0089..7f9c87ff8 100644 --- a/src/test/ref/printf-13.asm +++ b/src/test/ref/printf-13.asm @@ -1453,8 +1453,8 @@ memcpy: { .label source = $10 .label destination = $12 // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-13.log b/src/test/ref/printf-13.log index b78cf530f..38f00ef84 100644 --- a/src/test/ref/printf-13.log +++ b/src/test/ref/printf-13.log @@ -9528,8 +9528,8 @@ memcpy: { .label source = $10 .label destination = $12 // [389] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -13048,8 +13048,8 @@ memcpy: { .label destination = $12 // src_end = (char*)source+num // [389] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-14.asm b/src/test/ref/printf-14.asm index 56f0b2fdc..a8a0bcca4 100644 --- a/src/test/ref/printf-14.asm +++ b/src/test/ref/printf-14.asm @@ -404,8 +404,8 @@ memcpy: { .label source = 6 .label destination = $11 // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-14.log b/src/test/ref/printf-14.log index 13ff50f2e..d9c53151e 100644 --- a/src/test/ref/printf-14.log +++ b/src/test/ref/printf-14.log @@ -3908,8 +3908,8 @@ memcpy: { .label source = 6 .label destination = $11 // [107] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -4933,8 +4933,8 @@ memcpy: { .label destination = $11 // src_end = (char*)source+num // [107] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-15.asm b/src/test/ref/printf-15.asm index 9434db8ae..9f5de2edb 100644 --- a/src/test/ref/printf-15.asm +++ b/src/test/ref/printf-15.asm @@ -277,8 +277,8 @@ memcpy: { .label source = 4 .label destination = 6 // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-15.log b/src/test/ref/printf-15.log index 8a99918d1..07c4df7f2 100644 --- a/src/test/ref/printf-15.log +++ b/src/test/ref/printf-15.log @@ -1804,8 +1804,8 @@ memcpy: { .label source = 4 .label destination = 6 // [69] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -2501,8 +2501,8 @@ memcpy: { .label destination = 6 // src_end = (char*)source+num // [69] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-16.asm b/src/test/ref/printf-16.asm index 94b478a8f..5e5d046a7 100644 --- a/src/test/ref/printf-16.asm +++ b/src/test/ref/printf-16.asm @@ -663,8 +663,8 @@ memcpy: { .label source = $11 .label destination = 7 // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-16.log b/src/test/ref/printf-16.log index 13cfc6f2e..0d7ebf864 100644 --- a/src/test/ref/printf-16.log +++ b/src/test/ref/printf-16.log @@ -5521,8 +5521,8 @@ memcpy: { .label source = $11 .label destination = 7 // [192] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -7187,8 +7187,8 @@ memcpy: { .label destination = 7 // src_end = (char*)source+num // [192] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-2.asm b/src/test/ref/printf-2.asm index eb72cd095..4fd6ef7fb 100644 --- a/src/test/ref/printf-2.asm +++ b/src/test/ref/printf-2.asm @@ -810,8 +810,8 @@ memcpy: { .label source = $d .label destination = $16 // src_end = (char*)source+num - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-2.log b/src/test/ref/printf-2.log index 7b2c4c52a..e9865aebc 100644 --- a/src/test/ref/printf-2.log +++ b/src/test/ref/printf-2.log @@ -6230,8 +6230,8 @@ memcpy: { .label source = $d .label destination = $16 // [215] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 @@ -8297,8 +8297,8 @@ memcpy: { .label destination = $16 // src_end = (char*)source+num // [215] memcpy::src_end#0 = (byte*)memcpy::source#2 + (word)$19*$28-$28 -- pbuz1=pbuz2_plus_vwuc1 - lda.z source clc + lda.z source adc #<$19*$28-$28 sta.z src_end lda.z source+1 diff --git a/src/test/ref/printf-speed.asm b/src/test/ref/printf-speed.asm index 6c9aae7a6..30dfbb5cc 100644 --- a/src/test/ref/printf-speed.asm +++ b/src/test/ref/printf-speed.asm @@ -206,8 +206,8 @@ gotoxy: { asl.z line_offset rol.z line_offset+1 // CONIO_SCREEN_TEXT + line_offset - lda.z line_offset clc + lda.z line_offset adc #screen - adc.z i+1 + lda.z i+1 + adc #>screen sta.z __2+1 txa ldy #0 diff --git a/src/test/ref/static-register-optimization-problem.log b/src/test/ref/static-register-optimization-problem.log index be9a25c38..ff2cb1249 100644 --- a/src/test/ref/static-register-optimization-problem.log +++ b/src/test/ref/static-register-optimization-problem.log @@ -214,12 +214,12 @@ main: { // [4] main::$1 = < main::lasti#2 -- vbuxx=_lo_vwsz1 ldx.z lasti // [5] main::$2 = main::screen + main::i#2 -- pbuz1=pbuc1_plus_vwsz2 - lda #screen - adc.z i+1 + lda.z i+1 + adc #>screen sta.z __2+1 // [6] *main::$2 = main::$1 -- _deref_pbuz1=vbuxx txa @@ -323,12 +323,12 @@ main: { ldx.z lasti // screen[i] = screen - adc.z i+1 + lda.z i+1 + adc #>screen sta.z __2+1 // [6] *main::$2 = main::$1 -- _deref_pbuz1=vbuxx txa diff --git a/src/test/ref/string-pointer-problem.asm b/src/test/ref/string-pointer-problem.asm index 222037c96..902cd9441 100644 --- a/src/test/ref/string-pointer-problem.asm +++ b/src/test/ref/string-pointer-problem.asm @@ -34,19 +34,19 @@ set_process_name: { rts __b2: // process_name[j]=name[j] - lda #main.name - adc.z j+1 + lda.z j+1 + adc #>main.name sta.z __1+1 - lda #process_name - adc.z j+1 + lda.z j+1 + adc #>process_name sta.z __2+1 ldy #0 lda (__1),y diff --git a/src/test/ref/string-pointer-problem.log b/src/test/ref/string-pointer-problem.log index 761db98c1..52fb57298 100644 --- a/src/test/ref/string-pointer-problem.log +++ b/src/test/ref/string-pointer-problem.log @@ -237,20 +237,20 @@ set_process_name: { // set_process_name::@2 __b2: // [7] set_process_name::$1 = main::name + set_process_name::j#2 -- pbuz1=pbuc1_plus_vwsz2 - lda #main.name - adc.z j+1 + lda.z j+1 + adc #>main.name sta.z __1+1 // [8] set_process_name::$2 = process_name + set_process_name::j#2 -- pbuz1=pbuc1_plus_vwsz2 - lda #process_name - adc.z j+1 + lda.z j+1 + adc #>process_name sta.z __2+1 // [9] *set_process_name::$2 = *set_process_name::$1 -- _deref_pbuz1=_deref_pbuz2 ldy #0 @@ -357,20 +357,20 @@ set_process_name: { __b2: // process_name[j]=name[j] // [7] set_process_name::$1 = main::name + set_process_name::j#2 -- pbuz1=pbuc1_plus_vwsz2 - lda #main.name - adc.z j+1 + lda.z j+1 + adc #>main.name sta.z __1+1 // [8] set_process_name::$2 = process_name + set_process_name::j#2 -- pbuz1=pbuc1_plus_vwsz2 - lda #process_name - adc.z j+1 + lda.z j+1 + adc #>process_name sta.z __2+1 // [9] *set_process_name::$2 = *set_process_name::$1 -- _deref_pbuz1=_deref_pbuz2 ldy #0 diff --git a/src/test/ref/strip.asm b/src/test/ref/strip.asm index 8807c964f..5144f1389 100644 --- a/src/test/ref/strip.asm +++ b/src/test/ref/strip.asm @@ -62,8 +62,8 @@ strip: { !: __b2: // while(*p++!=0) - lda.z p_1 clc + lda.z p_1 adc #1 sta.z p lda.z p_1+1 diff --git a/src/test/ref/strip.log b/src/test/ref/strip.log index d9ea0ad4d..e74f54962 100644 --- a/src/test/ref/strip.log +++ b/src/test/ref/strip.log @@ -544,8 +544,8 @@ strip: { // strip::@2 __b2: // [16] strip::p#2 = ++ strip::p#4 -- pbuz1=_inc_pbuz2 - lda.z p_1 clc + lda.z p_1 adc #1 sta.z p lda.z p_1+1 @@ -800,8 +800,8 @@ strip: { __b2: // while(*p++!=0) // [16] strip::p#2 = ++ strip::p#4 -- pbuz1=_inc_pbuz2 - lda.z p_1 clc + lda.z p_1 adc #1 sta.z p lda.z p_1+1 diff --git a/src/test/ref/struct-ptr-10.asm b/src/test/ref/struct-ptr-10.asm index b9c51460e..2429fa520 100644 --- a/src/test/ref/struct-ptr-10.asm +++ b/src/test/ref/struct-ptr-10.asm @@ -59,8 +59,8 @@ main: { lda.z i1+1 rol sta.z __3+1 - lda.z __3 clc + lda.z __3 adc #screen+$28 sta.z __3+1 - lda.z l2 clc + lda.z l2 adc #screen+$28 sta.z __3+1 // [39] scrollup3::$4 = screen + scrollup3::l2#2 -- pbuz1=pbuc1_plus_vwuz2 - lda.z l2 clc + lda.z l2 adc #screen+$28 sta.z __3+1 // [39] scrollup3::$4 = screen + scrollup3::l2#2 -- pbuz1=pbuc1_plus_vwuz2 - lda.z l2 clc + lda.z l2 adc #