Merged memory-variables to main. Includes support for C-standard structs, much better constant identification, much better handling of arrays/structs inside structs, removal of string type, initialization/copying using memcpy/memset and new #pragma var_model().

src/main/assembly/assembly.xml

@@ -34,6 +34,7 @@
                 <include>*/*.ld</include>
                 <include>*/*.png</include>
                 <include>*/*.sid</include>
+                <include>*/*.bin</include>
             </includes>
         </fileSet>
         <fileSet>

src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pbuc2_memcpy_vbuxx.asm

@@ -0,0 +1,5 @@
+!:
+lda {c2}-1,x
+sta {c1}-1,x
+dex
+bne !-

src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pbuc2_memcpy_vbuyy.asm

@@ -0,0 +1,5 @@
+!:
+lda {c2}-1,y
+sta {c1}-1,y
+dey
+bne !-

src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pptc2_memcpy_vbuxx.asm

@@ -0,0 +1,5 @@
+!:
+lda {c2}-1,x
+sta {c1}-1,x
+dex
+bne !-

src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pptc2_memcpy_vbuyy.asm

@@ -0,0 +1,5 @@
+!:
+lda {c2}-1,y
+sta {c1}-1,y
+dey
+bne !-

src/main/fragment/mos6502-common/_deref_pbuc1=_memset_vbuxx.asm

@@ -0,0 +1,5 @@
+lda #0
+!:
+dex
+sta {c1},x
+bne !-

src/main/fragment/mos6502-common/_deref_pbuc1=_memset_vbuyy.asm

@@ -0,0 +1,5 @@
+lda #0
+!:
+dey
+sta {c1},y
+bne !-

src/main/fragment/mos6502-common/_deref_pduc1=vdum1.asm

@@ -1,8 +1,8 @@
-lda {z1}
+lda {m1}
 sta {c1}
-lda {z1}+1
+lda {m1}+1
 sta {c1}+1
-lda {z1}+2
+lda {m1}+2
 sta {c1}+2
-lda {z1}+3
+lda {m1}+3
 sta {c1}+3

src/main/fragment/mos6502-common/_deref_pptc1=pbum1.asm

@@ -0,0 +1,4 @@
+lda {m1}
+sta {c1}
+lda {m1}+1
+sta {c1}+1

src/main/fragment/mos6502-common/_deref_pptc1=pbuz1.asm

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

src/main/fragment/mos6502-common/_deref_pptc1=pptc2_derefidx_vbuxx.asm

@@ -0,0 +1,4 @@
+lda {c2},x
+sta {c1}
+lda {c2}+1,x
+sta {c1}+1

src/main/fragment/mos6502-common/_deref_pptc1=pptc2_derefidx_vbuyy.asm

@@ -0,0 +1,4 @@
+lda {c2},y
+sta {c1}
+lda {c2}+1,y
+sta {c1}+1

src/main/fragment/mos6502-common/_deref_pptz1=_ptr_vwum2.asm

@@ -1,6 +1,6 @@
 ldy #0
-lda {z2}
+lda {m2}
 sta ({z1}),y
 iny
-lda {z2}+1
+lda {m2}+1
 sta ({z1}),y

src/main/fragment/mos6502-common/_deref_pptz1=pbum2.asm

@@ -1,6 +1,6 @@
 ldy #0
-lda {z2}
+lda {m2}
 sta ({z1}),y
 iny
-lda {z2}+1
+lda {m2}+1
 sta ({z1}),y

src/main/fragment/mos6502-common/_deref_pptz1=pbuz2.asm

@@ -1,6 +0,0 @@
-ldy #0
-lda {z2}
-sta ({z1}),y
-iny
-lda {z2}+1
-sta ({z1}),y

src/main/fragment/mos6502-common/_deref_pptz1=pssm2.asm

@@ -1,6 +1,6 @@
 ldy #0
-lda {z2}
+lda {m2}
 sta ({z1}),y
 iny
-lda {z2}+1
+lda {m2}+1
 sta ({z1}),y

src/main/fragment/mos6502-common/_deref_pptz1=pwum2.asm

@@ -0,0 +1,6 @@
+ldy #0
+lda {m2}
+sta ({z1}),y
+iny
+lda {m2}+1
+sta ({z1}),y

src/main/fragment/mos6502-common/_deref_pptz1=pwuz2.asm

