Introduces void-pointer synthesis. This enables removal of a lot of pointer fragments. #449

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +0,0 @@
-pla
-sta {m1}
-pla
-sta {m1}+1

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

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

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

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

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

@@ -1,8 +0,0 @@
-ldy #0
-lda ({z1}),y
-pha
-iny
-lda ({z1}),y
-sta {z1}+1
-pla
-sta {z1}

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

@@ -1,7 +0,0 @@
-lda ({z1}),y
-pha
-iny
-lda ({z1}),y
-sta {z1}+1
-pla
-sta {z1}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/fragment/mos6502-common/pptm1=_stackidxptr_vbuc1.asm

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

src/main/fragment/mos6502-common/pptm1=pptc1.asm

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

src/main/fragment/mos6502-common/pptm1=pptm2.asm

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

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

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

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

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

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

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

src/main/fragment/mos6502-common/pptz1_derefidx_vbuyy=_ptr_vbuaa.asm

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

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

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

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

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

src/main/fragment/mos6502-common/pssm1=_addr__deref_pssc1.asm

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

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

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

src/main/fragment/mos6502-common/pssm1=_stackidxptr_vbuc1.asm

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

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

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

src/main/fragment/mos6502-common/pssm1=vwuc1.asm

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

src/main/fragment/mos6502-common/pwsm1=_stackidxptr_vbuc1.asm

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

src/main/fragment/mos6502-common/pwsm1=pwsc1.asm

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

src/main/fragment/mos6502-common/pwsm1=pwsm2.asm

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

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

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

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

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

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

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

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

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

src/main/fragment/mos6502-common/pwum1=_stackidxptr_vbuc1.asm

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

src/main/fragment/mos6502-common/pwum1=_stackpullptr_.asm

@@ -1,4 +0,0 @@
-pla
-sta {m1}
-pla
-sta {m1}+1

src/main/fragment/mos6502-common/pwum1=pbuc1.asm

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

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

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

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

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

src/main/fragment/mos6502-common/pwum1=pwuc1.asm

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

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

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

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

@@ -1,8 +0,0 @@
-ldy #0
-lda ({z1}),y
-pha
-iny
-lda ({z1}),y
-sta {z1}+1
-pla
-sta {z1}

src/main/fragment/mos6502-common/pwuz1=pptz1_derefidx_vbuyy.asm

@@ -1,7 +0,0 @@
-lda ({z1}),y
-pha
-iny
-lda ({z1}),y
-sta {z1}+1
-pla
-sta {z1}

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

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

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

@@ -710,6 +710,10 @@ class AsmFragmentTemplateSynthesisRule {
       // Rewrite (Z1),a to save A to $FF and reload it into YY
       synths.add(new AsmFragmentTemplateSynthesisRule("pb(.)z1_derefidx_vbuaa=(.*)", twoZM1, "sta $ff" , "vb$1aa=$2", "ldy $ff\nsta ({z1}),y", mapZM1));
 
+      // Synthesize typed pointer math using void pointers
+      synths.add(new AsmFragmentTemplateSynthesisRule("(.*)p..([czm][1-9])(.*)", null, null, "$1pvo$2$3", null, null));
+      synths.add(new AsmFragmentTemplateSynthesisRule("(.*)p..([czm][1-9])(.*p.*)", null, null, "$1pvo$2$3", null, null));
+
       // Synthesize some constant pointers as constant words (remove when the above section can be included)
       synths.add(new AsmFragmentTemplateSynthesisRule("(.*)_(lt|gt|le|ge|eq|neq)_p..([czm].)_then_(.*)", null, null, "$1_$2_vwu$3_then_$4", null, null));
       synths.add(new AsmFragmentTemplateSynthesisRule("p..([czm].)_(lt|gt|le|ge|eq|neq)_(.*)", null, null, "vwu$1_$2_$3", null, null));

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

@@ -518,7 +518,6 @@ public class TestPrograms {
       compileAndCompare("millfork-benchmarks/linkedlist-kc.c");
    }
 
-
    @Test
    public void testSqrDelta() throws IOException, URISyntaxException {
       compileAndCompare("sqr-delta.c");

src/test/ref/primes-1000.log

@@ -3147,12 +3147,12 @@ main: {
     rol
     sta.z __12+1
     // [8] (signed word*~) main::$16 ← (const signed word*) primenum + (signed word~) main::$12 -- pwsz1=pwsc1_plus_vwsz2 
-    lda.z __12
+    lda #<primenum
     clc
-    adc #<primenum
+    adc.z __12
     sta.z __16
-    lda.z __12+1
-    adc #>primenum
+    lda #>primenum
+    adc.z __12+1
     sta.z __16+1
     // [9] (signed word) main::p#0 ← *((signed word*~) main::$16) -- vwsz1=_deref_pwsz2 
     ldy #0
@@ -3260,12 +3260,12 @@ main: {
     lda.z testnum+1
     sta.z div16s.dividend+1
     // [23] (signed word*~) main::$17 ← (const signed word*) primenum + (signed word~) main::$13 -- pwsz1=pwsc1_plus_vwsz2 
-    lda.z __13
+    lda #<primenum
     clc
-    adc #<primenum
+    adc.z __13
     sta.z __17
-    lda.z __13+1
-    adc #>primenum
+    lda #>primenum
+    adc.z __13+1
     sta.z __17+1
     // [24] (signed word) div16s::divisor#0 ← *((signed word*~) main::$17) -- vwsz1=_deref_pwsz2 
     ldy #0
@@ -3341,12 +3341,12 @@ main: {
     rol
     sta.z __14+1
     // [33] (signed word*~) main::$18 ← (const signed word*) primenum + (signed word~) main::$14 -- pwsz1=pwsc1_plus_vwsz2 
-    lda.z __14
+    lda #<primenum
     clc
-    adc #<primenum
+    adc.z __14
     sta.z __18
-    lda.z __14+1
-    adc #>primenum
+    lda #>primenum
+    adc.z __14+1
     sta.z __18+1
     // [34] *((signed word*~) main::$18) ← (signed word) testnum#10 -- _deref_pwsz1=vwsz2 
     ldy #0