vcs: added prelim cc65 support (using old compiler, new .lib/.h and custom .cfg)

presets/vcs/ecs/kernel1.ecs

@@ -0,0 +1,147 @@
+
+//#resource "vcs-ca65.h"
+
+import "vcslib.ecs"
+import "sprites.ecs"
+
+system Kernel1Sprite
+    locals 7
+
+    on kernelsetup do with [Sprite]
+---
+; set player object flags
+    lda {{<plyrflags}}
+    sta NUSIZ0
+    sta REFP0
+---
+
+    on kernelsetup do with
+    [Sprite,HasBitmap,HasColormap,HasYpos]
+---
+; calculate screen height - ypos
+    lda {{<lines}}
+    clc
+    adc #32
+    sec
+    sbc {{<ypos}}
+    sta {{$5}}
+; calculate bitmap pointer
+    stx {{$6}}		; save X (Sprite index)
+    lda {{<bitmap}}     ; deref bitmap
+    tax
+    lda {{<Bitmap:bitmapdata}},x
+    sec
+    sbc {{$5}}
+    sta {{$0}}	; Y = sprite slot index
+    lda {{>Bitmap:bitmapdata}},x
+    sbc #0
+    sta {{$1}}
+; get bitmap height
+    lda {{<Bitmap:height}},x
+    sta {{$4}}
+; calculate colormap pointer
+    ldx {{$6}}		; restore X
+    lda {{<colormap}}	; deref colormap
+    tax
+    lda {{<Colormap:colormapdata}},x
+    sec
+    sbc {{$5}}
+    sta {{$2}}
+    lda {{>Colormap:colormapdata}},x
+    sbc #0
+    sta {{$3}}
+; save ypos
+    ldx {{$6}}		; restore X
+    lda {{<ypos}}
+    sta {{$5}}
+@nosprite:
+---
+
+// TODO: what if > 1 player? or missile?
+    on kernelsetup do with [Sprite,HasXpos]
+---
+    ldy #0
+    lda {{<xpos}}
+    {{!SetHorizPos}}
+    sta HMOVE
+---
+    on prescanline do once
+---
+; draw player 0
+    lda {{$4}} ; height
+    dcp {{$5}} ; ypos
+    bcs @DoDraw1
+    lda #0
+    .byte $2C
+@DoDraw1:
+    lda ({{$0}}),y
+---
+    on scanline do once
+---
+    sta GRP0
+    lda ({{$2}}),y
+    sta COLUP0
+---
+    on kerneldone do once
+---
+    lda #0
+    sta GRP0
+    sta GRP1
+    sta GRP0
+    sta GRP1
+---
+end
+
+system KernelMissile
+    locals 1
+// TODO: unroll loops
+    on preframe do foreach [Missile,HasYpos] limit 1
+---
+    lda {{<ypos}}
+    sta {{$0}}
+---
+    on scanline do foreach [Missile,HasYpos] limit 1
+---
+    dec {{$0}}
+    php
+    pla
+    sta ENAM0+{{const index}}-2
+---
+    on kerneldone do foreach [Missile,HasYpos] limit 1
+---
+; skip 3 lines each kernel section
+    lda #0
+    sta ENAM0+{{const index}}-2
+    dec {{$0}}
+    dec {{$0}}
+    dec {{$0}}
+---
+end
+
+system KernelCollide
+    locals 1
+    on preframe do once
+    ---
+    lda #$ff
+    sta {{$0}}		; object index if collision
+    ---
+    on kernelsetup do once
+    ---
+    sta CXCLR		; clear collision flags
+    --- 
+    on kerneldone do with [Sprite]
+    ---
+    lda CXM1P
+    bpl @nocollide	; missile 1 <-> player 0?
+    stx {{$0}}		; save object index
+@nocollide:
+    ---
+// TODO: somehow avoid select? pass arg to explode?
+    on postframe do select [Sprite]
+    ---
+    ldx {{$0}}  	; get object index
+    bmi @noexplode	; was there collision?
+    {{!explode}}
+@noexplode:
+    ---
+end

presets/vcs/ecs/vcslib.ecs

@@ -7,6 +7,7 @@ system Init
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

src/platform/vcs.ts