@@ -1,6 +0,0 @@
-ldy #0
-lda {z2}
-sta ({z1}),y
-iny
-lda {z2}+1
-sta ({z1}),y

src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuxx.asm

@@ -0,0 +1,5 @@
+!:
+lda {c2}-1,x
+sta {c1}-1,x
+dex
+bne !-

src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuyy.asm

@@ -0,0 +1,5 @@
+!:
+lda {c2}-1,y
+sta {c1}-1,y
+dey
+bne !-

src/main/fragment/mos6502-common/_deref_pssc1=_memset_vbuxx.asm

@@ -0,0 +1,5 @@
+lda #0
+!:
+dex
+sta {c1},x
+bne !-

src/main/fragment/mos6502-common/_deref_pssc1=_memset_vbuyy.asm

@@ -0,0 +1,5 @@
+lda #0
+!:
+dey
+sta {c1},y
+bne !-

src/main/fragment/mos6502-common/_deref_pssc1=pssc2_derefidx_vbuxx_memcpy_vbuc3.asm

@@ -0,0 +1,8 @@
+ldy #0
+!:
+lda {c2},x
+sta {c1},y
+inx
+iny
+cpy #{c3}
+bne !-

src/main/fragment/mos6502-common/_deref_pssc1=pssc2_derefidx_vbuyy_memcpy_vbuc3.asm

@@ -0,0 +1,8 @@
+ldx #0
+!:
+lda {c2},y
+sta {c1},x
+iny
+inx
+cpx #{c3}
+bne !-

src/main/fragment/mos6502-common/_deref_pssz1=_deref_pssz2_memcpy_vbuc1.asm

@@ -0,0 +1,7 @@
+ldy #00
+!:
+lda ({z2}),y
+sta ({z1}),y
+iny
+cpy #{c1}
+bne !-

src/main/fragment/mos6502-common/_deref_pssz1=_deref_pssz2_memcpy_vbuxx.asm

@@ -0,0 +1,7 @@
+ldy #0
+!:
+lda ({z2}),y
+sta ({z1}),y
+iny
+dex
+bne !-

src/main/fragment/mos6502-common/_deref_pwsc1=pwsc2_derefidx_vbuxx.asm

@@ -0,0 +1,4 @@
+lda {c2},x
+sta {c1}
+lda {c2}+1,x
+sta {c1}+1

src/main/fragment/mos6502-common/_deref_pwsc1=pwsc2_derefidx_vbuyy.asm

@@ -0,0 +1,4 @@
+lda {c2},y
+sta {c1}
+lda {c2}+1,y
+sta {c1}+1

src/main/fragment/mos6502-common/_deref_pwsc1=vwsm1.asm

@@ -0,0 +1,4 @@
+lda {m1}
+sta {c1}
+lda {m1}+1
+sta {c1}+1

src/main/fragment/mos6502-common/_deref_pwsc1=vwsz1.asm

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

src/main/fragment/mos6502-common/_deref_pwsz1=vwsm2.asm

@@ -0,0 +1,6 @@
+ldy #0
+lda {m2}
+sta ({z1}),y
+iny
+lda {m2}+1
+sta ({z1}),y

src/main/fragment/mos6502-common/_deref_pwuc1=vwum1.asm

@@ -0,0 +1,4 @@
+lda {m1}
+sta {c1}
+lda {m1}+1
+sta {c1}+1

src/main/fragment/mos6502-common/_deref_pwuc1=vwuz1.asm

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

src/main/fragment/mos6502-common/_deref_pwuz1=vwum2.asm

@@ -0,0 +1,6 @@
+ldy #0
+lda {m2}
+sta ({z1}),y
+iny
+lda {m2}+1
+sta ({z1}),y

src/main/fragment/mos6502-common/_deref_pwuz1_le_vwum2_then_la1.asm

@@ -1,10 +1,10 @@
 ldy #1
 lda ({z1}),y
-cmp {z2}+1
+cmp {m2}+1
 bne !+
 dey
 lda ({z1}),y
-cmp {z2}
+cmp {m2}
 beq {la1}
 !:
 bcc {la1}

src/main/fragment/mos6502-common/_stackidxsword_vbuc1=vwsm1.asm

@@ -1,5 +1,5 @@
 tsx
-lda {z1}
+lda {m1}
 sta STACK_BASE+{c1},x
