fiddling with z80asm/sccz80

src/emu.js

@@ -629,6 +629,7 @@ function getToolForFilename_z80(fn) {
   if (fn.endsWith(".c")) return "sdcc";
   if (fn.endsWith(".s")) return "sdasz80";
   if (fn.endsWith(".ns")) return "naken";
+  if (fn.endsWith(".scc")) return "sccz80";
   return "z80asm";
 }
 

src/worker/workermain.js

@@ -707,24 +707,27 @@ function compileCC65(code, platform) {
 
 function assembleZ80ASM(code, platform) {
   load("z80asm");
-  var origin = 0; // TODO: configurable
+  var params = PLATFORM_PARAMS[platform];
+  if (!params) throw Error("Platform not supported: " + platform);
   var Module = z80asm({
     noInitialRun:true,
     //logReadFiles:true,
     print:print_fn,
-    printErr:print_fn,
+    printErr:function() {},
     TOTAL_MEMORY:256*1024*1024,
   });
   var FS = Module['FS'];
   //setupFS(FS);
   // changes for dialect
-  code = code.replace(".optsdcc -mz80","");
-  code = code.replace(/^(\w+)\s*=/gim,"DEFC $1 =");
-  code = code.replace(/\tXREF /gi,"\tEXTERN ");
-  code = code.replace(/\tXDEF /gi,"\tPUBLIC ");
+  //code = code.replace(".optsdcc -mz80","");
+  //code = code.replace(/^(\w+)\s*=/gim,"DEFC $1 =");
+  //code = code.replace(/\tXREF /gi,"\tEXTERN ");
+  //code = code.replace(/\tXDEF /gi,"\tPUBLIC ");
   FS.writeFile("main.asm", code);
   try {
-    Module.callMain(["-b", "-s", "-l", "-m", "-g", "--origin=" + origin.toString(16), "main.asm"]);
+    Module.callMain(["-b", "-s", "-l", "-m", "-g",
+      "--origin=" + params.code_start.toString(16),
+      "main.asm"]);
     try {
       var aerr = FS.readFile("main.err", {'encoding':'utf8'}); // TODO
       if (aerr.length) {
@@ -758,6 +761,64 @@ l_main00101                     = 0003, L: test
   }
 }
 
+function compileSCCZ80(code, platform) {
+  var preproc = preprocessMCPP(code, platform, 'sccz80');
+  if (preproc.errors) return preproc;
+  else code = preproc.code;
+
+  var params = PLATFORM_PARAMS[platform];
+  if (!params) throw Error("Platform not supported: " + platform);
+  var errors = [];
+  var errorMatcher = makeErrorMatcher(errors, /sccz80:[^ ]+ L:(\d+) (.+)/, 1, 2);
+
+  load('sccz80');
+  //sccz80:hello.c L:1 Error:Can't open include file
+  var SCCZ80 = sccz80({
+    wasmBinary: wasmBlob['sccz80'],
+    noInitialRun:true,
+    //noFSInit:true,
+    print:errorMatcher,
+    printErr:errorMatcher,
+    TOTAL_MEMORY:256*1024*1024,
+  });
+  var FS = SCCZ80['FS'];
+  //setupStdin(FS, code);
+  setupFS(FS, 'sccz80');
+  code = code.replace('__asm', '#asm').replace('__endasm', '#endasm;');
+  FS.writeFile("main.i", code, {encoding:'utf8'});
+  var args = ['-ext=asm', '-opt-code-speed', '-mz80', '-standard-escape-chars', 'main.i', '-o', 'main.asm'];
+  if (params.extra_compile_args) {
+    args.push.apply(args, params.extra_compile_args);
+  }
+  starttime();
+  SCCZ80.callMain(args);
+  endtime("compile");
+  // TODO: preprocessor errors w/ correct file
+  if (errors.length /* && nwarnings < msvc_errors.length*/) {
+    return {errors:errors};
+  }
+  try {
+    var asmout = FS.readFile("main.asm", {encoding:'utf8'});
+    //asmout = " .area _HOME\n .area _CODE\n .area _INITIALIZER\n .area _DATA\n .area _INITIALIZED\n .area _BSEG\n .area _BSS\n .area _HEAP\n" + asmout;
+    //asmout = asmout.replace(".area _INITIALIZER",".area _CODE");
+    asmout = asmout.replace('INCLUDE "', ';;;INCLUDE "')
+  } catch (e) {
+    errors.push({line:1, msg:e+""});
+    return {errors:errors};
+  }
+  var warnings = errors;
+  try {
+    var result = assembleZ80ASM(asmout, platform, true);
+  } catch (e) {
+    errors.push({line:1, msg:e+""});
+    return {errors:errors};
+  }
+  result.asmlines = result.lines;
+  result.lines = result.srclines;
+  result.srclines = null;
+  return result;
+}
+
 function hexToArray(s, ofs) {
   var buf = new ArrayBuffer(s.length/2);
   var arr = new Uint8Array(buf);
@@ -895,7 +956,7 @@ function assemblelinkSDASZ80(code, platform) {
 
 var sdcc;
 function compileSDCC(code, platform) {
-  var preproc = preprocessMCPP(code, platform);
+  var preproc = preprocessMCPP(code, platform, 'sdcc');
   if (preproc.errors) return preproc;
   else code = preproc.code;
 
@@ -1005,7 +1066,7 @@ function assembleXASM6809(code, platform) {
   }
 }
 
-function preprocessMCPP(code, platform) {
+function preprocessMCPP(code, platform, toolname) {
   load("mcpp");
   var params = PLATFORM_PARAMS[platform];
   if (!params) throw Error("Platform not supported: " + platform);
@@ -1019,7 +1080,7 @@ function preprocessMCPP(code, platform) {
     printErr:match_fn,
   });
   var FS = MCPP['FS'];
-  setupFS(FS, 'sdcc');
+  setupFS(FS, toolname);
   FS.writeFile("main.c", code, {encoding:'utf8'});
   var args = [
     "-D", "__8BITWORKSHOP__",
@@ -1357,6 +1418,7 @@ var TOOLS = {
   'yosys': compileYosys,
   'caspr': compileCASPR,
   'jsasm': compileJSASM,
+  'sccz80': compileSCCZ80,
 }
 
 var TOOL_PRELOADFS = {
@@ -1370,6 +1432,7 @@ var TOOL_PRELOADFS = {
   'ca65-atari8': '65-atari8',
   'sdasz80': 'sdcc',
   'sdcc': 'sdcc',
+  'sccz80': 'sccz80',
 }
 
 function handleMessage(data) {

test/cli/testworker.js

@@ -53,10 +53,10 @@ describe('Worker', function() {
     compile('cc65', 'int main() {\nint x=1;\nprintf("%d",x);\nreturn x+2;\n}', 'nes-conio', done, 0, 0, 1);
   });
   it('should assemble Z80ASM', function(done) {
-    compile('z80asm', '\tMODULE test\n\tXREF _puts\n\tld	hl,$0000\n\tret\n', 'mw8080bw', done, 4, 2, 0);
+    compile('z80asm', '\tMODULE test\n\tEXTERN _puts\n\tld	hl,$0000\n\tret\n', 'mw8080bw', done, 4, 2, 0);
   });
   it('should NOT assemble Z80ASM', function(done) {
-    compile('z80asm', 'ddwiuweq', 'none', done, 0, 0, 1);
+    compile('z80asm', 'ddwiuweq', 'mw8080bw', done, 0, 0, 1);
   });
   it('should assemble SDASZ80', function(done) {
     compile('sdasz80', '\tld	hl,#0\n\tret\n', 'mw8080bw', done, 8192, 2);

test/cli/z80/z80test.js

@@ -1,13 +1,17 @@
 "use strict";
 
-global.window = global;
-
-require('../../../src/cpu/z80.js');
-
-var _global = window;
-_global.buildZ80({
-	applyContention: true
-});
+if (true) {
+	global.window = global;
+	require('../../../src/cpu/z80.js');
+	var _global = window;
+	_global.buildZ80({
+		applyContention: true
+	});
+} else {
+	var wtu = require('../workertestutils.js');
+	global.includeInThisContext('src/cpu/z80fast.js');
+	var _global = {Z80:Z80_fast};
+}
 
 var Memory = function(dump) {
 	var self = {};