fix a configurable compilation target, add working example

codeCore/src/prog8/code/target/ConfigFileTarget.kt

@@ -68,14 +68,14 @@ class ConfigFileTarget(
                 return emptyList()
             val result = mutableListOf<UIntRange>()
             val ranges = rangesStr.split(",").map { it.trim() }
-            for(rangeStr in ranges) {
-                if ('-' in rangeStr) {
-                    val (fromStr, toStr) = rangeStr.split("-")
+            for(r in ranges) {
+                if ('-' in r) {
+                    val (fromStr, toStr) = r.split("-")
                     val from = parseInt(fromStr.trim())
                     val to = parseInt(toStr.trim())
                     result.add(from..to)
                 } else {
-                    val address = parseInt(rangesStr)
+                    val address = parseInt(r)
                     result.add(address..address)
                 }
             }

codeOptimizers/src/prog8/optimizer/UnusedCodeRemover.kt

@@ -29,14 +29,12 @@ class UnusedCodeRemover(private val program: Program,
             val subroutines = it.statements.filterIsInstance<Subroutine>()
             val push = subroutines.single { it.name == "push" }
             val pushw = subroutines.single { it.name == "pushw" }
-            val pushret = subroutines.single { it.name == "push_returnaddress" }
             val pop = subroutines.single { it.name == "pop" }
             val popw = subroutines.single { it.name == "popw" }
             neverRemoveSubroutines.add(push)
             neverRemoveSubroutines.add(pushw)
             neverRemoveSubroutines.add(pop)
             neverRemoveSubroutines.add(popw)
-            neverRemoveSubroutines.add(pushret)
         }
 
         program.allBlocks.singleOrNull { it.name=="floats" } ?.let {

examples/customtarget/Makefile

@@ -1,9 +1,18 @@
 .PHONY:  all clean
 
-all: main.prg
+all: main-c64.prg main-cx16.prg main-pet.prg
 
 clean:
 	rm -f *.prg *.PRG *.asm *.vice-*
 
-main.prg: main.p8
-	prog8c -target ./target.properties -srcdirs libraries main.p8 -sourcelines
+main-c64.prg: main.p8 tinyc64.properties
+	prog8c -target ./tinyc64.properties main.p8 -sourcelines
+	mv main.prg $@
+
+main-cx16.prg: main.p8 tinycx16.properties
+	prog8c -target ./tinycx16.properties main.p8 -sourcelines
+	mv main.prg $@
+
+main-pet.prg: main.p8 tinypet.properties
+	prog8c -target ./tinypet.properties main.p8 -sourcelines
+	mv main.prg $@

examples/customtarget/libraries/tinyc64/syslib.p8

@@ -0,0 +1,190 @@
+%option no_symbol_prefixing, ignore_unused
+
+; Tiny syslib for minimalistic programs that can run on a C64
+
+sys {
+    extsub $FFD2 = CHROUT(ubyte character @ A)           ; output a character
+
+    ; these push/pop routines are always required by the compiler:
+
+    inline asmsub push(ubyte value @A) {
+        %asm {{
+            pha
+        }}
+    }
+
+    inline asmsub pushw(uword value @AY) {
+        %asm {{
+            pha
+            tya
+            pha
+        }}
+    }
+
+    inline asmsub pop() -> ubyte @A {
+        %asm {{
+            pla
+        }}
+    }
+
+    inline asmsub popw() -> uword @AY {
+        %asm {{
+            pla
+            tay
+            pla
+        }}
+    }
+
+    asmsub reset_system()  {
+        ; Soft-reset the system back to initial power-on Basic prompt.
+        %asm {{
+            sei
+            lda  #14
+            sta  $01        ; bank the kernal in
+            jmp  ($fffc)    ; reset vector
+        }}
+    }
+}
+
+
+p8_sys_startup {
+    %option force_output
+
+    asmsub  init_system() {
+        %asm {{
+            rts
+        }}
+    }
+
+    asmsub  init_system_phase2() {
+        %asm {{
+            rts
+        }}
+    }
+
+    asmsub  cleanup_at_exit() {
+        ; executed when the main subroutine does rts
+        %asm {{
+_exitcodeCarry = *+1
+            lda  #0
+            lsr  a
+_exitcode = *+1
+            lda  #0        ; exit code possibly modified in exit()
+_exitcodeX = *+1
+            ldx  #0
+_exitcodeY = *+1
+            ldy  #0
+            rts
+        }}
+    }
+}
+
+
+cx16 {
+    ; the sixteen virtual 16-bit registers that the CX16 has defined in the zeropage
+    ; they are simulated on the C64 as well but their location in memory is different
+    ; (because there's no room for them in the zeropage in the default configuration)
+    ; Note that when using ZP options that free up more of the zeropage (such as %zeropage kernalsafe)
+    ; there might be enough space to put them there after all, and the compiler will change these addresses!
+    &uword r0  = $cfe0
+    &uword r1  = $cfe2
+    &uword r2  = $cfe4
+    &uword r3  = $cfe6
+    &uword r4  = $cfe8
+    &uword r5  = $cfea
+    &uword r6  = $cfec
+    &uword r7  = $cfee
+    &uword r8  = $cff0
+    &uword r9  = $cff2
+    &uword r10 = $cff4
+    &uword r11 = $cff6
+    &uword r12 = $cff8
+    &uword r13 = $cffa
+    &uword r14 = $cffc
+    &uword r15 = $cffe
+
+    &word r0s  = $cfe0
+    &word r1s  = $cfe2
+    &word r2s  = $cfe4
+    &word r3s  = $cfe6
+    &word r4s  = $cfe8
+    &word r5s  = $cfea
+    &word r6s  = $cfec
+    &word r7s  = $cfee
+    &word r8s  = $cff0
+    &word r9s  = $cff2
+    &word r10s = $cff4
+    &word r11s = $cff6
+    &word r12s = $cff8
+    &word r13s = $cffa
+    &word r14s = $cffc
+    &word r15s = $cffe
+
+    &ubyte r0L  = $cfe0
+    &ubyte r1L  = $cfe2
+    &ubyte r2L  = $cfe4
+    &ubyte r3L  = $cfe6
+    &ubyte r4L  = $cfe8
+    &ubyte r5L  = $cfea
+    &ubyte r6L  = $cfec
+    &ubyte r7L  = $cfee
+    &ubyte r8L  = $cff0
+    &ubyte r9L  = $cff2
+    &ubyte r10L = $cff4
+    &ubyte r11L = $cff6
+    &ubyte r12L = $cff8
+    &ubyte r13L = $cffa
+    &ubyte r14L = $cffc
+    &ubyte r15L = $cffe
+
+    &ubyte r0H  = $cfe1
+    &ubyte r1H  = $cfe3
+    &ubyte r2H  = $cfe5
+    &ubyte r3H  = $cfe7
+    &ubyte r4H  = $cfe9
+    &ubyte r5H  = $cfeb
+    &ubyte r6H  = $cfed
+    &ubyte r7H  = $cfef
+    &ubyte r8H  = $cff1
+    &ubyte r9H  = $cff3
+    &ubyte r10H = $cff5
+    &ubyte r11H = $cff7
+    &ubyte r12H = $cff9
+    &ubyte r13H = $cffb
+    &ubyte r14H = $cffd
+    &ubyte r15H = $cfff
+
+    &byte r0sL  = $cfe0
+    &byte r1sL  = $cfe2
+    &byte r2sL  = $cfe4
+    &byte r3sL  = $cfe6
+    &byte r4sL  = $cfe8
+    &byte r5sL  = $cfea
+    &byte r6sL  = $cfec
+    &byte r7sL  = $cfee
+    &byte r8sL  = $cff0
+    &byte r9sL  = $cff2
+    &byte r10sL = $cff4
+    &byte r11sL = $cff6
+    &byte r12sL = $cff8
+    &byte r13sL = $cffa
+    &byte r14sL = $cffc
+    &byte r15sL = $cffe
+
+    &byte r0sH  = $cfe1
+    &byte r1sH  = $cfe3
+    &byte r2sH  = $cfe5
+    &byte r3sH  = $cfe7
+    &byte r4sH  = $cfe9
+    &byte r5sH  = $cfeb
+    &byte r6sH  = $cfed
+    &byte r7sH  = $cfef
+    &byte r8sH  = $cff1
+    &byte r9sH  = $cff3
+    &byte r10sH = $cff5
+    &byte r11sH = $cff7
+    &byte r12sH = $cff9
+    &byte r13sH = $cffb
+    &byte r14sH = $cffd
+    &byte r15sH = $cfff
+}

examples/customtarget/libraries/syslib.p8 → examples/customtarget/libraries/tinycx16/syslib.p8

@@ -1,9 +1,9 @@
 %option no_symbol_prefixing, ignore_unused
 
+; Tiny syslib for minimalistic programs that can run on a X16
 
 sys {
-    extsub $ff00 = CHAROUT(ubyte character @A)
-
+    extsub $FFD2 = CHROUT(ubyte character @ A)           ; output a character
 
     ; these push/pop routines are always required by the compiler:
 
@@ -16,19 +16,8 @@ sys {
     inline asmsub pushw(uword value @AY) {
         %asm {{
             pha
-            phy
-        }}
-    }
-
-    inline asmsub push_returnaddress(uword address @XY) {
-        %asm {{
-            ; push like JSR would:  address-1,  MSB first then LSB
-            cpx  #0
-            bne  +
-            dey
-+           dex
-            phy
-            phx
+            tya
+            pha
         }}
     }
 
@@ -40,19 +29,25 @@ sys {
 
     inline asmsub popw() -> uword @AY {
         %asm {{
-            ply
+            pla
+            tay
             pla
         }}
     }
 
-    asmsub  reset_system()  {
-        ; Soft-reset the system back to initial power-on status
-        ; TODO
+    asmsub reset_system() {
+        ; Soft-reset the system back to initial power-on Basic prompt.
+        ; We do this via the SMC so that a true reset is performed that also resets the Vera fully.
+        ; (note: this is an asmsub on purpose! don't change into a normal sub)
         %asm {{
             sei
-            jmp  *
+            ldx  #$42
+            ldy  #2
+            lda  #0
+            jmp  $fec9    ; i2c_write_byte
         }}
     }
+
 }
 
 
@@ -192,5 +187,4 @@ cx16 {
     &byte r13sH = $001d
     &byte r14sH = $001f
     &byte r15sH = $0021
-
 }