-lda {z1}+1
+lda {m1}+1
 sta STACK_BASE+{c1}+1,x

src/main/fragment/mos6502-common/_stackidxword_vbuc1=vwum1.asm

@@ -1,5 +1,5 @@
 tsx
-lda {z1}
+lda {m1}
 sta STACK_BASE+{c1},x
-lda {z1}+1
+lda {m1}+1
 sta STACK_BASE+{c1}+1,x

src/main/fragment/mos6502-common/_stackpushword_=vwum1.asm

@@ -0,0 +1,4 @@
+lda {m1}+1
+pha
+lda {m1}
+pha

src/main/fragment/mos6502-common/_stackpushword_=vwuz1.asm

@@ -1,4 +0,0 @@
-lda {z1}+1
-pha
-lda {z1}
-pha

src/main/fragment/mos6502-common/pbsm1=_ptr_pbum1.asm

@@ -0,0 +1 @@
+// No operation needed

src/main/fragment/mos6502-common/pbsm1=_ptr_pbum2.asm

@@ -0,0 +1,4 @@
+lda {m2}
+sta {m1}
+lda {m2}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbsm1=pbsc1.asm

@@ -1,4 +1,4 @@
 lda #<{c1}
-sta {z1}
+sta {m1}
 lda #>{c1}
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbsm1=pbsm2.asm

@@ -0,0 +1,4 @@
+lda {m2}
+sta {m1}
+lda {m2}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbsz1=_ptr_pbuz1.asm

@@ -1 +0,0 @@
-// No operation needed

src/main/fragment/mos6502-common/pbsz1=_ptr_pbuz2.asm

@@ -1,4 +0,0 @@
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1

src/main/fragment/mos6502-common/pbsz1=pbsz2.asm

@@ -1,4 +0,0 @@
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1

src/main/fragment/mos6502-common/pbum1=_addr__deref_pbuc1.asm

@@ -1,4 +1,4 @@
 lda #<{c1}
-sta {z1}
+sta {m1}
 lda #>{c1}
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=_dec_pbum2.asm

@@ -0,0 +1,7 @@
+lda {m2}
+sec
+sbc #1
+sta {m1}
+lda {m2}+1
+sbc #0
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=_deref_pptc1.asm

@@ -1,4 +1,4 @@
 lda {c1}
-sta {z1}
+sta {m1}
 lda {c1}+1
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=_deref_pptc1_plus_vwuc2.asm

@@ -0,0 +1,7 @@
+clc
+lda {c1}
+adc #<{c2}
+sta {m1}
+lda {c1}+1
+adc #>{c2}
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=_deref_pptz2.asm

@@ -1,6 +1,6 @@
 ldy #0
 lda ({z2}),y
-sta {z1}
+sta {m1}
 iny
 lda ({z2}),y
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=_inc_pbum1.asm

@@ -0,0 +1,4 @@
+inc {m1}
+bne !+
+inc {m1}+1
+!:

src/main/fragment/mos6502-common/pbum1=_inc_pbum2.asm

@@ -0,0 +1,7 @@
+lda {m2}
+clc
+adc #1
+sta {m1}
+lda {m2}+1
+adc #0
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=_ptr_pbsm1.asm

@@ -0,0 +1 @@
+// No operation needed

src/main/fragment/mos6502-common/pbum1=_ptr_pbsm2.asm

@@ -0,0 +1,4 @@
+lda {m2}
+sta {m1}
+lda {m2}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=_ptr_vwum2.asm

@@ -0,0 +1,4 @@
+lda {m2}
+sta {m1}
+lda {m2}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pbuaa.asm

@@ -0,0 +1,3 @@
+sta {m1}
+lda #0
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pbuc1_plus_vwsm1.asm

@@ -0,0 +1,7 @@
+lda #<{c1}
+clc
+adc {m1}
+sta {m1}
+lda #>{c1}
+adc {m1}+1
+sta {m1}+1 

src/main/fragment/mos6502-common/pbum1=pbuc1_plus_vwsm2.asm

@@ -0,0 +1,7 @@
+lda #<{c1}
+clc
+adc {m2}
+sta {m1}
+lda #>{c1}
+adc {m2}+1
+sta {m1}+1 

src/main/fragment/mos6502-common/pbum1=pbum1_plus_vbuaa.asm

@@ -3,4 +3,4 @@ adc {m1}
 sta {m1}
 bcc !+
 inc {m1}+1
