even better machinetarget independence

compiler/res/prog8lib/c64lib.p8

@@ -231,4 +231,36 @@ romsub $FFF3 = IOBASE() -> uword @ XY                           ; read base addr
 
 ; ---- end of C64 kernal routines ----
 
+asmsub init_system()  {
+    ; Initializes the machine to a sane starting state.
+    ; Called automatically by the loader program logic.
+    ; This means that the BASIC, KERNAL and CHARGEN ROMs are banked in,
+    ; the VIC, SID and CIA chips are reset, screen is cleared, and the default IRQ is set.
+    ; Also a different color scheme is chosen to identify ourselves a little.
+    ; Uppercase charset is activated, and all three registers set to 0, status flags cleared.
+    %asm {{
+        sei
+        cld
+        lda  #%00101111
+        sta  $00
+        lda  #%00100111
+        sta  $01
+        jsr  c64.IOINIT
+        jsr  c64.RESTOR
+        jsr  c64.CINT
+        lda  #6
+        sta  c64.EXTCOL
+        lda  #7
+        sta  c64.COLOR
+        lda  #0
+        sta  c64.BGCOL0
+        tax
+        tay
+        clc
+        clv
+        cli
+        rts
+    }}
+}
+
 }

compiler/res/prog8lib/prog8lib.asm

@@ -6,38 +6,6 @@
 ; indent format: TABS, size=8
 
 
-; TODO move this one to c64lib:
-init_system	.proc
-	; -- initializes the machine to a sane starting state
-	; Called automatically by the loader program logic.
-	; This means that the BASIC, KERNAL and CHARGEN ROMs are banked in,
-	; the VIC, SID and CIA chips are reset, screen is cleared, and the default IRQ is set.
-	; Also a different color scheme is chosen to identify ourselves a little.
-	; Uppercase charset is activated, and all three registers set to 0, status flags cleared.
-		sei
-		cld
-		lda  #%00101111
-		sta  $00
-		lda  #%00100111
-		sta  $01
-		jsr  c64.IOINIT
-		jsr  c64.RESTOR
-		jsr  c64.CINT
-		lda  #6
-		sta  c64.EXTCOL
-		lda  #7
-		sta  c64.COLOR
-		lda  #0
-		sta  c64.BGCOL0
-		tax
-		tay
-		clc
-		clv
-		cli
-		rts
-		.pend
-
-
 read_byte_from_address_on_stack	.proc
 	; -- read the byte from the memory address on the top of the stack, return in A (stack remains unchanged)
 		lda  P8ESTACK_LO+1,x

compiler/src/prog8/compiler/target/IMachineDefinition.kt

@@ -21,6 +21,7 @@ interface IMachineDefinition {
 
     val opcodeNames: Set<String>
     var zeropage: Zeropage
+    val initSystemProcname: String
 
     fun initializeZeropage(compilerOptions: CompilationOptions)
     fun getFloat(num: Number): IMachineFloat

compiler/src/prog8/compiler/target/c64/C64MachineDefinition.kt

@@ -26,6 +26,8 @@ internal object C64MachineDefinition: IMachineDefinition {
     override val ESTACK_HI = 0xcf00        //  $ce00-$ceff inclusive
 
     override lateinit var zeropage: Zeropage
+    override val initSystemProcname = "c64.init_system"
+
     override fun getFloat(num: Number) = Mflpt5.fromNumber(num)
 
     override fun getFloatRomConst(number: Double): String? {

compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt

@@ -12,7 +12,6 @@ import prog8.compiler.target.CompilationTarget
 import prog8.compiler.target.IAssemblyGenerator
 import prog8.compiler.target.IAssemblyProgram
 import prog8.compiler.target.c64.AssemblyProgram
-import prog8.compiler.target.c64.C64MachineDefinition
 import prog8.compiler.target.c64.Petscii
 import prog8.compiler.target.c64.codegen.assignment.AsmAssignSource
 import prog8.compiler.target.c64.codegen.assignment.AsmAssignTarget
@@ -22,7 +21,6 @@ import prog8.compiler.target.c64.codegen.assignment.TargetStorageKind
 import prog8.compiler.target.generatedLabelPrefix
 import prog8.functions.BuiltinFunctions
 import prog8.functions.FSignature
-import java.math.RoundingMode
 import java.nio.file.Path
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -93,6 +91,7 @@ internal class AsmGen(private val program: Program,
 
         // the global prog8 variables needed
         val zp = CompilationTarget.machine.zeropage
+        val initproc = CompilationTarget.machine.initSystemProcname
         out("P8ZP_SCRATCH_B1 = ${zp.SCRATCH_B1}")
         out("P8ZP_SCRATCH_REG = ${zp.SCRATCH_REG}")
         out("P8ZP_SCRATCH_REG_X = ${zp.SCRATCH_REG_X}")
@@ -114,14 +113,16 @@ internal class AsmGen(private val program: Program,
                 out("_prog8_entrypoint\t; assembly code starts here\n")
                 out("  tsx")
                 out("  stx  prog8_lib.orig_stackpointer")
-                out("  jsr  prog8_lib.init_system")
+                if(!initproc.isNullOrEmpty())
+                    out("  jsr  $initproc")
             }
             options.output == OutputType.PRG -> {
                 out("; ---- program without basic sys call ----")
                 out("* = ${program.actualLoadAddress.toHex()}\n")
                 out("  tsx")
                 out("  stx  prog8_lib.orig_stackpointer")
-                out("  jsr  prog8_lib.init_system")
+                if(!initproc.isNullOrEmpty())
+                    out("  jsr  $initproc")
             }
             options.output == OutputType.RAW -> {
                 out("; ---- raw assembler program ----")

compiler/src/prog8/optimizer/CallGraph.kt

@@ -14,8 +14,7 @@ import prog8.compiler.loadAsmIncludeFile
 
 private val alwaysKeepSubroutines = setOf(
         Pair("main", "start"),
-        Pair("irq", "irq"),
-        Pair("prog8_lib", "init_system")
+        Pair("irq", "irq")
 )
 
 private val asmJumpRx = Regex("""[\-+a-zA-Z0-9_ \t]+(jmp|jsr)[ \t]+(\S+).*""", RegexOption.IGNORE_CASE)