diff --git a/doc/notes.txt b/doc/notes.txt index dfa6391d..dc7d8aa7 100644 --- a/doc/notes.txt +++ b/doc/notes.txt @@ -110,6 +110,7 @@ TODO: - can't add control instructions b/c of split - bad error msg if >2 moduels and top module doesn't match filename - separate Scope View + - Audio doesn't work if clock != default - single-stepping vector games makes screen fade - break on stack overflow, illegal op, bad access, BRK, etc - show in scope instead? @@ -157,6 +158,7 @@ TODO: - importing from subtree commits to root anyway - publishing Markdown file loads default file? - better text/binary detection (e.g. 0xa9 copyright) + - going into repo chooses wrong file if republished with different main - keyboard shortcuts - ctrl+alt+l on ubuntu locks screen - alt-D doesn't work anymore @@ -196,6 +198,8 @@ TODO: - more stuff like 7800 display lists - don't include start/end line on platforms w/o raster timing - memory map shows subroutine symbol even after RTS +- BIOS symbols + WEB WORKER FORMAT diff --git a/src/worker/workermain.ts b/src/worker/workermain.ts index 1ed0708e..0a461337 100644 --- a/src/worker/workermain.ts +++ b/src/worker/workermain.ts @@ -1653,7 +1653,7 @@ function compileVerilator(step:BuildStep) { }); starttime(); try { - var args = ["--cc", "-O3", "-DEXT_INLINE_ASM", "-DTOPMOD__"+topmod, + var args = ["--cc", "-O3"/*abcdefstzsuka*/, "-DEXT_INLINE_ASM", "-DTOPMOD__"+topmod, "-Wall", "-Wno-DECLFILENAME", "-Wno-UNUSED", '--report-unoptflat', "--x-assign", "fast", "--noassert", "--pins-bv", "33", "--top-module", topmod, step.path] diff --git a/test/cli/testplatforms.js b/test/cli/testplatforms.js index 1c48350a..83549bce 100644 --- a/test/cli/testplatforms.js +++ b/test/cli/testplatforms.js @@ -4,16 +4,7 @@ var fs = require('fs'); var wtu = require('./workertestutils.js'); var PNG = require('pngjs').PNG; -const jsdom = require('jsdom'); -const { JSDOM } = jsdom; -//const { window } = new JSDOM(); - -const dom = new JSDOM(`
`); -global.window = dom.window; -global.document = dom.window.document; -dom.window.Audio = null; -global.Image = function() { } -global['$'] = require("jquery/jquery.min.js"); +const dom = createTestDOM(); includeInThisContext('src/common/cpu/6809.js'); includeInThisContext("javatari.js/release/javatari/javatari.js"); Javatari.AUTO_START = false; diff --git a/test/cli/testverilog.js b/test/cli/testverilog.js index bdce1be8..e1833a23 100644 --- a/test/cli/testverilog.js +++ b/test/cli/testverilog.js @@ -2,6 +2,7 @@ var assert = require('assert'); var fs = require('fs'); var wtu = require('./workertestutils.js'); +createTestDOM(); var emu = require('gen/common/emu.js'); var verilog = require('gen/platform/verilog.js'); @@ -21,7 +22,7 @@ function loadPlatform(msg) { platform.loadROM("ROM", msg.output); platform.loadROM("ROM", msg.output); verilog.vl_finished = verilog.vl_stopped = false; - for (var i=0; i<10000 && !(verilog.vl_finished||verilog.vl_stopped); i++) { + for (var i=0; i<100000 && !(verilog.vl_finished||verilog.vl_stopped); i++) { platform.tick(); } assert.ok(!verilog.vl_stopped); @@ -42,7 +43,7 @@ function loadPlatform(msg) { function testPerf(msg) { var platform = new VerilogPlatform(); platform.loadROM("ROM", msg.output); - var niters = 2000000; + var niters = 5000000; console.time("before"); for (var i=0; i
`); + global.window = dom.window; + global.document = dom.window.document; + global['$'] = require("jquery/jquery.min.js"); + dom.window.Audio = null; + global.Image = function() { } + return dom; +}