-!:
+!:

src/main/fragment/mos6502-common/pbum1=pbum1_plus_vwsm2.asm

@@ -0,0 +1,7 @@
+lda {m1}
+clc
+adc {m2}
+sta {m1}
+lda {m1}+1
+adc {m2}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pbum2.asm

@@ -0,0 +1,4 @@
+lda {m2}
+sta {m1}
+lda {m2}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pbum2_plus_vwsm1.asm

@@ -0,0 +1,7 @@
+lda {m2}
+clc
+adc {m1}
+sta {m1}
+lda {m2}+1
+adc {m1}+1
+sta {m1}+1 

src/main/fragment/mos6502-common/pbum1=pbum2_plus_vwsm3.asm

@@ -0,0 +1,7 @@
+lda {m2}
+clc
+adc {m3}
+sta {m1}
+lda {m2}+1
+adc {m3}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pptc1_derefidx_vbuxx.asm

@@ -1,4 +1,4 @@
 lda {c1},x
-sta {z1}
+sta {m1}
 lda {c1}+1,x
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pptc1_derefidx_vbuxx_plus_vbuc2.asm

@@ -1,7 +1,7 @@
 lda {c1},x
 clc
 adc #{c2}
-sta {z1}
+sta {m1}
 lda {c1}+1,x
 adc #0
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pptc1_derefidx_vbuyy.asm

@@ -1,4 +1,4 @@
 lda {c1},y
-sta {z1}
+sta {m1}
 lda {c1}+1,y
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pptc1_derefidx_vbuyy_plus_vbuc2.asm

@@ -1,7 +1,7 @@
 lda {c1},y
 clc
 adc #{c2}
-sta {z1}
+sta {m1}
 lda {c1}+1,y
 adc #0
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1=pptz2_derefidx_vbuyy.asm

@@ -1,5 +1,5 @@
 lda ({z2}),y
-sta {z1}
+sta {m1}
 iny
 lda ({z2}),y
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pbum1_derefidx_vbuc1=vbuaa.asm

@@ -0,0 +1,6 @@
+ldy {m1}
+sty $fe
+ldy {m1}+1
+sty $ff
+ldy #{c1}
+sta ($fe),y

src/main/fragment/mos6502-common/pbum1_derefidx_vbuyy=vbuaa.asm

@@ -0,0 +1,7 @@
+sty $fd
+ldy {m1}
+sty $fe
+ldy {m1}+1
+sty $ff
+ldy $fd
+sta ($fe),y

src/main/fragment/mos6502-common/pbuz1=_dec_pbuz2.asm

@@ -1,7 +0,0 @@
-lda {z2}
-sec
-sbc #1
-sta {z1}
-lda {z2}+1
-sbc #0
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1=_inc_pbuz1.asm

@@ -1,4 +0,0 @@
-inc {z1}
-bne !+
-inc {z1}+1
-!:

src/main/fragment/mos6502-common/pbuz1=_inc_pbuz2.asm

@@ -1,7 +0,0 @@
-lda {z2}
-clc
-adc #1
-sta {z1}
-lda {z2}+1
-adc #0
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1=_ptr_pbsz1.asm

@@ -1 +0,0 @@
-// No operation needed

src/main/fragment/mos6502-common/pbuz1=_ptr_pbsz2.asm

@@ -1,4 +0,0 @@
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1=_ptr_vwuz2.asm

@@ -1,4 +0,0 @@
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1=pbuaa.asm

@@ -1,3 +0,0 @@
-sta {z1}
-lda #0
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1=pbuc1_plus_vwsz1.asm

@@ -1,7 +0,0 @@
-lda #<{c1}
-clc
-adc {z1}
-sta {z1}
-lda #>{c1}
-adc {z1}+1
-sta {z1}+1 

src/main/fragment/mos6502-common/pbuz1=pbuc1_plus_vwsz2.asm

@@ -1,7 +0,0 @@
-lda #<{c1}
-clc
-adc {z2}
-sta {z1}
-lda #>{c1}
-adc {z2}+1
-sta {z1}+1 

src/main/fragment/mos6502-common/pbuz1=pbuz1_plus_2.asm

@@ -1,7 +0,0 @@
-lda {z1}
-clc
-adc #2
-sta {z1}
-bcc !+
-inc {z1}+1
-!:

