diff --git a/doc/notes.txt b/doc/notes.txt index 70409560..e7985340 100644 --- a/doc/notes.txt +++ b/doc/notes.txt @@ -1,13 +1,11 @@ TODO: -- download ROM file - NaN in cycle count for macros - debugging of scan line overflow - confuse code/data in listing - show memory locations hovering over lines - don't play sound when debugging -- coalesce compile events - don't check against ROM signatures - better errors when ROM format wrong - debugging inside of bank switching??? relocated segs? @@ -17,12 +15,14 @@ TODO: - show other TIA internal values - case sensisitvity looking for mismatch variables - remove pulldown when no preset? -- some units test maybe - can't step after reset (or when funky frame; TIA frame is out of sync) - break on BRK/illegal opcode? -- last used filename for each platform -- skeleton for each platform/tool +- skeleton for each platform/tool (check?) - disassembler/debugger - multiple breakpoints, expression breakpoints - +- current exec. pos in gutter +- cc65: parse listing +- faster Z80 compile +- projects w/ multiple files, navigation (need refactor UI) +- nes: tools (nesst, tiled) https://shiru.untergrund.net/software.shtml diff --git a/src/worker/acme.js b/src/worker/asmjs/acme.js similarity index 100% rename from src/worker/acme.js rename to src/worker/asmjs/acme.js diff --git a/src/worker/ca65.js b/src/worker/asmjs/ca65.js similarity index 100% rename from src/worker/ca65.js rename to src/worker/asmjs/ca65.js diff --git a/src/worker/caspr.js b/src/worker/asmjs/caspr.js similarity index 100% rename from src/worker/caspr.js rename to src/worker/asmjs/caspr.js diff --git a/src/worker/cc65.js b/src/worker/asmjs/cc65.js similarity index 100% rename from src/worker/cc65.js rename to src/worker/asmjs/cc65.js diff --git a/src/worker/co65.js b/src/worker/asmjs/co65.js similarity index 100% rename from src/worker/co65.js rename to src/worker/asmjs/co65.js diff --git a/src/worker/dasm.js b/src/worker/asmjs/dasm.js similarity index 100% rename from src/worker/dasm.js rename to src/worker/asmjs/dasm.js diff --git a/src/worker/ld65.js b/src/worker/asmjs/ld65.js similarity index 100% rename from src/worker/ld65.js rename to src/worker/asmjs/ld65.js diff --git a/src/worker/mcpp.js b/src/worker/asmjs/mcpp.js similarity index 100% rename from src/worker/mcpp.js rename to src/worker/asmjs/mcpp.js diff --git a/src/worker/plasm.js b/src/worker/asmjs/plasm.js similarity index 100% rename from src/worker/plasm.js rename to src/worker/asmjs/plasm.js diff --git a/src/worker/sdasz80.js b/src/worker/asmjs/sdasz80.js similarity index 100% rename from src/worker/sdasz80.js rename to src/worker/asmjs/sdasz80.js diff --git a/src/worker/sdcc.js b/src/worker/asmjs/sdcc.js similarity index 100% rename from src/worker/sdcc.js rename to src/worker/asmjs/sdcc.js diff --git a/src/worker/sdldz80.js b/src/worker/asmjs/sdldz80.js similarity index 100% rename from src/worker/sdldz80.js rename to src/worker/asmjs/sdldz80.js diff --git a/src/worker/verilator_bin.js b/src/worker/asmjs/verilator_bin.js similarity index 100% rename from src/worker/verilator_bin.js rename to src/worker/asmjs/verilator_bin.js diff --git a/src/worker/xasm6809.js b/src/worker/asmjs/xasm6809.js similarity index 100% rename from src/worker/xasm6809.js rename to src/worker/asmjs/xasm6809.js diff --git a/src/worker/z80asm.js b/src/worker/asmjs/z80asm.js similarity index 100% rename from src/worker/z80asm.js rename to src/worker/asmjs/z80asm.js diff --git a/src/worker/fs65-apple2.data b/src/worker/fs/fs65-apple2.data similarity index 100% rename from src/worker/fs65-apple2.data rename to src/worker/fs/fs65-apple2.data diff --git a/src/worker/fs65-apple2.js b/src/worker/fs/fs65-apple2.js similarity index 100% rename from src/worker/fs65-apple2.js rename to src/worker/fs/fs65-apple2.js diff --git a/src/worker/fs65-apple2.js.metadata b/src/worker/fs/fs65-apple2.js.metadata similarity index 100% rename from src/worker/fs65-apple2.js.metadata rename to src/worker/fs/fs65-apple2.js.metadata diff --git a/src/worker/fs65-atari8.data b/src/worker/fs/fs65-atari8.data similarity index 100% rename from src/worker/fs65-atari8.data rename to src/worker/fs/fs65-atari8.data diff --git a/src/worker/fs65-atari8.js b/src/worker/fs/fs65-atari8.js similarity index 100% rename from src/worker/fs65-atari8.js rename to src/worker/fs/fs65-atari8.js diff --git a/src/worker/fs65-atari8.js.metadata b/src/worker/fs/fs65-atari8.js.metadata similarity index 100% rename from src/worker/fs65-atari8.js.metadata rename to src/worker/fs/fs65-atari8.js.metadata diff --git a/src/worker/fs65-c64.data b/src/worker/fs/fs65-c64.data similarity index 100% rename from src/worker/fs65-c64.data rename to src/worker/fs/fs65-c64.data diff --git a/src/worker/fs65-c64.js b/src/worker/fs/fs65-c64.js similarity index 100% rename from src/worker/fs65-c64.js rename to src/worker/fs/fs65-c64.js diff --git a/src/worker/fs65-c64.js.metadata b/src/worker/fs/fs65-c64.js.metadata similarity index 100% rename from src/worker/fs65-c64.js.metadata rename to src/worker/fs/fs65-c64.js.metadata diff --git a/src/worker/fs65-nes.data b/src/worker/fs/fs65-nes.data similarity index 100% rename from src/worker/fs65-nes.data rename to src/worker/fs/fs65-nes.data diff --git a/src/worker/fs65-nes.js b/src/worker/fs/fs65-nes.js similarity index 100% rename from src/worker/fs65-nes.js rename to src/worker/fs/fs65-nes.js diff --git a/src/worker/fs65-nes.js.metadata b/src/worker/fs/fs65-nes.js.metadata similarity index 100% rename from src/worker/fs65-nes.js.metadata rename to src/worker/fs/fs65-nes.js.metadata diff --git a/src/worker/fssdcc.data b/src/worker/fs/fssdcc.data similarity index 100% rename from src/worker/fssdcc.data rename to src/worker/fs/fssdcc.data diff --git a/src/worker/fssdcc.js b/src/worker/fs/fssdcc.js similarity index 100% rename from src/worker/fssdcc.js rename to src/worker/fs/fssdcc.js diff --git a/src/worker/fssdcc.js.metadata b/src/worker/fs/fssdcc.js.metadata similarity index 100% rename from src/worker/fssdcc.js.metadata rename to src/worker/fs/fssdcc.js.metadata diff --git a/src/worker/workermain.js b/src/worker/workermain.js index e90f89c3..e994a0c1 100644 --- a/src/worker/workermain.js +++ b/src/worker/workermain.js @@ -140,12 +140,12 @@ var wasmBlob = {}; function loadFilesystem(name) { var xhr = new XMLHttpRequest(); xhr.responseType = 'blob'; - xhr.open("GET", "fs"+name+".data", false); // synchronous request + xhr.open("GET", "fs/fs"+name+".data", false); // synchronous request xhr.send(null); fsBlob[name] = xhr.response; xhr = new XMLHttpRequest(); xhr.responseType = 'json'; - xhr.open("GET", "fs"+name+".js.metadata", false); // synchronous request + xhr.open("GET", "fs/fs"+name+".js.metadata", false); // synchronous request xhr.send(null); fsMeta[name] = xhr.response; console.log("Loaded "+name+" filesystem", fsMeta[name].files.length, 'files', fsBlob[name].size, 'bytes'); @@ -154,7 +154,7 @@ function loadFilesystem(name) { var loaded = {} function load(modulename, debug) { if (!loaded[modulename]) { - importScripts(modulename+(debug?"."+debug+".js":".js")); + importScripts('asmjs/'+modulename+(debug?"."+debug+".js":".js")); loaded[modulename] = 1; } } @@ -178,7 +178,7 @@ function loadNative(modulename, debug) { // detect WASM if (typeof WebAssembly === 'object') { loadWASM(modulename); - return wasmBlob['sdcc']; + return wasmBlob[modulename]; } else { load(modulename); } @@ -1320,7 +1320,7 @@ function compileInlineASM(code, platform, options, errors, asmlines) { function compileVerilator(code, platform, options) { loadNative("verilator_bin"); - load("verilator2js"); + load("../verilator2js"); var errors = []; var asmlines = []; code = compileInlineASM(code, platform, options, errors, asmlines);