Added initial support for specifying which CPU to compile to. #303

src/main/fragment/6502X/vbuz1=vbuaa_band_vbuxx.asm

@@ -0,0 +1 @@
+sax {z1}

src/main/fragment/vbuz1=vbuaa_band_vbuxx.asm

@@ -1 +1,3 @@
-sax {z1}
+stx {z1}
+and {z1}
+sta {z1}

src/main/java/dk/camelot64/kickc/Compiler.java

@@ -75,6 +75,15 @@ public class Compiler {
       program.setTargetPlatform(targetPlatform);
    }
 
+   void setTargetCpu(TargetCpu targetCpu) {
+      program.setTargetCpu(targetCpu);
+   }
+
+   TargetCpu getTargetCpu() {
+      return program.getTargetCpu();
+   }
+
+
    public void setLog(CompileLog compileLog) {
       program.setLog(compileLog);
    }
@@ -489,7 +498,7 @@ public class Compiler {
       new Pass4CodeGeneration(program, false, warnFragmentMissing).generate();
       new Pass4AssertNoCpuClobber(program).check();
       getLog().append("\nINITIAL ASM");
-      getLog().append("Target platform is " + program.getTargetPlatform().getName());
+      getLog().append("Target platform is " + program.getTargetPlatform().getName() + " / " +program.getTargetCpu().getName());
       getLog().append(program.getAsm().toString(new AsmProgram.AsmPrintState(true), program));
 
       // Find potential registers for each live range equivalence class - based on clobbering of fragments

src/main/java/dk/camelot64/kickc/KickC.java

@@ -6,6 +6,7 @@ import dk.camelot64.kickc.fragment.AsmFragmentTemplateSynthesizer;
 import dk.camelot64.kickc.fragment.AsmFragmentTemplateUsages;
 import dk.camelot64.kickc.model.CompileError;
 import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.TargetCpu;
 import dk.camelot64.kickc.model.TargetPlatform;
 import kickass.KickAssembler;
 import kickass.nonasm.c64.CharToPetsciiConverter;
@@ -129,6 +130,9 @@ public class KickC implements Callable<Void> {
    @CommandLine.Option(names = {"-t", "-target"}, description = "The target system. Default is C64 with BASIC upstart. ")
    private String target = TargetPlatform.C64BASIC.getName();
 
+   @CommandLine.Option(names = {"-cpu"}, description = "The target CPU. Default is 6502 with illegal opcodes. ")
+   private String cpu = TargetCpu.MOS6502X.getName();
+
    @CommandLine.Option(names = {"-T", "-link"}, description = "Link using a linker script in KickAss segment format.")
    private String linkScript = null;
 
@@ -162,6 +166,21 @@ public class KickC implements Callable<Void> {
          compiler.setTargetPlatform(targetPlatform);
       }
 
+      if(cpu!=null) {
+         TargetCpu targetCpu = TargetCpu.getTargetCpu(cpu);
+         if(targetCpu==null) {
+            System.err.println("Unknown target CPU "+cpu);
+            StringBuffer supported = new StringBuffer();
+            supported.append("The supported target CPUs are: ");
+            for(TargetCpu value : TargetCpu.values()) {
+               supported.append(value.getName()).append(" ");
+            }
+            System.err.println(supported);
+            System.exit(COMPILE_ERROR);
+         }
+         compiler.setTargetCpu(targetCpu);
+      }
+
       if(libDir != null) {
          for(Path libPath : libDir) {
             compiler.addImportPath(libPath.toString());
@@ -172,6 +191,8 @@ public class KickC implements Callable<Void> {
          fragmentDir = new File("fragment/").toPath();
       }
 
+      Path fragmentCpuDir = fragmentDir.resolve(compiler.getTargetCpu().getName());
+
       Path fragmentCacheDir = null;
       if(optimizeFragmentCache) {
          if(outputDir != null) {
@@ -183,7 +204,7 @@ public class KickC implements Callable<Void> {
 
       configVerbosity(compiler);
 
-      AsmFragmentTemplateSynthesizer.initialize(fragmentDir, fragmentCacheDir, compiler.getLog());
+      AsmFragmentTemplateSynthesizer.initialize(fragmentDir, fragmentCpuDir, fragmentCacheDir, compiler.getLog());
 
       if(fragment != null) {
          if(verbose) {

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

@@ -28,8 +28,8 @@ public class AsmFragmentTemplateSynthesizer {
    static AsmFragmentTemplateSynthesizer SYNTHESIZER = null;
 
    /** Initialize the fragment template synthesizer. */
-   public static void initialize(Path fragmentFolder, Path cacheFolder, CompileLog log) {
-      SYNTHESIZER = new AsmFragmentTemplateSynthesizer(fragmentFolder, cacheFolder, log);
+   public static void initialize(Path fragmentFolder, Path fragmentCpuFolder, Path cacheFolder, CompileLog log) {
+      SYNTHESIZER = new AsmFragmentTemplateSynthesizer(fragmentFolder, fragmentCpuFolder, cacheFolder, log);
    }
 
    /** Finalize the fragment template synthesizer. */
@@ -38,8 +38,9 @@ public class AsmFragmentTemplateSynthesizer {
    }
 
    /** Create synthesizer. */
-   private AsmFragmentTemplateSynthesizer(Path fragmentFolder, Path cacheFolder, CompileLog log) {
-      this.fragmentFolder = fragmentFolder;
+   private AsmFragmentTemplateSynthesizer(Path defaultFragmentFolder, Path cpuFragmentFolder, Path cacheFolder, CompileLog log) {
+      this.defaultFragmentFolder = defaultFragmentFolder;
+      this.cpuFragmentFolder = cpuFragmentFolder;
       this.cacheFolder = cacheFolder;
       this.synthesisGraph = new LinkedHashMap<>();
       this.bestTemplateUpdate = new ArrayDeque<>();
@@ -49,8 +50,11 @@ public class AsmFragmentTemplateSynthesizer {
 
    }
 
-   /** The folder containing fragment files. */
-   private Path fragmentFolder;
+   /** The folder containing generic fragment files. */
+   private Path defaultFragmentFolder;
+
+   /** The folder containing CPU-specific fragment files. */
+   private Path cpuFragmentFolder;
 
    /** The folder containing cached fragment files. */
    private Path cacheFolder;
@@ -184,9 +188,9 @@ public class AsmFragmentTemplateSynthesizer {
             log.append("Loaded cached fragments " + bestFragmentCache.size() + " from " + cacheFile.getPath());
          return bestFragmentCache;
       } catch(IOException e) {
-         throw new RuntimeException("Error loading fragment cache file " + fragmentFolder, e);
+         throw new RuntimeException("Error loading fragment cache file " + defaultFragmentFolder, e);
       } catch(StringIndexOutOfBoundsException e) {
-         throw new RuntimeException("Problem reading fragment file " + fragmentFolder, e);
+         throw new RuntimeException("Problem reading fragment file " + defaultFragmentFolder, e);
       }
    }
 
@@ -205,7 +209,7 @@ public class AsmFragmentTemplateSynthesizer {
          for(String signature : this.bestFragmentCache.keySet()) {
             AsmFragmentTemplate fragmentTemplate = this.bestFragmentCache.get(signature);
             fragmentFilePrint.println("//FRAGMENT " + signature);
-            if(fragmentTemplate.getBody()!=null)
+            if(fragmentTemplate.getBody() != null)
                fragmentFilePrint.println(fragmentTemplate.getBody());
          }
          fragmentFilePrint.close();
@@ -255,8 +259,8 @@ public class AsmFragmentTemplateSynthesizer {
       /** Options for synthesizing the other templates from this template using a specific synthesis rule. Backward edges in the synthesis graph. */
       private Set<AsmFragmentSynthesisOption> parentOptions;
 
-      /** The template loaded from a file, if it exists. null if no file exists for the signature. */
-      private AsmFragmentTemplate fileTemplate;
+      /** The templates loaded from a file. Empty if no file exists for the signature. */
+      private List<AsmFragmentTemplate> fileTemplates;
 
       /**
        * Create a new synthesis
@@ -268,6 +272,7 @@ public class AsmFragmentTemplateSynthesizer {
          this.bestTemplates = new LinkedHashMap<>();
          this.synthesisOptions = new LinkedHashSet<>();
          this.parentOptions = new LinkedHashSet<>();
+         this.fileTemplates = new ArrayList<>();
       }
 
       /**
@@ -298,12 +303,12 @@ public class AsmFragmentTemplateSynthesizer {
          this.parentOptions.add(synthesisOption);
       }
 
-      public void setFileTemplate(AsmFragmentTemplate fileTemplate) {
-         this.fileTemplate = fileTemplate;
+      public void addFileTemplate(AsmFragmentTemplate fileTemplate) {
+         this.fileTemplates.add(fileTemplate);
       }
 
-      public AsmFragmentTemplate getFileTemplate() {
-         return fileTemplate;
+      public List<AsmFragmentTemplate> getFileTemplates() {
+         return fileTemplates;
       }
 
       /**
@@ -489,11 +494,13 @@ public class AsmFragmentTemplateSynthesizer {
       synthesisGraph.put(signature, synthesis);
       queueUpdateBestTemplate(synthesis);
       // Load the template from file - if it exists
-      AsmFragmentTemplate fileTemplate = loadFragmentTemplate(signature, log);
-      if(fileTemplate != null) {
-         synthesis.setFileTemplate(fileTemplate);
-         if(log.isVerboseFragmentLog()) {
-            log.append("New fragment synthesis " + signature + " - Successfully loaded " + signature + ".asm");
+      List<AsmFragmentTemplate> fileTemplates = loadFragmentTemplates(signature, log);
+      if(fileTemplates != null) {
+         for(AsmFragmentTemplate fileTemplate : fileTemplates) {
+            synthesis.addFileTemplate(fileTemplate);
+            if(log.isVerboseFragmentLog()) {
+               log.append("New fragment synthesis " + signature + " - Successfully loaded " + signature + ".asm");
+            }
          }
       }
       // Populate with synthesis options
@@ -538,8 +545,8 @@ public class AsmFragmentTemplateSynthesizer {
          AsmFragmentSynthesis synthesis = bestTemplateUpdate.pop();
          boolean modified = false;
          // Check if the file template is best in class
-         AsmFragmentTemplate fileTemplate = synthesis.getFileTemplate();
-         if(fileTemplate != null) {
+         List<AsmFragmentTemplate> fileTemplates = synthesis.getFileTemplates();
+         for(AsmFragmentTemplate fileTemplate : fileTemplates) {
             modified |= synthesis.bestTemplateCandidate(fileTemplate);
          }
          Collection<AsmFragmentSynthesisOption> synthesisOptions = synthesis.getSynthesisOptions();
@@ -586,18 +593,38 @@ public class AsmFragmentTemplateSynthesizer {
    }
 
    /**
-    * Attempt to load a fragment template from disk.
+    * Attempt to load a fragment template from disk. Also searches relevant fragment sub-folders specified by CPU and other options.
     *
     * @param signature The signature
     * @param log The compile log
     * @return The fragment template from a file. null if the template is not found as a file.
     */
-   private AsmFragmentTemplate loadFragmentTemplate(String signature, CompileLog log) {
-      if(fragmentFolder == null) {
-         return null;
+   private List<AsmFragmentTemplate> loadFragmentTemplates(String signature, CompileLog log) {
+      ArrayList<AsmFragmentTemplate> fileTemplates = new ArrayList<>();
+      if(defaultFragmentFolder != null) {
+         AsmFragmentTemplate fileFragment = loadFragmentTemplate(signature, defaultFragmentFolder);
+         if(fileFragment != null)
+            fileTemplates.add(fileFragment);
       }
+      if(cpuFragmentFolder != null) {
+         AsmFragmentTemplate fileFragment = loadFragmentTemplate(signature, cpuFragmentFolder);
+         if(fileFragment != null)
+            fileTemplates.add(fileFragment);
+      }
+      return fileTemplates;
+   }
+
+
+   /**
+    * Attempt to load a fragment template from a folder on disk
+    *
+    * @param signature The signature to search for
+    * @param fragmentFolder The folder to look in
+    * @return any fragment with the gicen signature found in the folder. null if not found.
+    */
+   private AsmFragmentTemplate loadFragmentTemplate(String signature, Path fragmentFolder) {
       try {
-         File fragmentFile = this.fragmentFolder.resolve(signature + ".asm").toFile();
+         File fragmentFile = fragmentFolder.resolve(signature + ".asm").toFile();
          if(!fragmentFile.exists()) {
             return null;
          }
@@ -635,7 +662,7 @@ public class AsmFragmentTemplateSynthesizer {
    }
 
    File[] allFragmentFiles() {
-      return fragmentFolder.toFile().listFiles((dir, name) -> name.endsWith(".asm"));
+      return defaultFragmentFolder.toFile().listFiles((dir, name) -> name.endsWith(".asm"));
 
    }
 

src/main/java/dk/camelot64/kickc/model/Program.java

@@ -27,13 +27,16 @@ public class Program {
    private List<String> importPaths;
    /** Imported files. PASS 0 (STATIC) */
    private List<String> imported;
+
+   /** The target platform that the program is being build for. PASS 0-5 (STATIC) */
+   private TargetPlatform targetPlatform = TargetPlatform.DEFAULT;
+   /** The target CPU that the program is being build for. PASS 0-5 (STATIC) */
+   private TargetCpu targetCpu = TargetCpu.DEFAULT;
    /** Path to any custom link script file used for linking (STATIC) */
    private Path linkScriptFilePath;
    /** Body to any custom link script file used for linking (STATIC) */
    private String linkScriptBody;
 
-   /** The target platform that the program is being build for. PASS 0-5 (STATIC) */
-   private TargetPlatform targetPlatform = TargetPlatform.DEFAULT;
    /** Absolute start address of the code. Null to start ad 0x080d. PASS 0-5 (STATIC) */
    private Number programPc;
    /** Reserved ZP addresses that the compiler cannot use. PASS 0-5 (STATIC) */
@@ -156,6 +159,14 @@ public class Program {
       this.asm = null;
    }
 
+   public TargetCpu getTargetCpu() {
+      return targetCpu;
+   }
+
+   public void setTargetCpu(TargetCpu targetCpu) {
+      this.targetCpu = targetCpu;
+   }
+
    public TargetPlatform getTargetPlatform() {
       return targetPlatform;
    }

src/main/java/dk/camelot64/kickc/model/TargetCpu.java

@@ -0,0 +1,42 @@
+package dk.camelot64.kickc.model;
+
+/** The target CPU variation of the compile. Controls which instructions are legal. */
+public enum TargetCpu {
+   /** Vanilla MOS 6502 CPU - without illegal opcodes. */
+   MOS6502("6502"),
+   /** MOS 6502 CPU with support for illegal instructions. */
+   MOS6502X("6502X"),
+   ///** 65C02 CPU - More addressing modes and instructions, no illegal instructions. http://westerndesigncenter.com/wdc/documentation/w65c02s.pdf */
+   //WDC65C02("65C02"),
+   ///** 65CE02 CPU - Even more addressing modes and instructions. http://www.zimmers.net/anonftp/pub/cbm/documents/chipdata/65ce02.txt  */
+   //MOS65CE02("65CE02"),
+   ///** 65C186 CPU - 16-bit instructions, 24-bit addressing modes and more instructions. http://www.westerndesigncenter.com/wdc/documentation/w65c816s.pdf  */
+   //WDC65C186("65CE02"),
+   ;
+
+   /** The default target CPU. */
+   public static final TargetCpu DEFAULT = MOS6502X;
+
+   private String name;
+
+   TargetCpu(String name) {
+      this.name = name;
+   }
+
+   public String getName() {
+      return name;
+   }
+
+   /** Get a target CPU by name. */
+   public static TargetCpu getTargetCpu(String name) {
+      for(TargetCpu value : TargetCpu.values()) {
+         if(value.getName().equalsIgnoreCase(name)) {
+            return value;
+         }
+      }
+      return null;
+   }
+
+
+
+}

src/main/java/dk/camelot64/kickc/model/TargetPlatform.java

@@ -6,12 +6,8 @@ package dk.camelot64.kickc.model;
 public enum TargetPlatform {
    /** Commodore 64 with BASIC upstart SYS-command. */
    C64BASIC("c64basic"),
-   /** Commodore 64 with BASIC upstart SYS-command - using Code and Data segments. */
-   C64BASIC_SEGMENTS("c64basic_segments"),
    /** 6502 assembler (with no upstart code.)*/
    ASM6502("asm6502"),
-   /** 6502 assembler (with no upstart code.)*/
-   ASM6502_SEGMENTS("asm6502_segments"),
    /** Custom target platform specified in a separate linker file passed using -T option or using #pragma link() */
    CUSTOM("custom");
 

src/main/java/dk/camelot64/kickc/parser/KickCLexer.g4

@@ -69,6 +69,7 @@ RESERVE:'reserve' ;
 PC:'pc';
 TARGET:'target';
 LINK:'link';
+CPU:'cpu';
 CODESEG:'code_seg';
 DATASEG:'data_seg';
 ENCODING:'encoding';

src/main/java/dk/camelot64/kickc/parser/KickCLexer.tokens

@@ -42,95 +42,96 @@ RESERVE=41
 PC=42
 TARGET=43
 LINK=44
-CODESEG=45
-DATASEG=46
-ENCODING=47
-CONST=48
-EXTERN=49
-EXPORT=50
-ALIGN=51
-REGISTER=52
-INLINE=53
-VOLATILE=54
-INTERRUPT=55
-IF=56
-ELSE=57
-WHILE=58
-DO=59
-FOR=60
-SWITCH=61
-RETURN=62
-BREAK=63
-CONTINUE=64
-ASM=65
-DEFAULT=66
-CASE=67
-STRUCT=68
-ENUM=69
-SIZEOF=70
-TYPEID=71
-KICKASM=72
-RESOURCE=73
-USES=74
-CLOBBERS=75
-BYTES=76
-CYCLES=77
-LOGIC_NOT=78
-SIGNEDNESS=79
-SIMPLETYPE=80
-BOOLEAN=81
-KICKASM_BODY=82
-STRING=83
-CHAR=84
-NUMBER=85
-NUMFLOAT=86
-BINFLOAT=87
-DECFLOAT=88
-HEXFLOAT=89
-NUMINT=90
-BININTEGER=91
-DECINTEGER=92
-HEXINTEGER=93
-NAME=94
-WS=95
-COMMENT_LINE=96
-COMMENT_BLOCK=97
-ASM_BYTE=98
-ASM_MNEMONIC=99
-ASM_IMM=100
-ASM_COLON=101
-ASM_COMMA=102
-ASM_PAR_BEGIN=103
-ASM_PAR_END=104
-ASM_BRACKET_BEGIN=105
-ASM_BRACKET_END=106
-ASM_DOT=107
-ASM_SHIFT_LEFT=108
-ASM_SHIFT_RIGHT=109
-ASM_PLUS=110
-ASM_MINUS=111
-ASM_LESS_THAN=112
-ASM_GREATER_THAN=113
-ASM_MULTIPLY=114
-ASM_DIVIDE=115
-ASM_CURLY_BEGIN=116
-ASM_CURLY_END=117
-ASM_NUMBER=118
-ASM_NUMFLOAT=119
-ASM_BINFLOAT=120
-ASM_DECFLOAT=121
-ASM_HEXFLOAT=122
-ASM_NUMINT=123
-ASM_BININTEGER=124
-ASM_DECINTEGER=125
-ASM_HEXINTEGER=126
-ASM_CHAR=127
-ASM_MULTI_REL=128
-ASM_MULTI_NAME=129
-ASM_NAME=130
-ASM_WS=131
-ASM_COMMENT_LINE=132
-ASM_COMMENT_BLOCK=133
+CPU=45
+CODESEG=46
+DATASEG=47
+ENCODING=48
+CONST=49
+EXTERN=50
+EXPORT=51
+ALIGN=52
+REGISTER=53
+INLINE=54
+VOLATILE=55
+INTERRUPT=56
+IF=57
+ELSE=58
+WHILE=59
+DO=60
+FOR=61
+SWITCH=62
+RETURN=63
+BREAK=64
+CONTINUE=65
+ASM=66
+DEFAULT=67
+CASE=68
+STRUCT=69
+ENUM=70
+SIZEOF=71
+TYPEID=72
+KICKASM=73
+RESOURCE=74
+USES=75
+CLOBBERS=76
+BYTES=77
+CYCLES=78
+LOGIC_NOT=79
+SIGNEDNESS=80
+SIMPLETYPE=81
+BOOLEAN=82
+KICKASM_BODY=83
+STRING=84
+CHAR=85
+NUMBER=86
+NUMFLOAT=87
+BINFLOAT=88
+DECFLOAT=89
+HEXFLOAT=90
+NUMINT=91
+BININTEGER=92
+DECINTEGER=93
+HEXINTEGER=94
+NAME=95
+WS=96
+COMMENT_LINE=97
+COMMENT_BLOCK=98
+ASM_BYTE=99
+ASM_MNEMONIC=100
+ASM_IMM=101
+ASM_COLON=102
+ASM_COMMA=103
+ASM_PAR_BEGIN=104
+ASM_PAR_END=105
+ASM_BRACKET_BEGIN=106
+ASM_BRACKET_END=107
+ASM_DOT=108
+ASM_SHIFT_LEFT=109
+ASM_SHIFT_RIGHT=110
+ASM_PLUS=111
+ASM_MINUS=112
+ASM_LESS_THAN=113
+ASM_GREATER_THAN=114
+ASM_MULTIPLY=115
+ASM_DIVIDE=116
+ASM_CURLY_BEGIN=117
+ASM_CURLY_END=118
+ASM_NUMBER=119
+ASM_NUMFLOAT=120
+ASM_BINFLOAT=121
+ASM_DECFLOAT=122
+ASM_HEXFLOAT=123
+ASM_NUMINT=124
+ASM_BININTEGER=125
+ASM_DECINTEGER=126
+ASM_HEXINTEGER=127
+ASM_CHAR=128
+ASM_MULTI_REL=129
+ASM_MULTI_NAME=130
+ASM_NAME=131
+ASM_WS=132
+ASM_COMMENT_LINE=133
+ASM_COMMENT_BLOCK=134
 ';'=8
 '..'=11
 '?'=12
@@ -156,39 +157,40 @@ ASM_COMMENT_BLOCK=133
 'pc'=42
 'target'=43
 'link'=44
-'code_seg'=45
-'data_seg'=46
-'encoding'=47
-'const'=48
-'extern'=49
-'export'=50
-'align'=51
-'register'=52
-'inline'=53
-'volatile'=54
-'interrupt'=55
-'if'=56
-'else'=57
-'while'=58
-'do'=59
-'for'=60
-'switch'=61
-'return'=62
-'break'=63
-'continue'=64
-'asm'=65
-'default'=66
-'case'=67
-'struct'=68
-'enum'=69
-'sizeof'=70
-'typeid'=71
-'kickasm'=72
-'resource'=73
-'uses'=74
-'clobbers'=75
-'bytes'=76
-'cycles'=77
-'!'=78
-'.byte'=98
-'#'=100
+'cpu'=45
+'code_seg'=46
+'data_seg'=47
+'encoding'=48
+'const'=49
+'extern'=50
+'export'=51
+'align'=52
+'register'=53
+'inline'=54
+'volatile'=55
+'interrupt'=56
+'if'=57
+'else'=58
+'while'=59
+'do'=60
+'for'=61
+'switch'=62
+'return'=63
+'break'=64
+'continue'=65
+'asm'=66
+'default'=67
+'case'=68
+'struct'=69
+'enum'=70
+'sizeof'=71
+'typeid'=72
+'kickasm'=73
+'resource'=74
+'uses'=75
+'clobbers'=76
+'bytes'=77
+'cycles'=78
+'!'=79
+'.byte'=99
+'#'=101

src/main/java/dk/camelot64/kickc/parser/KickCParser.g4

@@ -86,6 +86,7 @@ globalDirective
     : (PRAGMA RESERVE) PAR_BEGIN NUMBER ( COMMA NUMBER )* PAR_END #globalDirectiveReserve
     | (PRAGMA PC) PAR_BEGIN NUMBER PAR_END #globalDirectivePc
     | (PRAGMA TARGET) PAR_BEGIN NAME PAR_END #globalDirectivePlatform
+    | (PRAGMA CPU) PAR_BEGIN NAME PAR_END #globalDirectiveCpu
     | (PRAGMA LINK) PAR_BEGIN STRING PAR_END #globalDirectiveLinkScript
     | (PRAGMA CODESEG) PAR_BEGIN NAME PAR_END #globalDirectiveCodeSeg
     | (PRAGMA DATASEG) PAR_BEGIN NAME PAR_END #globalDirectiveDataSeg

src/main/java/dk/camelot64/kickc/parser/KickCParser.tokens

@@ -42,95 +42,96 @@ RESERVE=41
 PC=42
 TARGET=43
 LINK=44
-CODESEG=45
-DATASEG=46
-ENCODING=47
-CONST=48
-EXTERN=49
-EXPORT=50
-ALIGN=51
-REGISTER=52
-INLINE=53
-VOLATILE=54
-INTERRUPT=55
-IF=56
-ELSE=57
-WHILE=58
-DO=59
-FOR=60
-SWITCH=61
-RETURN=62
-BREAK=63
-CONTINUE=64
-ASM=65
-DEFAULT=66
-CASE=67
-STRUCT=68
-ENUM=69
-SIZEOF=70
-TYPEID=71
-KICKASM=72
-RESOURCE=73
-USES=74
-CLOBBERS=75
-BYTES=76
-CYCLES=77
-LOGIC_NOT=78
-SIGNEDNESS=79
-SIMPLETYPE=80
-BOOLEAN=81
-KICKASM_BODY=82
-STRING=83
-CHAR=84
-NUMBER=85
-NUMFLOAT=86
-BINFLOAT=87
-DECFLOAT=88
-HEXFLOAT=89
-NUMINT=90
-BININTEGER=91
-DECINTEGER=92
-HEXINTEGER=93
-NAME=94
-WS=95
-COMMENT_LINE=96
-COMMENT_BLOCK=97
-ASM_BYTE=98
-ASM_MNEMONIC=99
-ASM_IMM=100
-ASM_COLON=101
-ASM_COMMA=102
-ASM_PAR_BEGIN=103
-ASM_PAR_END=104
-ASM_BRACKET_BEGIN=105
-ASM_BRACKET_END=106
-ASM_DOT=107
-ASM_SHIFT_LEFT=108
-ASM_SHIFT_RIGHT=109
-ASM_PLUS=110
-ASM_MINUS=111
-ASM_LESS_THAN=112
-ASM_GREATER_THAN=113
-ASM_MULTIPLY=114
-ASM_DIVIDE=115
-ASM_CURLY_BEGIN=116
-ASM_CURLY_END=117
-ASM_NUMBER=118
-ASM_NUMFLOAT=119
-ASM_BINFLOAT=120
-ASM_DECFLOAT=121
-ASM_HEXFLOAT=122
-ASM_NUMINT=123
-ASM_BININTEGER=124
-ASM_DECINTEGER=125
-ASM_HEXINTEGER=126
-ASM_CHAR=127
-ASM_MULTI_REL=128
-ASM_MULTI_NAME=129
-ASM_NAME=130
-ASM_WS=131
-ASM_COMMENT_LINE=132
-ASM_COMMENT_BLOCK=133
+CPU=45
+CODESEG=46
+DATASEG=47
+ENCODING=48
+CONST=49
+EXTERN=50
+EXPORT=51
+ALIGN=52
+REGISTER=53
+INLINE=54
+VOLATILE=55
+INTERRUPT=56
+IF=57
+ELSE=58
+WHILE=59
+DO=60
+FOR=61
+SWITCH=62
+RETURN=63
+BREAK=64
+CONTINUE=65
+ASM=66
+DEFAULT=67
+CASE=68
+STRUCT=69
+ENUM=70
+SIZEOF=71
+TYPEID=72
+KICKASM=73
+RESOURCE=74
+USES=75
+CLOBBERS=76
+BYTES=77
+CYCLES=78
+LOGIC_NOT=79
+SIGNEDNESS=80
+SIMPLETYPE=81
+BOOLEAN=82
+KICKASM_BODY=83
+STRING=84
+CHAR=85
+NUMBER=86
+NUMFLOAT=87
+BINFLOAT=88
+DECFLOAT=89
+HEXFLOAT=90
+NUMINT=91
+BININTEGER=92
+DECINTEGER=93
+HEXINTEGER=94
+NAME=95
+WS=96
+COMMENT_LINE=97
+COMMENT_BLOCK=98
+ASM_BYTE=99
+ASM_MNEMONIC=100
+ASM_IMM=101
+ASM_COLON=102
+ASM_COMMA=103
+ASM_PAR_BEGIN=104
+ASM_PAR_END=105
+ASM_BRACKET_BEGIN=106
+ASM_BRACKET_END=107
+ASM_DOT=108
+ASM_SHIFT_LEFT=109
+ASM_SHIFT_RIGHT=110
+ASM_PLUS=111
+ASM_MINUS=112
+ASM_LESS_THAN=113
+ASM_GREATER_THAN=114
+ASM_MULTIPLY=115
+ASM_DIVIDE=116
+ASM_CURLY_BEGIN=117
+ASM_CURLY_END=118
+ASM_NUMBER=119
+ASM_NUMFLOAT=120
+ASM_BINFLOAT=121
+ASM_DECFLOAT=122
+ASM_HEXFLOAT=123
+ASM_NUMINT=124
+ASM_BININTEGER=125
+ASM_DECINTEGER=126
+ASM_HEXINTEGER=127
+ASM_CHAR=128
+ASM_MULTI_REL=129
+ASM_MULTI_NAME=130
+ASM_NAME=131
+ASM_WS=132
+ASM_COMMENT_LINE=133
+ASM_COMMENT_BLOCK=134
 ';'=8
 '..'=11
 '?'=12
@@ -156,39 +157,40 @@ ASM_COMMENT_BLOCK=133
 'pc'=42
 'target'=43
 'link'=44
-'code_seg'=45
-'data_seg'=46
-'encoding'=47
-'const'=48
-'extern'=49
-'export'=50
-'align'=51
-'register'=52
-'inline'=53
-'volatile'=54
-'interrupt'=55
-'if'=56
-'else'=57
-'while'=58
-'do'=59
-'for'=60
-'switch'=61
-'return'=62
-'break'=63
-'continue'=64
-'asm'=65
-'default'=66
-'case'=67
-'struct'=68
-'enum'=69
-'sizeof'=70
-'typeid'=71
-'kickasm'=72
-'resource'=73
-'uses'=74
-'clobbers'=75
-'bytes'=76
-'cycles'=77
-'!'=78
-'.byte'=98
-'#'=100
+'cpu'=45
+'code_seg'=46
+'data_seg'=47
+'encoding'=48
+'const'=49
+'extern'=50
+'export'=51
+'align'=52
+'register'=53
+'inline'=54
+'volatile'=55
+'interrupt'=56
+'if'=57
+'else'=58
+'while'=59
+'do'=60
+'for'=61
+'switch'=62
+'return'=63
+'break'=64
+'continue'=65
+'asm'=66
+'default'=67
+'case'=68
+'struct'=69
+'enum'=70
+'sizeof'=71
+'typeid'=72
+'kickasm'=73
+'resource'=74
+'uses'=75
+'clobbers'=76
+'bytes'=77
+'cycles'=78
+'!'=79
+'.byte'=99
+'#'=101

src/main/java/dk/camelot64/kickc/parser/KickCParserBaseListener.java

@@ -241,6 +241,18 @@ public class KickCParserBaseListener implements KickCParserListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitGlobalDirectivePlatform(KickCParser.GlobalDirectivePlatformContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterGlobalDirectiveCpu(KickCParser.GlobalDirectiveCpuContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitGlobalDirectiveCpu(KickCParser.GlobalDirectiveCpuContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/dk/camelot64/kickc/parser/KickCParserBaseVisitor.java

@@ -146,6 +146,13 @@ public class KickCParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> imple
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitGlobalDirectivePlatform(KickCParser.GlobalDirectivePlatformContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitGlobalDirectiveCpu(KickCParser.GlobalDirectiveCpuContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/dk/camelot64/kickc/parser/KickCParserListener.java

@@ -213,6 +213,18 @@ public interface KickCParserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitGlobalDirectivePlatform(KickCParser.GlobalDirectivePlatformContext ctx);
+	/**
+	 * Enter a parse tree produced by the {@code globalDirectiveCpu}
+	 * labeled alternative in {@link KickCParser#globalDirective}.
+	 * @param ctx the parse tree
+	 */
+	void enterGlobalDirectiveCpu(KickCParser.GlobalDirectiveCpuContext ctx);
+	/**
+	 * Exit a parse tree produced by the {@code globalDirectiveCpu}
+	 * labeled alternative in {@link KickCParser#globalDirective}.
+	 * @param ctx the parse tree
+	 */
+	void exitGlobalDirectiveCpu(KickCParser.GlobalDirectiveCpuContext ctx);
 	/**
 	 * Enter a parse tree produced by the {@code globalDirectiveLinkScript}
 	 * labeled alternative in {@link KickCParser#globalDirective}.

src/main/java/dk/camelot64/kickc/parser/KickCParserVisitor.java

@@ -133,6 +133,13 @@ public interface KickCParserVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitGlobalDirectivePlatform(KickCParser.GlobalDirectivePlatformContext ctx);
+	/**
+	 * Visit a parse tree produced by the {@code globalDirectiveCpu}
+	 * labeled alternative in {@link KickCParser#globalDirective}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitGlobalDirectiveCpu(KickCParser.GlobalDirectiveCpuContext ctx);
 	/**
 	 * Visit a parse tree produced by the {@code globalDirectiveLinkScript}
 	 * labeled alternative in {@link KickCParser#globalDirective}.

src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java

@@ -141,7 +141,18 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       if(platform != null) {
          program.setTargetPlatform(platform);
       } else {
-         throw new CompileError("Unknown target platform in #platform directive", new StatementSource(ctx));
+         throw new CompileError("Unknown target platform in #pragma platform directive", new StatementSource(ctx));
+      }
+      return null;
+   }
+
+   @Override
+   public Object visitGlobalDirectiveCpu(KickCParser.GlobalDirectiveCpuContext ctx) {
+      TargetCpu cpu = TargetCpu.getTargetCpu(ctx.NAME().getText());
+      if(cpu != null) {
+         program.setTargetCpu(cpu);
+      } else {
+         throw new CompileError("Unknown target CPU in #pragma cpu directive", new StatementSource(ctx));
       }
       return null;
    }

src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java

@@ -85,35 +85,12 @@ public class Pass4CodeGeneration {
       String outputPrgPath = new File(program.getFileName()).getName()+".prg";
       asm.startChunk(currentScope, null, "Upstart");
       Number programPc = program.getProgramPc();
-      if(TargetPlatform.C64BASIC_SEGMENTS.equals(program.getTargetPlatform())) {
-         useSegments = true;
-         currentCodeSegmentName = Scope.SEGMENT_CODE_DEFAULT;
-         currentDataSegmentName = Scope.SEGMENT_DATA_DEFAULT;
-         if(programPc==null) programPc = 0x080d;
-         asm.addLine(new AsmFile(outputPrgPath).param("type", "\"prg\"").param("segments", "\"Program\""));
-         asm.addLine(new AsmSegmentDef("Program").param("segments", "\"Basic,Code,Data\""));
-         asm.addLine(new AsmSegmentDef("Basic").param("start", "$0801"));
-         asm.addLine(new AsmSegmentDef(Scope.SEGMENT_CODE_DEFAULT).param("start", AsmFormat.getAsmNumber(programPc)));
-         asm.addLine(new AsmSegmentDef(Scope.SEGMENT_DATA_DEFAULT).param("startAfter", "\"Code\""));
-         asm.addLine(new AsmSegment("Basic"));
-         asm.addLine(new AsmBasicUpstart("bbegin"));
-         setCurrentSegment(currentCodeSegmentName, asm);
-      } else if(TargetPlatform.C64BASIC.equals(program.getTargetPlatform())) {
+      if(TargetPlatform.C64BASIC.equals(program.getTargetPlatform())) {
          useSegments = false;
          if(programPc==null) programPc = 0x080d;
          asm.addLine(new AsmSetPc("Basic", AsmFormat.getAsmNumber(0x0801)));
          asm.addLine(new AsmBasicUpstart("bbegin"));
          asm.addLine(new AsmSetPc("Program", AsmFormat.getAsmNumber(programPc)));
-      } else if(TargetPlatform.ASM6502_SEGMENTS.equals(program.getTargetPlatform())) {
-         useSegments = true;
-         currentCodeSegmentName = Scope.SEGMENT_CODE_DEFAULT;
-         currentDataSegmentName = Scope.SEGMENT_DATA_DEFAULT;
-         if(programPc==null) programPc = 0x2000;
-         asm.addLine(new AsmFile(outputPrgPath).param("type", "\"prg\"").param("segments", "\"Program\""));
-         asm.addLine(new AsmSegmentDef("Program").param("segments", "\"Code,Data\""));
-         asm.addLine(new AsmSegmentDef(Scope.SEGMENT_CODE_DEFAULT).param("start", AsmFormat.getAsmNumber(programPc)));
-         asm.addLine(new AsmSegmentDef(Scope.SEGMENT_DATA_DEFAULT).param("startAfter", "\"Code\""));
-         setCurrentSegment(currentCodeSegmentName, asm);
       } else if(TargetPlatform.ASM6502.equals(program.getTargetPlatform())) {
          useSegments = false;
          if(programPc==null) programPc = 0x2000;

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

@@ -21,7 +21,7 @@ public class TestFragments {
 
    @BeforeClass
    public static void setUp() {
-      AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), null, new CompileLog());
+      AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), new File("src/main/fragment/6502X/").toPath(), null, new CompileLog());
    }
 
    @AfterClass
@@ -183,7 +183,7 @@ public class TestFragments {
     */
    private void testFragmentExists(String signature) {
       CompileLog log = new CompileLog();
-      AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), null, log);
+      AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), new File("src/main/fragment/6502X/").toPath(),  null, log);
       log.setSysOut(true);
       //log.setVerboseFragmentLog(true);
       List<AsmFragmentTemplate> templates =
@@ -201,7 +201,7 @@ public class TestFragments {
 
    private void testFragments(String fileName, Collection<String> signatures) throws IOException {
       CompileLog log = new CompileLog();
-      AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), null, log);
+      AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), new File("src/main/fragment/6502X/").toPath(),  null, log);
       List<String> sigs = new ArrayList<>(signatures);
 
       // Always test max 1000 signatures

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

@@ -324,16 +324,6 @@ public class TestPrograms {
       compileAndCompare("platform-asm6502");
    }
 
-   @Test
-   public void testPlatformC64BasicSegments() throws IOException, URISyntaxException {
-      compileAndCompare("platform-c64basic_segments");
-   }
-
-   @Test
-   public void testPlatformAsm6502Segments() throws IOException, URISyntaxException {
-      compileAndCompare("platform-asm6502_segments");
-   }
-
    @Test
    public void testEuclid2() throws IOException, URISyntaxException {
       compileAndCompare("euclid-3");
@@ -3092,7 +3082,7 @@ public class TestPrograms {
 
    @BeforeClass
    public static void setUp() {
-      AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), getFragmentCacheDir().toPath(), new CompileLog());
+      AsmFragmentTemplateSynthesizer.initialize(new File("src/main/fragment/").toPath(), new File("src/main/fragment/6502X/").toPath(), getFragmentCacheDir().toPath(), new CompileLog());
    }
 
    @AfterClass

src/test/kc/encoding-literal-char.kc

@@ -4,7 +4,7 @@
 const char cpm = 'A';
 const char[] spm = "A";
 #pragma encoding(petscii_upper)
-const char cpu = 'A';
+const char ccpu = 'A';
 const char[] spu = "A";
 #pragma encoding(screencode_mixed)
 const char csm = 'A';
@@ -17,7 +17,7 @@ const char* screen = 0x0400;
 void main() {
     char idx = 0;
     screen[idx++] = cpm;
-    screen[idx++] = cpu;
+    screen[idx++] = ccpu;
     screen[idx++] = csm;
     screen[idx++] = csu;
     idx = 0x28;

src/test/kc/platform-asm6502_segments.kc

@@ -1,10 +0,0 @@
-// Tests the target platform ASM6502_SEGMENTS
-
-#pragma target(asm6502_segments)
-
-unsigned char[10] TABLE;
-
-void main() {
-    for(char i=0;i<10;i++)
-        TABLE[i] = i;
-}

src/test/kc/platform-c64basic_segments.kc

@@ -1,10 +0,0 @@
-// Tests the target platform C64BASIC_SEGMENTS
-
-#pragma target(c64basic_segments)
-
-unsigned char[10] TABLE;
-
-void main() {
-    for(char i=0;i<10;i++)
-        TABLE[i] = i;
-}

src/test/ref/address-of-0.log

@@ -145,7 +145,7 @@ Allocated zp ZP_BYTE:2 [ main::b#2 main::b#0 main::b#1 ]
 Allocated zp ZP_BYTE:3 [ main::c#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test address-of - use the pointer to get the value
   // Upstart

src/test/ref/address-of-1.log

@@ -261,7 +261,7 @@ Allocated zp ZP_BYTE:6 [ main::b2#0 ]
 Allocated zp ZP_BYTE:7 [ main::b3#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test address-of - pass the pointer as parameter
   // Upstart

src/test/ref/address-of-2.log

@@ -364,7 +364,7 @@ Complete equivalence classes
 Allocated zp ZP_BYTE:2 [ val#0 val#1 val#2 val#12 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test address-of by assigning the affected variable in multiple ways
   // Upstart

src/test/ref/address-of-3.log

@@ -318,7 +318,7 @@ Allocated zp ZP_BYTE:6 [ main::$7 ]
 Allocated zp ZP_BYTE:7 [ print::$0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test address-of an array element
   // Upstart

src/test/ref/array-16bit-lookup.log

@@ -267,7 +267,7 @@ Allocated zp ZP_BYTE:13 [ getValue::$2 ]
 Allocated zp ZP_WORD:14 [ getValue::return#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test KickC performance for 16-bit array lookup function from article "Optimizing C array lookups for the 6502"
 // http://8bitworkshop.com/blog/compilers/2019/03/17/cc65-optimization.html

src/test/ref/array-length-symbolic-min.log

@@ -143,7 +143,7 @@ Complete equivalence classes
 Allocated zp ZP_BYTE:2 [ main::sub#2 main::sub#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Illustrates symbolic array lengths
   // Upstart

src/test/ref/array-length-symbolic.log

@@ -285,7 +285,7 @@ Allocated zp ZP_BYTE:6 [ main::$2 ]
 Allocated zp ZP_BYTE:7 [ main::$3 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Illustrates symbolic array lengths
   // Upstart

src/test/ref/arrays-init-kasm-0.log

@@ -91,7 +91,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test initializing array using KickAssembler
   // Upstart

src/test/ref/arrays-init.log

@@ -139,7 +139,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/asm-culling-jmp.log

@@ -74,7 +74,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Example of inline ASM where a JMP is erronously culled during compilation
 // https://gitlab.com/camelot/kickc/issues/302

src/test/ref/asm-mnemonic-names.log

@@ -128,7 +128,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test using an ASM mnemonic as a C symbol names
 // Works if the C-lexer and the ASM-lexer are separated properly

src/test/ref/asm-uses-0.log

@@ -100,7 +100,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests that inline asm uses clause makes the compiler not cull a procedure referenced
   // Upstart

src/test/ref/assignment-chained.log

@@ -149,7 +149,7 @@ Complete equivalence classes
 Allocated zp ZP_BYTE:2 [ main::a#2 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests that chained assignments work as intended
   // Upstart

src/test/ref/assignment-compound.log

@@ -744,7 +744,7 @@ Allocated zp ZP_BYTE:2 [ test::a#11 ]
 Allocated zp ZP_BYTE:3 [ test::i#11 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test compound assignment operators
   // Upstart

src/test/ref/bgblack.log

@@ -83,7 +83,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/bitmap-circle.log

@@ -1191,7 +1191,7 @@ Allocated zp ZP_BYTE:46 [ plot::$6 ]
 Allocated zp ZP_WORD:47 [ fill::end#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Plots a circle on a bitmap using Bresenham's Circle algorithm
 // Coded by Richard-William Loerakker

src/test/ref/bitmap-plot-0.log

@@ -1819,7 +1819,7 @@ Allocated zp ZP_BYTE:35 [ bitmap_init::$5 ]
 Allocated zp ZP_BYTE:36 [ bitmap_init::$6 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests the simple bitmap plotter - and counts plots per frame in an IRQ
 // Plots simple plots

src/test/ref/bitmap-plot-1.log

@@ -4063,7 +4063,7 @@ Allocated zp ZP_BYTE:224 [ divr16u::$2 ]
 Allocated zp ZP_WORD:225 [ rem16u#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests the simple bitmap plotter - and counts plots per frame in an IRQ
 // Plots a fullscreen elipsis

src/test/ref/bitmap-plot-2.log

@@ -4298,7 +4298,7 @@ Allocated zp ZP_BYTE:223 [ divr16u::$2 ]
 Allocated zp ZP_WORD:224 [ rem16u#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests the simple bitmap plotter - and counts plots per frame in an IRQ
 // Plots a spiral

src/test/ref/bitmap-plot-3.log

@@ -2532,7 +2532,7 @@ Allocated zp ZP_BYTE:72 [ bitmap_init::$5 ]
 Allocated zp ZP_BYTE:73 [ bitmap_init::$6 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests the simple bitmap plotter
 // Plots a few lines using the bresenham line algorithm

src/test/ref/bitmap-plotter.log

@@ -1048,7 +1048,7 @@ Allocated zp ZP_BYTE:32 [ init_plot_tables::$8 ]
 Allocated zp ZP_BYTE:33 [ init_plot_tables::$9 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/bitwise-not.log

@@ -124,7 +124,7 @@ Allocated zp ZP_BYTE:2 [ main::c#2 main::c#1 ]
 Allocated zp ZP_BYTE:3 [ main::$0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/bool-const.log

@@ -379,7 +379,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // A Minimal test of boolean constants.
   // Upstart

src/test/ref/bool-function.log

@@ -275,7 +275,7 @@ Allocated zp ZP_BOOL:9 [ isSet::$1 ]
 Allocated zp ZP_BOOL:10 [ isSet::return#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test a function taking boolean parameter and returning boolean result
   // Upstart

src/test/ref/bool-ifs-min.log

@@ -178,7 +178,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
 Allocated zp ZP_BYTE:3 [ main::$1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // A test of boolean conditions using && || and !
   // Upstart

src/test/ref/bool-nullpointer-exception.log

@@ -139,7 +139,7 @@ Complete equivalence classes
 Allocated zp ZP_BOOL:2 [ framedone#2 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Some bool code that causes a NullPointerException
   // Upstart

src/test/ref/bool-pointer.log

@@ -133,7 +133,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests a pointer to a boolean
   // Upstart

src/test/ref/bool-vars.log

@@ -703,7 +703,7 @@ Allocated zp ZP_BYTE:10 [ bool_or::$1 ]
 Allocated zp ZP_BYTE:11 [ bool_and::$1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // A test of boolean conditions using && || and !
   // Upstart

src/test/ref/bresenham.log

@@ -390,7 +390,7 @@ Allocated zp ZP_BYTE:5 [ main::e#3 main::e#5 main::e#1 main::e#2 ]
 Allocated zp ZP_BYTE:6 [ main::y#2 main::y#4 main::y#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/bresenhamarr.log

@@ -401,7 +401,7 @@ Allocated zp ZP_BYTE:6 [ main::y#2 main::y#4 main::y#1 ]
 Allocated zp ZP_WORD:7 [ main::$15 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/c-types.log

@@ -2302,7 +2302,7 @@ Allocated zp ZP_BYTE:24 [ print_byte::$0 ]
 Allocated zp ZP_BYTE:25 [ print_byte::$2 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests the different standard C types
   // Upstart

src/test/ref/c64dtv-8bppcharstretch.log

@@ -1603,7 +1603,7 @@ Allocated zp ZP_BYTE:25 [ gfx_init_screen0::$2 ]
 Allocated zp ZP_BYTE:26 [ gfx_init_screen0::$3 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // C64DTV 8bpp charmode stretcher
   // Upstart

src/test/ref/c64dtv-8bppchunkystretch.log

@@ -1134,7 +1134,7 @@ Allocated zp ZP_WORD:14 [ gfx_init_chunky::$8 ]
 Allocated zp ZP_BYTE:16 [ gfx_init_chunky::c#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // C64DTV 8bpp charmode stretcher
   // Upstart

src/test/ref/c64dtv-blitter-box.log

@@ -641,7 +641,7 @@ Complete equivalence classes
 Allocated zp ZP_BYTE:2 [ main::$13 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Fill a box on the screen using the blitter
   // Upstart

src/test/ref/c64dtv-blittermin.log

@@ -683,7 +683,7 @@ Allocated zp ZP_BYTE:2 [ main::r#2 main::r#1 ]
 Allocated zp ZP_BYTE:3 [ main::$9 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/c64dtv-color.log

@@ -329,7 +329,7 @@ Allocated zp ZP_BYTE:2 [ main::r#2 main::r#1 ]
 Allocated zp ZP_BYTE:3 [ main::c#2 main::c#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test C64DTV v2 256-colors and the 16-color redefinable palette
   // Upstart

src/test/ref/c64dtv-gfxexplorer.log

@@ -15199,7 +15199,7 @@ Allocated zp ZP_BYTE:341 [ gfx_init_screen0::$2 ]
 Allocated zp ZP_BYTE:342 [ gfx_init_screen0::$3 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Interactive Explorer for C64DTV Screen Modes
   // Upstart

src/test/ref/c64dtv-gfxmodes.log

@@ -14126,7 +14126,7 @@ Allocated zp ZP_BYTE:293 [ mode_stdchar::$30 ]
 Allocated zp ZP_BYTE:294 [ print_str_lines::ch#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Exploring C64DTV Screen Modes
   // Upstart

src/test/ref/call-parameter-autocast.log

@@ -260,7 +260,7 @@ Allocated zp ZP_WORD:3 [ print::w#3 ]
 Allocated zp ZP_BYTE:5 [ print::$0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test auto-casting of call-parameters
   // Upstart

src/test/ref/callconstparam.log

@@ -265,7 +265,7 @@ Allocated zp ZP_WORD:3 [ screen#16 screen#10 screen#4 ]
 Allocated zp ZP_BYTE:5 [ line::x#2 line::x#0 line::x#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Multiple calls with different (constant?) parameters should yield different values at runtime
 // Currently the same constant parameter is passed on every call.

src/test/ref/cast-deref.log

@@ -136,7 +136,7 @@ Complete equivalence classes
 Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Example of NOP-casting a dereferenced signed byte to a byte
   // Upstart

src/test/ref/cast-not-needed-2.log

@@ -227,7 +227,7 @@ Allocated zp ZP_WORD:2 [ main::getScreen1_return#0 ]
 Allocated zp ZP_WORD:4 [ main::spritePtr1_return#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests a cast that is not needed
   // Upstart

src/test/ref/cast-not-needed-3.log

@@ -232,7 +232,7 @@ Allocated zp ZP_WORD:4 [ main::spritePtr1_$0#0 ]
 Allocated zp ZP_BYTE:6 [ main::spritePtr1_return#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests a cast that is not needed
   // Upstart

src/test/ref/cast-not-needed.log

@@ -120,7 +120,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests a cast that is not needed
   // Upstart

src/test/ref/cast-precedence-problem.log

@@ -233,7 +233,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests that casting inside constants in the output handles precedence between cast and + correctly - should generate the following KA-expression ($ff & sumw>>1)+1
   // Upstart

src/test/ref/casting.log

@@ -362,7 +362,7 @@ Allocated zp ZP_BYTE:5 [ main::sb#0 ]
 Allocated zp ZP_BYTE:6 [ w::b2#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/chargen.log

@@ -381,7 +381,7 @@ Allocated zp ZP_BYTE:7 [ main::c#2 ]
 Allocated zp ZP_BYTE:8 [ main::$1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/chessboard.log

@@ -284,7 +284,7 @@ Allocated zp ZP_BYTE:7 [ main::column#2 main::column#1 ]
 Allocated zp ZP_BYTE:8 [ main::color#3 main::color#5 main::color#2 main::color#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Draws a chess board in the upper left corner of the screen
   // Upstart

src/test/ref/cia-timer-cyclecount.log

@@ -721,7 +721,7 @@ Allocated zp ZP_BYTE:29 [ print_byte_at::$2 ]
 Allocated zp ZP_DWORD:30 [ clock::return#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Counting cycles using a CIA timer
   // Upstart

src/test/ref/cia-timer-simple.log

@@ -689,7 +689,7 @@ Allocated zp ZP_BYTE:21 [ print_byte_at::$2 ]
 Allocated zp ZP_DWORD:22 [ clock::return#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Setup and run a simple CIA-timer
   // Upstart

src/test/ref/clobber-a-problem.log

@@ -244,7 +244,7 @@ Allocated zp ZP_BYTE:3 [ irq_raster_next#0 irq_raster_next#1 ]
 Allocated zp ZP_BYTE:4 [ irq::$0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/coalesce-assignment.log

@@ -245,7 +245,7 @@ Allocated zp ZP_BYTE:6 [ main::f#0 ]
 Allocated zp ZP_BYTE:7 [ main::g#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests variable coalescing over assignments
   // Upstart

src/test/ref/code-after-return-1.log

@@ -155,7 +155,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test code after return in main()
   // Upstart

src/test/ref/code-after-return.log

@@ -88,7 +88,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test code after return in main()
   // Upstart

src/test/ref/comma-decl-for.log

@@ -146,7 +146,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
 Allocated zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests comma-separated declarations inside for()
   // Upstart

src/test/ref/comma-decl.log

@@ -131,7 +131,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests comma-separated declarations
   // Upstart

src/test/ref/comma-expr-1.log

@@ -106,7 +106,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests simple comma-expression (in parenthesis)
   // Upstart

src/test/ref/comma-expr-2.log

@@ -93,7 +93,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests simple comma-expressions (without parenthesis)
   // Upstart

src/test/ref/comma-expr-for.log

@@ -150,7 +150,7 @@ Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
 Allocated zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests comma-expressions in for()-statement
   // Upstart

src/test/ref/comparison-rewriting-pointer.log

@@ -204,7 +204,7 @@ Allocated zp ZP_WORD:2 [ main::sc#2 main::sc#1 ]
 Allocated zp ZP_WORD:4 [ main::cc#2 main::cc#1 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test rewriting of constant comparisons for pointers
   // Upstart

src/test/ref/comparison-rewriting.log

@@ -509,7 +509,7 @@ Allocated zp ZP_WORD:6 [ main::screen#11 main::screen#1 ]
 Allocated zp ZP_BYTE:8 [ main::$4 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test rewriting of constant comparisons
   // Upstart

src/test/ref/complex-conditional-problem.log

@@ -179,7 +179,7 @@ Complete equivalence classes
 Allocated zp ZP_BYTE:2 [ main::key#2 main::key#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Test to provoke Exception when using complex || condition
   // Upstart

src/test/ref/complex/ataritempest/ataritempest.log

@@ -183,7 +183,7 @@ Complete equivalence classes
 Allocated zp ZP_BYTE:2 [ entryPoint::i#2 entryPoint::i#1 ]
 
 INITIAL ASM
-Target platform is custom
+Target platform is custom / 6502X
   // File Comments
 // Atari Tempest ROM Development Template
 // Each function of the kernal is a no-args function

src/test/ref/complex/clearscreen/clearscreen.log

@@ -5211,7 +5211,7 @@ Allocated zp ZP_BYTE:184 [ processChars::$39 ]
 Allocated zp ZP_BYTE:185 [ processChars::$33 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Clears start screen throwing around the letters (by turning them into sprites)
   // Upstart

src/test/ref/complex/medusa/medusa.log

@@ -384,7 +384,7 @@ Allocated zp ZP_WORD:8 [ memcpy::dst#2 memcpy::dst#4 memcpy::dst#1 ]
 Allocated zp ZP_WORD:10 [ memcpy::src_end#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Display  MEDUSA PETSCII by Buzz_clik
 // https://csdb.dk/release/?id=178673

src/test/ref/complex/splines/truetype-splines.log

@@ -6221,7 +6221,7 @@ Allocated zp ZP_BYTE:310 [ mulf_init::$12 ]
 Allocated zp ZP_BYTE:311 [ mulf_init::$13 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Show a few simple splines using the splines library
   // Upstart

src/test/ref/complex/tetris/test-sprites.log

@@ -2136,7 +2136,7 @@ Allocated zp ZP_BYTE:25 [ sprites_irq::ptr#1 ]
 Allocated zp ZP_BYTE:26 [ sprites_irq::ptr#2 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
   // Upstart
 .pc = $801 "Basic"

src/test/ref/complex/tetris/tetris.log

@@ -13834,7 +13834,7 @@ Allocated zp ZP_BYTE:222 [ sprites_irq::ptr#1 ]
 Allocated zp ZP_BYTE:223 [ sprites_irq::ptr#2 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tetris Game for the Commodore 64
 // The tetris game tries to match NES tetris gameplay pretty closely

src/test/ref/complex/xmega65/xmega65.log

@@ -622,7 +622,7 @@ Allocated zp ZP_WORD:11 [ memset::dst#2 memset::dst#4 memset::dst#1 ]
 Allocated zp ZP_WORD:13 [ memset::end#0 ]
 
 INITIAL ASM
-Target platform is custom
+Target platform is custom / 6502X
   // File Comments
 // XMega65 Kernal Development Template
 // Each function of the kernal is a no-args function

src/test/ref/condition-integer-0.log

@@ -382,7 +382,7 @@ Allocated zp ZP_WORD:4 [ main::i1#2 main::i1#1 ]
 Allocated zp ZP_BYTE:6 [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests using integer conditions in if()
 // This should produce '+ ++ ++' at the top of the screen

src/test/ref/condition-integer-1.log

@@ -384,7 +384,7 @@ Allocated zp ZP_WORD:4 [ main::i1#2 main::i1#1 ]
 Allocated zp ZP_BYTE:6 [ main::idx#12 main::idx#17 main::idx#5 main::idx#6 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests using integer conditions in if()
 // This should produce '0 0 0' at the top of the screen

src/test/ref/condition-integer-2.log

@@ -323,7 +323,7 @@ Allocated zp ZP_BYTE:6 [ main::k#2 main::k#1 ]
 Allocated zp ZP_BYTE:7 [ idx#12 idx#13 idx#4 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests using integer conditions in while() / for() / do..while
 // This should produce 'ba ba ba' at the top of the screen

src/test/ref/condition-integer-3.log

@@ -210,7 +210,7 @@ Allocated zp ZP_BYTE:3 [ main::idx#2 main::idx#1 ]
 Allocated zp ZP_BYTE:4 [ main::j#0 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests using integer conditions in ternary operator
 // This should produce '++0++' at the top of the screen

src/test/ref/condition-integer-4.log

@@ -408,7 +408,7 @@ Allocated zp ZP_BYTE:8 [ main::$11 ]
 Allocated zp ZP_BYTE:9 [ main::$12 ]
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests using integer conditions in && and || operator
 // This should produce '01010101', '00110011', '00010001', '01110111' at the top of the screen

src/test/ref/condition-type-mismatch.log

@@ -112,7 +112,7 @@ Initial phi equivalence classes
 Complete equivalence classes
 
 INITIAL ASM
-Target platform is c64basic
+Target platform is c64basic / 6502X
   // File Comments
 // Tests a condition type mismatch (not boolean)
   // Upstart