src/main/fragment/mos6502-common/pbuz1=pbuz1_plus_vbuaa.asm

@@ -1,6 +0,0 @@
-clc
-adc {z1}
-sta {z1}
-bcc !+
-inc {z1}+1
-!:

src/main/fragment/mos6502-common/pbuz1=pbuz1_plus_vwsz2.asm

@@ -1,7 +0,0 @@
-lda {z1}
-clc
-adc {z2}
-sta {z1}
-lda {z1}+1
-adc {z2}+1
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1=pbuz2.asm

@@ -1,4 +0,0 @@
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1=pbuz2_plus_2.asm

@@ -1,7 +0,0 @@
-lda {z2}
-clc
-adc #2
-sta {z1}
-lda {z2}+1
-adc #0
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1=pbuz2_plus_vwsz1.asm

@@ -1,7 +0,0 @@
-lda {z2}
-clc
-adc {z1}
-sta {z1}
-lda {z2}+1
-adc {z1}+1
-sta {z1}+1 

src/main/fragment/mos6502-common/pbuz1=pbuz2_plus_vwsz3.asm

@@ -1,7 +0,0 @@
-lda {z2}
-clc
-adc {z3}
-sta {z1}
-lda {z2}+1
-adc {z3}+1
-sta {z1}+1

src/main/fragment/mos6502-common/pbuz1_derefidx_vbum2=vbuaa.asm

@@ -1,2 +1,2 @@
-ldy {z2}
+ldy {m2}
 sta ({z1}),y

src/main/fragment/mos6502-common/pbuz1_derefidx_vbuxx=vbum2.asm

@@ -1,4 +1,4 @@
 txa
 tay
-lda {z2}
+lda {m2}
 sta ({z1}),y

src/main/fragment/mos6502-common/pbuz1_derefidx_vbuyy=pbuz2_derefidx_vbuyy.asm

@@ -0,0 +1,2 @@
+lda ({z2}),y
+sta ({z1}),y

src/main/fragment/mos6502-common/pduc1_derefidx_vbum1=pduc1_derefidx_vbum1_plus_pduc2_derefidx_vbum1.asm

@@ -1,4 +1,4 @@
-ldy {z1}
+ldy {m1}
 clc
 lda {c1},y
 adc {c2},y

src/main/fragment/mos6502-common/pduc1_derefidx_vbum1=pduc2_derefidx_vbum1.asm

@@ -1,4 +1,4 @@
-ldy {z1}
+ldy {m1}
 lda {c2},y
 sta {c1},y
 lda {c2}+1,y

src/main/fragment/mos6502-common/pdum1=_deref_pptc1.asm

@@ -1,4 +1,4 @@
 lda {c1}
-sta {z1}
+sta {m1}
 lda {c1}+1
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pduz1_derefidx_vbuyy=vdum2.asm

@@ -1,11 +1,11 @@
-lda {z2}
+lda {m2}
 sta ({z1}),y
 iny
-lda {z2}+1
+lda {m2}+1
 sta ({z1}),y
 iny
-lda {z2}+2
+lda {m2}+2
 sta ({z1}),y
 iny
-lda {z2}+3
+lda {m2}+3
 sta ({z1}),y

src/main/fragment/mos6502-common/pprm1=_deref_pptc1.asm

@@ -1,4 +1,4 @@
 lda {c1}
-sta {z1}
+sta {m1}
 lda {c1}+1
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pprm1=pprc1.asm

@@ -1,4 +1,4 @@
 lda #<{c1}
-sta {z1}
+sta {m1}
 lda #>{c1}
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pprm1=pprm2.asm

@@ -0,0 +1,4 @@
+lda {m2}
+sta {m1}
+lda {m2}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pprm1=pptc1_derefidx_vbuxx.asm

@@ -1,4 +1,4 @@
 lda {c1},x
-sta {z1}
+sta {m1}
 lda {c1}+1,x
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pprm1=pptc1_derefidx_vbuyy.asm

@@ -1,4 +1,4 @@
 lda {c1},y
-sta {z1}
+sta {m1}
 lda {c1}+1,y
-sta {z1}+1
+sta {m1}+1

src/main/fragment/mos6502-common/pprz1=pprz2.asm

@@ -1,4 +0,0 @@
-lda {z2}
-sta {z1}
-lda {z2}+1
-sta {z1}+1