@@ -60,6 +60,7 @@ function getToolForFilename_vcs(fn: string) {
   if (fn.endsWith(".wiz")) return "wiz";
   if (fn.endsWith(".bb") || fn.endsWith(".bas")) return "bataribasic";
   if (fn.endsWith(".ca65")) return "ca65";
+  if (fn.endsWith(".c")) return "cc65";
   if (fn.endsWith(".ecs")) return "ecs";
   return "dasm";
 }

src/worker/fs/fs65-atari2600.js

@@ -0,0 +1,210 @@
+
+  var Module = typeof Module !== 'undefined' ? Module : {};
+
+  if (!Module.expectedDataFileDownloads) {
+    Module.expectedDataFileDownloads = 0;
+  }
+
+  Module.expectedDataFileDownloads++;
+  (function() {
+    // Do not attempt to redownload the virtual filesystem data when in a pthread or a Wasm Worker context.
+    if (Module['ENVIRONMENT_IS_PTHREAD'] || Module['$ww']) return;
+    var loadPackage = function(metadata) {
+
+      var PACKAGE_PATH = '';
+      if (typeof window === 'object') {
+        PACKAGE_PATH = window['encodeURIComponent'](window.location.pathname.toString().substring(0, window.location.pathname.toString().lastIndexOf('/')) + '/');
+      } else if (typeof process === 'undefined' && typeof location !== 'undefined') {
+        // web worker
+        PACKAGE_PATH = encodeURIComponent(location.pathname.toString().substring(0, location.pathname.toString().lastIndexOf('/')) + '/');
+      }
+      var PACKAGE_NAME = '/home/pzp/8bitworkshop-compilers/output/fs/fs65-atari2600.data';
+      var REMOTE_PACKAGE_BASE = 'fs65-atari2600.data';
+      if (typeof Module['locateFilePackage'] === 'function' && !Module['locateFile']) {
+        Module['locateFile'] = Module['locateFilePackage'];
+        err('warning: you defined Module.locateFilePackage, that has been renamed to Module.locateFile (using your locateFilePackage for now)');
+      }
+      var REMOTE_PACKAGE_NAME = Module['locateFile'] ? Module['locateFile'](REMOTE_PACKAGE_BASE, '') : REMOTE_PACKAGE_BASE;
+var REMOTE_PACKAGE_SIZE = metadata['remote_package_size'];
+
+      function fetchRemotePackage(packageName, packageSize, callback, errback) {
+        if (typeof process === 'object' && typeof process.versions === 'object' && typeof process.versions.node === 'string') {
+          require('fs').readFile(packageName, function(err, contents) {
+            if (err) {
+              errback(err);
+            } else {
+              callback(contents.buffer);
+            }
+          });
+          return;
+        }
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', packageName, true);
+        xhr.responseType = 'arraybuffer';
+        xhr.onprogress = function(event) {
+          var url = packageName;
+          var size = packageSize;
+          if (event.total) size = event.total;
+          if (event.loaded) {
+            if (!xhr.addedTotal) {
+              xhr.addedTotal = true;
+              if (!Module.dataFileDownloads) Module.dataFileDownloads = {};
+              Module.dataFileDownloads[url] = {
+                loaded: event.loaded,
+                total: size
+              };
+            } else {
+              Module.dataFileDownloads[url].loaded = event.loaded;
+            }
+            var total = 0;
+            var loaded = 0;
+            var num = 0;
+            for (var download in Module.dataFileDownloads) {
+            var data = Module.dataFileDownloads[download];
+              total += data.total;
+              loaded += data.loaded;
+              num++;
+            }
+            total = Math.ceil(total * Module.expectedDataFileDownloads/num);
+            if (Module['setStatus']) Module['setStatus']('Downloading data... (' + loaded + '/' + total + ')');
+          } else if (!Module.dataFileDownloads) {
+            if (Module['setStatus']) Module['setStatus']('Downloading data...');
+          }
+        };
+        xhr.onerror = function(event) {
+          throw new Error("NetworkError for: " + packageName);
+        }
+        xhr.onload = function(event) {
+          if (xhr.status == 200 || xhr.status == 304 || xhr.status == 206 || (xhr.status == 0 && xhr.response)) { // file URLs can return 0
+            var packageData = xhr.response;
+            callback(packageData);
+          } else {
+            throw new Error(xhr.statusText + " : " + xhr.responseURL);
+          }
+        };
+        xhr.send(null);
+      };
+
+      function handleError(error) {
+        console.error('package error:', error);
+      };
+
+      var fetchedCallback = null;
+      var fetched = Module['getPreloadedPackage'] ? Module['getPreloadedPackage'](REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE) : null;
+
+      if (!fetched) fetchRemotePackage(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE, function(data) {
+        if (fetchedCallback) {
+          fetchedCallback(data);
+          fetchedCallback = null;
+        } else {
+          fetched = data;
+        }
+      }, handleError);
+
+    function runWithFS() {
+
+      function assert(check, msg) {
+        if (!check) throw msg + new Error().stack;
+      }
+Module['FS_createPath']("/", "asminc", true, true);
+Module['FS_createPath']("/", "cfg", true, true);
+Module['FS_createPath']("/", "include", true, true);
+Module['FS_createPath']("/include", "arpa", true, true);
+Module['FS_createPath']("/include", "em", true, true);
+Module['FS_createPath']("/include", "geos", true, true);
+Module['FS_createPath']("/include", "joystick", true, true);
+Module['FS_createPath']("/include", "mouse", true, true);
+Module['FS_createPath']("/include", "sys", true, true);
+Module['FS_createPath']("/include", "tgi", true, true);
+Module['FS_createPath']("/", "lib", true, true);
+
+      /** @constructor */
+      function DataRequest(start, end, audio) {
+        this.start = start;
+        this.end = end;
+        this.audio = audio;
+      }
+      DataRequest.prototype = {
+        requests: {},
+        open: function(mode, name) {
+          this.name = name;
+          this.requests[name] = this;
+          Module['addRunDependency']('fp ' + this.name);
+        },
+        send: function() {},
+        onload: function() {
+          var byteArray = this.byteArray.subarray(this.start, this.end);
+          this.finish(byteArray);
+        },
+        finish: function(byteArray) {
+          var that = this;
+          // canOwn this data in the filesystem, it is a slide into the heap that will never change
+          Module['FS_createDataFile'](this.name, null, byteArray, true, true, true);
+          Module['removeRunDependency']('fp ' + that.name);
+          this.requests[this.name] = null;
+        }
+      };
+
+      var files = metadata['files'];
+      for (var i = 0; i < files.length; ++i) {
+        new DataRequest(files[i]['start'], files[i]['end'], files[i]['audio'] || 0).open('GET', files[i]['filename']);
+      }
+
+      function processPackageData(arrayBuffer) {
+        assert(arrayBuffer, 'Loading data file failed.');
+        assert(arrayBuffer.constructor.name === ArrayBuffer.name, 'bad input to processPackageData');
+        var byteArray = new Uint8Array(arrayBuffer);
+        var curr;
+        // Reuse the bytearray from the XHR as the source for file reads.
+          DataRequest.prototype.byteArray = byteArray;
+          var files = metadata['files'];
+          for (var i = 0; i < files.length; ++i) {
+            DataRequest.prototype.requests[files[i].filename].onload();
+          }          Module['removeRunDependency']('datafile_/home/pzp/8bitworkshop-compilers/output/fs/fs65-atari2600.data');
+
+      };
+      Module['addRunDependency']('datafile_/home/pzp/8bitworkshop-compilers/output/fs/fs65-atari2600.data');
+
+      if (!Module.preloadResults) Module.preloadResults = {};
+
+      Module.preloadResults[PACKAGE_NAME] = {fromCache: false};
+      if (fetched) {
+        processPackageData(fetched);
+        fetched = null;
+      } else {
+        fetchedCallback = processPackageData;
+      }
+
+    }
+    if (Module['calledRun']) {
+      runWithFS();
+    } else {
+      if (!Module['preRun']) Module['preRun'] = [];
+      Module["preRun"].push(runWithFS); // FS is not initialized yet, wait for it
+    }
+
+    Module['removeRunDependency']('fs65-atari2600.js.metadata');
+  }
+
+  function runMetaWithFS() {
+    Module['addRunDependency']('fs65-atari2600.js.metadata');
+    var REMOTE_METADATA_NAME = Module['locateFile'] ? Module['locateFile']('fs65-atari2600.js.metadata', '') : 'fs65-atari2600.js.metadata';
+    var xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = function() {
+     if (xhr.readyState === 4 && xhr.status === 200) {
+       loadPackage(JSON.parse(xhr.responseText));
+     }
+    }
+    xhr.open('GET', REMOTE_METADATA_NAME, true);
+    xhr.overrideMimeType('application/json');
+    xhr.send(null);
+  }
+
+  if (Module['calledRun']) {
+    runMetaWithFS();
+  } else {
+    if (!Module['preRun']) Module['preRun'] = [];
+    Module["preRun"].push(runMetaWithFS);
+  }
+
+  })();

