split out 6502 codegen module from various compilertargets module.

.idea/kotlinc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Kotlin2JvmCompilerArguments">
-    <option name="jvmTarget" value="11" />
-  </component>
-</project>

.idea/modules.xml

@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/codeGeneration/codeGeneration.iml" filepath="$PROJECT_DIR$/codeGeneration/codeGeneration.iml" />
+      <module fileurl="file://$PROJECT_DIR$/codeGenCpu6502/codeGenCpu6502.iml" filepath="$PROJECT_DIR$/codeGenCpu6502/codeGenCpu6502.iml" />
+      <module fileurl="file://$PROJECT_DIR$/codeGenTargets/codeGenTargets.iml" filepath="$PROJECT_DIR$/codeGenTargets/codeGenTargets.iml" />
       <module fileurl="file://$PROJECT_DIR$/codeOptimizers/codeOptimizers.iml" filepath="$PROJECT_DIR$/codeOptimizers/codeOptimizers.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/compiler.iml" filepath="$PROJECT_DIR$/compiler/compiler.iml" />
       <module fileurl="file://$PROJECT_DIR$/compilerAst/compilerAst.iml" filepath="$PROJECT_DIR$/compilerAst/compilerAst.iml" />

codeGenCpu6502/codeGenCpu6502.iml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="module" module-name="compilerAst" />
+    <orderEntry type="module" module-name="compilerInterfaces" />
+    <orderEntry type="library" name="michael.bull.kotlin.result.jvm" level="project" />
+  </component>
+</module>

codeGenCpu6502/src/prog8/codegen/cpu6502/AsmGen.kt

@@ -1,4 +1,4 @@
-package prog8.codegen.target.cpu6502.codegen
+package prog8.codegen.cpu6502
 
 import com.github.michaelbull.result.fold
 import com.github.michaelbull.result.onSuccess
@@ -7,17 +7,7 @@ import prog8.ast.antlr.escape
 import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
-import prog8.codegen.target.AssemblyError
-import prog8.codegen.target.C64Target
-import prog8.codegen.target.Cx16Target
-import prog8.codegen.target.cbm.AssemblyProgram
-import prog8.codegen.target.cbm.loadAsmIncludeFile
-import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignSource
-import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignTarget
-import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignment
-import prog8.codegen.target.cpu6502.codegen.assignment.AssignmentAsmGen
-import prog8.codegen.target.cpu6502.codegen.assignment.SourceStorageKind
-import prog8.codegen.target.cpu6502.codegen.assignment.TargetStorageKind
+import prog8.codegen.cpu6502.assignment.*
 import prog8.compilerinterface.*
 import prog8.parser.SourceCode
 import java.nio.file.Path
@@ -158,7 +148,7 @@ class AsmGen(private val program: Program,
     }
 
     internal fun isTargetCpu(cpu: CpuType) = compTarget.machine.cpu == cpu
-    internal fun haveFPWR() = compTarget is Cx16Target
+    internal fun haveFPWRcall() = compTarget.name=="cx16"
 
     internal fun asmsubArgsEvalOrder(sub: Subroutine) =
         compTarget.asmsubArgsEvalOrder(sub)
@@ -232,12 +222,12 @@ class AsmGen(private val program: Program,
 
         // make sure that on the cx16 and c64, basic rom is banked in again when we exit the program
         when(compTarget.name) {
-            Cx16Target.name -> {
+            "cx16" -> {
                 if(options.floats)
                     out("  lda  #4 |  sta  $01")    // to use floats, make sure Basic rom is banked in
                 out("  jsr  main.start |  lda  #4 |  sta  $01 |  rts")
             }
-            C64Target.name -> out("  jsr  main.start |  lda  #31 |  sta  $01 |  rts")
+            "c64" -> out("  jsr  main.start |  lda  #31 |  sta  $01 |  rts")
             else -> jmp("main.start")
         }
     }

codeGenCpu6502/src/prog8/codegen/cpu6502/AsmOptimizer.kt

@@ -1,4 +1,4 @@
-package prog8.codegen.target.cpu6502.codegen
+package prog8.codegen.cpu6502
 
 import prog8.ast.Program
 import prog8.ast.base.VarDeclType

codeGenCpu6502/src/prog8/codegen/cpu6502/AssemblyProgram.kt

@@ -1,12 +1,12 @@
-package prog8.codegen.target.cbm
+package prog8.codegen.cpu6502
 
 import com.github.michaelbull.result.Ok
 import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.mapError
-import prog8.codegen.target.cpu6502.codegen.generatedLabelPrefix
 import prog8.compilerinterface.CompilationOptions
 import prog8.compilerinterface.IAssemblyProgram
 import prog8.compilerinterface.OutputType
+import prog8.compilerinterface.viceMonListName
 import prog8.parser.SourceCode
 import java.io.File
 import java.nio.file.Path
@@ -14,8 +14,6 @@ import kotlin.io.path.Path
 import kotlin.io.path.isRegularFile
 
 
-internal fun viceMonListName(baseFilename: String) = "$baseFilename.vice-mon-list"
-
 class AssemblyProgram(
         override val valid: Boolean,
         override val name: String,

codeGenCpu6502/src/prog8/codegen/cpu6502/BuiltinFunctionsAsmGen.kt

@@ -1,4 +1,4 @@
-package prog8.codegen.target.cpu6502.codegen
+package prog8.codegen.cpu6502
 
 import prog8.ast.IFunctionCall
 import prog8.ast.Node
@@ -10,9 +10,13 @@ import prog8.ast.statements.DirectMemoryWrite
 import prog8.ast.statements.FunctionCallStatement
 import prog8.ast.statements.Subroutine
 import prog8.ast.toHex
-import prog8.codegen.target.AssemblyError
-import prog8.codegen.target.Cx16Target
-import prog8.codegen.target.cpu6502.codegen.assignment.*
+import prog8.codegen.cpu6502.assignment.*
+import prog8.codegen.cpu6502.assignment.AsmAssignSource
+import prog8.codegen.cpu6502.assignment.AsmAssignTarget
+import prog8.codegen.cpu6502.assignment.AsmAssignment
+import prog8.codegen.cpu6502.assignment.AssignmentAsmGen
+import prog8.codegen.cpu6502.assignment.SourceStorageKind
+import prog8.compilerinterface.AssemblyError
 import prog8.compilerinterface.BuiltinFunctions
 import prog8.compilerinterface.CpuType
 import prog8.compilerinterface.FSignature
@@ -276,7 +280,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
     }
 
     private fun funcCallFar(fcall: IFunctionCall) {
-        if(asmgen.options.compTarget !is Cx16Target)
+        if(asmgen.options.compTarget.name != "cx16")
             throw AssemblyError("callfar only works on cx16 target at this time")
 
         val bank = fcall.args[0].constValue(program)?.number?.toInt()
@@ -321,7 +325,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
     }
 
     private fun funcCallRom(fcall: IFunctionCall) {
-        if(asmgen.options.compTarget !is Cx16Target)
+        if(asmgen.options.compTarget.name != "cx16")
             throw AssemblyError("callrom only works on cx16 target at this time")
 
         val bank = fcall.args[0].constValue(program)?.number?.toInt()

codeGenCpu6502/src/prog8/codegen/cpu6502/ExpressionsAsmGen.kt

@@ -1,4 +1,4 @@
-package prog8.codegen.target.cpu6502.codegen
+package prog8.codegen.cpu6502
 
 import prog8.ast.Program
 import prog8.ast.base.*
@@ -6,7 +6,7 @@ import prog8.ast.expressions.*
 import prog8.ast.statements.BuiltinFunctionPlaceholder
 import prog8.ast.statements.Subroutine
 import prog8.ast.toHex
-import prog8.codegen.target.AssemblyError
+import prog8.compilerinterface.AssemblyError
 import prog8.compilerinterface.BuiltinFunctions
 import prog8.compilerinterface.CpuType
 import kotlin.math.absoluteValue

codeGenCpu6502/src/prog8/codegen/cpu6502/ForLoopsAsmGen.kt

@@ -1,4 +1,4 @@
-package prog8.codegen.target.cpu6502.codegen
+package prog8.codegen.cpu6502
 
 import com.github.michaelbull.result.fold
 import prog8.ast.Program
@@ -9,7 +9,7 @@ import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.RangeExpression
 import prog8.ast.statements.ForLoop
 import prog8.ast.toHex
-import prog8.codegen.target.AssemblyError
+import prog8.compilerinterface.AssemblyError
 import kotlin.math.absoluteValue
 
 internal class ForLoopsAsmGen(private val program: Program, private val asmgen: AsmGen) {

codeGenCpu6502/src/prog8/codegen/cpu6502/FunctionCallAsmGen.kt

@@ -1,4 +1,4 @@
-package prog8.codegen.target.cpu6502.codegen
+package prog8.codegen.cpu6502
 
 import prog8.ast.IFunctionCall
 import prog8.ast.Node
@@ -9,11 +9,11 @@ import prog8.ast.expressions.Expression
 import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.NumericLiteralValue
 import prog8.ast.statements.*
-import prog8.codegen.target.AssemblyError
-import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignSource
-import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignTarget
-import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignment
-import prog8.codegen.target.cpu6502.codegen.assignment.TargetStorageKind
+import prog8.codegen.cpu6502.assignment.AsmAssignSource
+import prog8.codegen.cpu6502.assignment.AsmAssignTarget
+import prog8.codegen.cpu6502.assignment.AsmAssignment
+import prog8.codegen.cpu6502.assignment.TargetStorageKind
+import prog8.compilerinterface.AssemblyError
 import prog8.compilerinterface.CpuType
 
 

codeGenCpu6502/src/prog8/codegen/cpu6502/PostIncrDecrAsmGen.kt

@@ -1,4 +1,4 @@
-package prog8.codegen.target.cpu6502.codegen
+package prog8.codegen.cpu6502
 
 import prog8.ast.Program
 import prog8.ast.base.*
@@ -6,7 +6,7 @@ import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.NumericLiteralValue
 import prog8.ast.statements.PostIncrDecr
 import prog8.ast.toHex
-import prog8.codegen.target.AssemblyError
+import prog8.compilerinterface.AssemblyError
 
 
 internal class PostIncrDecrAsmGen(private val program: Program, private val asmgen: AsmGen) {

codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AsmAssignment.kt

@@ -1,12 +1,12 @@
-package prog8.codegen.target.cpu6502.codegen.assignment
+package prog8.codegen.cpu6502.assignment
 
 import prog8.ast.Program
 import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
+import prog8.codegen.cpu6502.AsmGen
+import prog8.compilerinterface.AssemblyError
 import prog8.compilerinterface.IMemSizer
-import prog8.codegen.target.AssemblyError
-import prog8.codegen.target.cpu6502.codegen.AsmGen
 
 
 internal enum class TargetStorageKind {

codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AssignmentAsmGen.kt

@@ -1,12 +1,12 @@
-package prog8.codegen.target.cpu6502.codegen.assignment
+package prog8.codegen.cpu6502.assignment
 
 import prog8.ast.Program
 import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.ast.toHex
-import prog8.codegen.target.AssemblyError
-import prog8.codegen.target.cpu6502.codegen.AsmGen
+import prog8.codegen.cpu6502.AsmGen
+import prog8.compilerinterface.AssemblyError
 import prog8.compilerinterface.BuiltinFunctions
 import prog8.compilerinterface.CpuType
 import prog8.compilerinterface.builtinFunctionReturnType

codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AugmentableAssignmentAsmGen.kt

@@ -1,12 +1,12 @@
-package prog8.codegen.target.cpu6502.codegen.assignment
+package prog8.codegen.cpu6502.assignment
 
 import prog8.ast.Program
 import prog8.ast.base.*
 import prog8.ast.expressions.*
 import prog8.ast.statements.Subroutine
 import prog8.ast.toHex
-import prog8.codegen.target.AssemblyError
-import prog8.codegen.target.cpu6502.codegen.AsmGen
+import prog8.codegen.cpu6502.AsmGen
+import prog8.compilerinterface.AssemblyError
 import prog8.compilerinterface.CpuType
 
 
@@ -1628,7 +1628,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
         asmgen.saveRegisterLocal(CpuRegister.X, scope)
         when (operator) {
             "**" -> {
-                if(asmgen.haveFPWR()) {
+                if(asmgen.haveFPWRcall()) {
                     asmgen.out("""
                         lda  #<$name
                         ldy  #>$name
@@ -1705,7 +1705,7 @@ internal class AugmentableAssignmentAsmGen(private val program: Program,
         asmgen.saveRegisterLocal(CpuRegister.X, scope)
         when (operator) {
             "**" -> {
-                if(asmgen.haveFPWR()) {
+                if(asmgen.haveFPWRcall()) {
                     asmgen.out("""
                         lda  #<$name
                         ldy  #>$name

codeGenTargets/build.gradle

@@ -0,0 +1,46 @@
+
+plugins {
+    id 'java'
+    id 'application'
+    id "org.jetbrains.kotlin.jvm"
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(javaVersion)
+    }
+}
+
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+dependencies {
+    implementation project(':compilerInterfaces')
+    implementation project(':compilerAst')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    // implementation "org.jetbrains.kotlin:kotlin-reflect"
+    implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.12"
+
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ["${project.projectDir}/src"]
+        }
+        resources {
+            srcDirs = ["${project.projectDir}/res"]
+        }
+    }
+}
+
+// note: there are no unit tests in this module!

codeGenTargets/src/prog8/codegen/target/C128Target.kt

@@ -7,9 +7,9 @@ import prog8.ast.base.WordDatatypes
 import prog8.ast.expressions.Expression
 import prog8.ast.statements.RegisterOrStatusflag
 import prog8.ast.statements.Subroutine
+import prog8.codegen.target.cbm.asmsub6502ArgsEvalOrder
+import prog8.codegen.target.cbm.asmsub6502ArgsHaveRegisterClobberRisk
 import prog8.codegen.target.c128.C128MachineDefinition
-import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsEvalOrder
-import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsHaveRegisterClobberRisk
 import prog8.compilerinterface.ICompilationTarget
 import prog8.compilerinterface.IStringEncoding
 

codeGenTargets/src/prog8/codegen/target/C64Target.kt

@@ -7,9 +7,9 @@ import prog8.ast.base.WordDatatypes
 import prog8.ast.expressions.Expression
 import prog8.ast.statements.RegisterOrStatusflag
 import prog8.ast.statements.Subroutine
+import prog8.codegen.target.cbm.asmsub6502ArgsEvalOrder
+import prog8.codegen.target.cbm.asmsub6502ArgsHaveRegisterClobberRisk
 import prog8.codegen.target.c64.C64MachineDefinition
-import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsEvalOrder
-import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsHaveRegisterClobberRisk
 import prog8.compilerinterface.ICompilationTarget
 import prog8.compilerinterface.IStringEncoding
 

codeGenTargets/src/prog8/codegen/target/Cx16Target.kt

@@ -7,8 +7,8 @@ import prog8.ast.base.WordDatatypes
 import prog8.ast.expressions.Expression
 import prog8.ast.statements.RegisterOrStatusflag
 import prog8.ast.statements.Subroutine
-import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsEvalOrder
-import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsHaveRegisterClobberRisk
+import prog8.codegen.target.cbm.asmsub6502ArgsEvalOrder
+import prog8.codegen.target.cbm.asmsub6502ArgsHaveRegisterClobberRisk
 import prog8.codegen.target.cx16.CX16MachineDefinition
 import prog8.compilerinterface.ICompilationTarget
 import prog8.compilerinterface.IStringEncoding

codeGenTargets/src/prog8/codegen/target/c128/C128MachineDefinition.kt

@@ -1,9 +1,7 @@
 package prog8.codegen.target.c128
 
-import prog8.ast.base.DataType
 import prog8.codegen.target.c64.normal6502instructions
 import prog8.codegen.target.cbm.Mflpt5
-import prog8.codegen.target.cbm.viceMonListName
 import prog8.compilerinterface.*
 import java.io.IOException
 import java.nio.file.Path

codeGenTargets/src/prog8/codegen/target/c64/C64MachineDefinition.kt

@@ -1,8 +1,6 @@
 package prog8.codegen.target.c64
 
-import prog8.ast.base.DataType
 import prog8.codegen.target.cbm.Mflpt5
-import prog8.codegen.target.cbm.viceMonListName
 import prog8.compilerinterface.*
 import java.io.IOException
 import java.nio.file.Path

codeGenTargets/src/prog8/codegen/target/cbm/AsmsubHelpers.kt

@@ -1,4 +1,4 @@
-package prog8.codegen.target.cpu6502.codegen
+package prog8.codegen.target.cbm
 
 import prog8.ast.base.Cx16VirtualRegisters
 import prog8.ast.base.RegisterOrPair

codeGenTargets/src/prog8/codegen/target/cx16/CX16MachineDefinition.kt

@@ -1,8 +1,6 @@
 package prog8.codegen.target.cx16
 
-import prog8.ast.base.DataType
 import prog8.codegen.target.cbm.Mflpt5
-import prog8.codegen.target.cbm.viceMonListName
 import prog8.compilerinterface.*
 import java.io.IOException
 import java.nio.file.Path

codeGeneration/src/prog8/codegen/target/AssemblyError.kt

@@ -1,3 +0,0 @@
-package prog8.codegen.target
-
-class AssemblyError(msg: String) : RuntimeException(msg)

compiler/build.gradle

@@ -30,7 +30,8 @@ dependencies {
     implementation project(':compilerInterfaces')
     implementation project(':codeOptimizers')
     implementation project(':compilerAst')
-    implementation project(':codeGeneration')
+    implementation project(':codeGenTargets')
+    implementation project(':codeGenCpu6502')
     implementation 'org.antlr:antlr4-runtime:4.9.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     // implementation "org.jetbrains.kotlin:kotlin-reflect"

compiler/compiler.iml

@@ -16,9 +16,10 @@
     <orderEntry type="library" name="michael.bull.kotlin.result.jvm" level="project" />
     <orderEntry type="module" module-name="codeOptimizers" />
     <orderEntry type="module" module-name="compilerInterfaces" />
-    <orderEntry type="module" module-name="codeGeneration" />
+    <orderEntry type="module" module-name="codeGenTargets" />
     <orderEntry type="library" name="io.kotest.assertions.core.jvm" level="project" />
     <orderEntry type="library" name="io.kotest.runner.junit5.jvm" level="project" />
     <orderEntry type="library" name="antlr.antlr4" level="project" />
+    <orderEntry type="module" module-name="codeGenCpu6502" />
   </component>
 </module>

compiler/src/prog8/compiler/Compiler.kt

@@ -9,11 +9,11 @@ import prog8.ast.base.Position
 import prog8.ast.expressions.Expression
 import prog8.ast.expressions.NumericLiteralValue
 import prog8.ast.statements.Directive
+import prog8.codegen.cpu6502.AsmGen
 import prog8.codegen.target.C128Target
 import prog8.compiler.astprocessing.*
 import prog8.codegen.target.C64Target
 import prog8.codegen.target.Cx16Target
-import prog8.codegen.target.cpu6502.codegen.AsmGen
 import prog8.compilerinterface.*
 import prog8.optimizer.*
 import prog8.parser.ParseError

compiler/src/prog8/compiler/astprocessing/BeforeAsmAstChanger.kt

@@ -10,7 +10,7 @@ import prog8.ast.statements.*
 import prog8.ast.walk.AstWalker
 import prog8.ast.walk.IAstModification
 import prog8.ast.walk.IAstVisitor
-import prog8.codegen.target.AssemblyError
+import prog8.compilerinterface.AssemblyError
 import prog8.compilerinterface.CompilationOptions
 import prog8.compilerinterface.IErrorReporter
 import prog8.compilerinterface.isIOAddress

compiler/test/codegeneration/TestAsmGenSymbols.kt

@@ -9,9 +9,9 @@ import prog8.ast.expressions.AddressOf
 import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.NumericLiteralValue
 import prog8.ast.statements.*
+import prog8.codegen.cpu6502.AsmGen
 import prog8.codegen.target.C64Target
 import prog8.codegen.target.c64.C64Zeropage
-import prog8.codegen.target.cpu6502.codegen.AsmGen
 import prog8.compilerinterface.*
 import prog8.parser.SourceCode
 import prog8tests.helpers.DummyFunctions

compiler/test/helpers/compileXyz.kt

@@ -3,12 +3,12 @@ package prog8tests.helpers
 import io.kotest.assertions.withClue
 import io.kotest.matchers.shouldBe
 import prog8.ast.Program
+import prog8.codegen.cpu6502.AsmGen
 import prog8.compiler.CompilationResult
 import prog8.compiler.CompilerArguments
 import prog8.compiler.compileProgram
 import prog8.codegen.target.C64Target
 import prog8.codegen.target.c64.C64Zeropage
-import prog8.codegen.target.cpu6502.codegen.AsmGen
 import prog8.compilerinterface.*
 import java.nio.file.Path
 import kotlin.io.path.name

compilerInterfaces/src/prog8/compilerinterface/Exceptions.kt

@@ -3,3 +3,5 @@ package prog8.compilerinterface
 class InternalCompilerException(message: String?) : Exception(message)
 
 class AbortCompilation(message: String?) : Exception(message)
+
+class AssemblyError(msg: String) : RuntimeException(msg)

compilerInterfaces/src/prog8/compilerinterface/IAssemblyGenerator.kt

@@ -9,3 +9,5 @@ interface IAssemblyProgram {
     val name: String
     fun assemble(options: CompilationOptions): Int
 }
+
+fun viceMonListName(baseFilename: String) = "$baseFilename.vice-mon-list"

scripts/clean.sh

@@ -2,5 +2,5 @@
 
 rm -f *.jar *.asm *.prg *.vm.txt *.vice-mon-list *.list a.out imgui.ini
 rm -rf build out
-rm -rf compiler/build codeGeneration/build codeOptimizers/build compilerInterfaces/build compilerAst/build dbusCompilerService/build httpCompilerService/build parser/build
+rm -rf compiler/build codeGenTargets/build codeGenCpu6502/build codeOptimizers/build compilerInterfaces/build compilerAst/build dbusCompilerService/build httpCompilerService/build parser/build
 

settings.gradle

@@ -3,7 +3,8 @@ include(
     ':compilerInterfaces',
     ':compilerAst',
     ':codeOptimizers',
-    ':codeGeneration',
+    ':codeGenTargets',
+    ':codeGenCpu6502',
     ':compiler',
     ':dbusCompilerService',
     ':httpCompilerService'