src/worker/lib/vcs/atari2600.cfg

@@ -10,6 +10,7 @@ MEMORY {
 
 SEGMENTS {
        RODATA:   load=ROM, type=ro, align=$100;	
+       STARTUP:  load=ROM, type=ro, optional=yes;
        CODE:     load=ROM, type=ro, define=yes;
        DATA:     load=ROM, run=RAM, type=rw, define=yes;
        BSS:      load=RAM, type=bss, define=yes;

src/worker/workermain.ts

@@ -87,6 +87,8 @@ var PLATFORM_PARAMS = {
     wiz_inc_dir: '2600',
     extra_link_files: ['atari2600.cfg'],
     cfgfile: 'atari2600.cfg',
+    libargs: ['atari2600.lib'],
+    define: ['__ATARI2600__'],
   },
   'mw8080bw': {
     arch: 'z80',
@@ -832,7 +834,7 @@ export function setupFS(FS, name:string) {
   if (name === '65-vector') name = '65-none'; // TODO
   if (name === '65-atari7800') name = '65-none'; // TODO
   if (name === '65-devel') name = '65-none'; // TODO
-  if (name === '65-vcs') name = '65-none'; // TODO
+  if (name === '65-vcs') name = '65-atari2600'; // TODO
   if (!fsMeta[name]) throw Error("No filesystem for '" + name + "'");
   FS.mkdir('/share');
   FS.mount(WORKERFS, {
@@ -1185,7 +1187,8 @@ var TOOL_PRELOADFS = {
   'ca65-atari7800': '65-none',
   'cc65-devel': '65-none',
   'ca65-devel': '65-none',
-  'ca65-vcs': '65-none',
+  'cc65-vcs': '65-atari2600',
+  'ca65-vcs': '65-atari2600',
   'sdasz80': 'sdcc',
   'sdcc': 'sdcc',
   'sccz80': 'sccz80',
@@ -1194,7 +1197,7 @@ var TOOL_PRELOADFS = {
   'fastbasic': '65-atari8',
   'silice': 'Silice',
   'wiz': 'wiz',
-  'ecs-vcs': '65-none', // TODO: support multiple platforms
+  'ecs-vcs': '65-atari2600', // TODO: support multiple platforms
   'ecs-nes': '65-nes', // TODO: support multiple platforms
   'ecs-c64': '65-c64', // TODO: support multiple platforms
 }

test/ecs/bigdemo.txt

@@ -256,6 +256,7 @@ __Start:
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

test/ecs/kernel2.txt

@@ -135,6 +135,7 @@ __Start:
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

test/ecs/music.txt

@@ -52,6 +52,7 @@ __Start:
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

test/ecs/score.txt

@@ -65,6 +65,7 @@ __Start:
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

test/ecs/sound.txt

@@ -47,6 +47,7 @@ __Start:
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

test/ecs/superman.txt

@@ -641,6 +641,7 @@ __Start:
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

test/ecs/titles.txt

@@ -16,6 +16,7 @@ __Start:
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

test/ecs/vcslib.ecs

@@ -7,6 +7,7 @@ system Init
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK:

test/ecs/vcslib.txt

@@ -59,6 +59,7 @@ __Start:
 .include "vcs-ca65.h"
 .macpack longbranch
 .define PAL 0
+.segment "STARTUP"
 __NMI:
 __Reset:
 __BRK: