romdevtools 0.71.0 → 0.84.0

package/src/playtest/resampler/resampler.c

@@ -0,0 +1,129 @@
+/* ── resampler.c — WASM+SIMD linear resampler for the romdev playtest audio sink ─
+ *
+ * Resamples interleaved S16 STEREO PCM from a source rate to a device rate.
+ *
+ * WHY this exists: the libretro CONTRACT is that a core declares its native audio
+ * rate in get_system_av_info and emits raw samples at that rate; the FRONTEND is
+ * responsible for resampling to the audio device (RetroArch does this in C with a
+ * sinc resampler). Every romdev core sits at 31–48 kHz EXCEPT the GameTank ACP at
+ * ~13983 Hz — 2.3x lower than the next core. At that rate SDL's fixed device
+ * buffer (4096 samples ≈ 293 ms) starves between 60 fps ticks that each feed only
+ * ~233 samples → clicks and pops. So the playtest sink opens the device at 48 kHz
+ * and resamples low-rate cores up to it. Doing that per-frame in JS is wasteful;
+ * this is the native-speed SIMD path (linear interp, 4 output frames/iteration).
+ *
+ * Build: see build.sh (emcc -O3 -msimd128). Exports rs_alloc/rs_free/rs_resample.
+ *
+ * Contract:
+ *   rs_resample(inPtr, inFrames, outPtr, outCap, srcRate, dstRate) -> outFrames
+ *     inPtr  : int16_t* interleaved L,R,L,R… at srcRate (inFrames stereo frames)
+ *     outPtr : int16_t* interleaved buffer with room for outCap stereo frames
+ *     returns the number of stereo frames written (<= outCap).
+ * The caller sizes outCap >= ceil(inFrames * dstRate/srcRate) + 1.
+ */
+#include <stdint.h>
+#include <wasm_simd128.h>
+#include <emscripten.h>
+
+#define EXPORT EMSCRIPTEN_KEEPALIVE
+
+/* scratch buffers live in the WASM heap, allocated from JS via rs_alloc. */
+EXPORT void *rs_alloc(int bytes) { return __builtin_malloc((unsigned long)bytes); }
+EXPORT void  rs_free(void *p)    { __builtin_free(p); }
+
+/* Linear-resample interleaved S16 stereo. Returns stereo frames written.
+ *
+ * For output frame i: srcPos = i / ratio = i * srcRate/dstRate. We split srcPos
+ * into integer index i0 and fraction f in [0,1): out = in[i0]*(1-f) + in[i0+1]*f
+ * per channel. We vectorize across 4 consecutive output frames: compute their 4
+ * srcPos in f32x4, their 4 integer indices and 4 fractions, gather the 8 source
+ * samples (can't SIMD-gather in wasm128, so scalar gather) but do the lerp math in
+ * SIMD. The gather dominates, but keeping the arithmetic in f32x4 + a single
+ * saturating narrow per 4 frames is still a clear win over per-sample JS.
+ */
+EXPORT int rs_resample(const int16_t *in, int inFrames,
+                       int16_t *out, int outCap,
+                       int srcRate, int dstRate) {
+  if (inFrames < 2 || srcRate <= 0 || dstRate <= 0) return 0;
+  if (srcRate == dstRate) {
+    int n = inFrames < outCap ? inFrames : outCap;
+    for (int i = 0; i < n * 2; i++) out[i] = in[i];
+    return n;
+  }
+
+  /* step = srcRate/dstRate in source frames per output frame (fixed math in f64). */
+  const double step = (double)srcRate / (double)dstRate;
+  long outFrames = (long)((double)inFrames * (double)dstRate / (double)srcRate);
+  if (outFrames > outCap) outFrames = outCap;
+  const int maxI0 = inFrames - 2; /* so i0+1 is valid */
+
+  long i = 0;
+  /* SIMD body: 4 output frames per iteration. */
+  for (; i + 4 <= outFrames; i += 4) {
+    /* source positions for the 4 frames */
+    double p0 = (double)(i + 0) * step;
+    double p1 = (double)(i + 1) * step;
+    double p2 = (double)(i + 2) * step;
+    double p3 = (double)(i + 3) * step;
+
+    int i0_0 = (int)p0, i0_1 = (int)p1, i0_2 = (int)p2, i0_3 = (int)p3;
+    if (i0_0 > maxI0) i0_0 = maxI0; if (i0_1 > maxI0) i0_1 = maxI0;
+    if (i0_2 > maxI0) i0_2 = maxI0; if (i0_3 > maxI0) i0_3 = maxI0;
+
+    /* fractions as f32x4 */
+    v128_t frac = wasm_f32x4_make((float)(p0 - i0_0), (float)(p1 - i0_1),
+                                  (float)(p2 - i0_2), (float)(p3 - i0_3));
+    v128_t inv  = wasm_f32x4_sub(wasm_f32x4_splat(1.0f), frac);
+
+    /* gather the 8 source samples per channel (scalar — no wasm128 gather). */
+    v128_t l0 = wasm_f32x4_make((float)in[(i0_0*2)],   (float)in[(i0_1*2)],
+                                (float)in[(i0_2*2)],   (float)in[(i0_3*2)]);
+    v128_t l1 = wasm_f32x4_make((float)in[(i0_0*2)+2], (float)in[(i0_1*2)+2],
+                                (float)in[(i0_2*2)+2], (float)in[(i0_3*2)+2]);
+    v128_t r0 = wasm_f32x4_make((float)in[(i0_0*2)+1], (float)in[(i0_1*2)+1],
+                                (float)in[(i0_2*2)+1], (float)in[(i0_3*2)+1]);
+    v128_t r1 = wasm_f32x4_make((float)in[(i0_0*2)+3], (float)in[(i0_1*2)+3],
+                                (float)in[(i0_2*2)+3], (float)in[(i0_3*2)+3]);
+
+    /* lerp: l = l0*inv + l1*frac */
+    v128_t lo = wasm_f32x4_add(wasm_f32x4_mul(l0, inv), wasm_f32x4_mul(l1, frac));
+    v128_t ro = wasm_f32x4_add(wasm_f32x4_mul(r0, inv), wasm_f32x4_mul(r1, frac));
+
+    /* round to nearest, convert to i32, store interleaved. */
+    v128_t half = wasm_f32x4_splat(0.5f);
+    v128_t lneg = wasm_f32x4_lt(lo, wasm_f32x4_splat(0.0f));
+    v128_t rneg = wasm_f32x4_lt(ro, wasm_f32x4_splat(0.0f));
+    lo = wasm_f32x4_add(lo, wasm_v128_bitselect(wasm_f32x4_splat(-0.5f), half, lneg));
+    ro = wasm_f32x4_add(ro, wasm_v128_bitselect(wasm_f32x4_splat(-0.5f), half, rneg));
+    v128_t li = wasm_i32x4_trunc_sat_f32x4(lo);
+    v128_t ri = wasm_i32x4_trunc_sat_f32x4(ro);
+
+    int li_[4], ri_[4];
+    wasm_v128_store(li_, li);
+    wasm_v128_store(ri_, ri);
+    for (int k = 0; k < 4; k++) {
+      int lv = li_[k], rv = ri_[k];
+      if (lv > 32767) lv = 32767; else if (lv < -32768) lv = -32768;
+      if (rv > 32767) rv = 32767; else if (rv < -32768) rv = -32768;
+      out[(i + k) * 2]     = (int16_t)lv;
+      out[(i + k) * 2 + 1] = (int16_t)rv;
+    }
+  }
+
+  /* scalar tail */
+  for (; i < outFrames; i++) {
+    double p = (double)i * step;
+    int i0 = (int)p; if (i0 > maxI0) i0 = maxI0;
+    float f = (float)(p - i0), invf = 1.0f - f;
+    float l = in[i0*2]   * invf + in[(i0+1)*2]   * f;
+    float r = in[i0*2+1] * invf + in[(i0+1)*2+1] * f;
+    int lv = (int)(l < 0 ? l - 0.5f : l + 0.5f);
+    int rv = (int)(r < 0 ? r - 0.5f : r + 0.5f);
+    if (lv > 32767) lv = 32767; else if (lv < -32768) lv = -32768;
+    if (rv > 32767) rv = 32767; else if (rv < -32768) rv = -32768;
+    out[i*2]   = (int16_t)lv;
+    out[i*2+1] = (int16_t)rv;
+  }
+
+  return (int)outFrames;
+}

package/src/playtest/resampler/resampler.mjs

@@ -0,0 +1,2 @@
+async function Module(moduleArg={}){var moduleRtn;var Module=moduleArg;var ENVIRONMENT_IS_WEB=!!globalThis.window;var ENVIRONMENT_IS_WORKER=!!globalThis.WorkerGlobalScope;var ENVIRONMENT_IS_NODE=globalThis.process?.versions?.node&&globalThis.process?.type!="renderer";if(ENVIRONMENT_IS_NODE){const{createRequire}=await import("module");var require=createRequire(import.meta.url)}var arguments_=[];var thisProgram="./this.program";var quit_=(status,toThrow)=>{throw toThrow};var _scriptName=import.meta.url;var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var readAsync,readBinary;if(ENVIRONMENT_IS_NODE){var fs=require("fs");if(_scriptName.startsWith("file:")){scriptDirectory=require("path").dirname(require("url").fileURLToPath(_scriptName))+"/"}readBinary=filename=>{filename=isFileURI(filename)?new URL(filename):filename;var ret=fs.readFileSync(filename);return ret};readAsync=async(filename,binary=true)=>{filename=isFileURI(filename)?new URL(filename):filename;var ret=fs.readFileSync(filename,binary?undefined:"utf8");return ret};if(process.argv.length>1){thisProgram=process.argv[1].replace(/\\/g,"/")}arguments_=process.argv.slice(2);quit_=(status,toThrow)=>{process.exitCode=status;throw toThrow}}else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){try{scriptDirectory=new URL(".",_scriptName).href}catch{}{if(ENVIRONMENT_IS_WORKER){readBinary=url=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.responseType="arraybuffer";xhr.send(null);return new Uint8Array(xhr.response)}}readAsync=async url=>{var response=await fetch(url,{credentials:"same-origin"});if(response.ok){return response.arrayBuffer()}throw new Error(response.status+" : "+response.url)}}}else{}var out=console.log.bind(console);var err=console.error.bind(console);var wasmBinary;var ABORT=false;var isFileURI=filename=>filename.startsWith("file://");var readyPromiseResolve,readyPromiseReject;var HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;var HEAP64,HEAPU64;var runtimeInitialized=false;function updateMemoryViews(){var b=wasmMemory.buffer;HEAP8=new Int8Array(b);Module["HEAP16"]=HEAP16=new Int16Array(b);Module["HEAPU8"]=HEAPU8=new Uint8Array(b);HEAPU16=new Uint16Array(b);HEAP32=new Int32Array(b);HEAPU32=new Uint32Array(b);HEAPF32=new Float32Array(b);HEAPF64=new Float64Array(b);HEAP64=new BigInt64Array(b);HEAPU64=new BigUint64Array(b)}function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(onPreRuns)}function initRuntime(){runtimeInitialized=true;wasmExports["c"]()}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(onPostRuns)}function abort(what){Module["onAbort"]?.(what);what="Aborted("+what+")";err(what);ABORT=true;what+=". Build with -sASSERTIONS for more info.";var e=new WebAssembly.RuntimeError(what);readyPromiseReject?.(e);throw e}var wasmBinaryFile;function findWasmBinary(){if(Module["locateFile"]){return locateFile("resampler.wasm")}return new URL("resampler.wasm",import.meta.url).href}function getBinarySync(file){if(file==wasmBinaryFile&&wasmBinary){return new Uint8Array(wasmBinary)}if(readBinary){return readBinary(file)}throw"both async and sync fetching of the wasm failed"}async function getWasmBinary(binaryFile){if(!wasmBinary){try{var response=await readAsync(binaryFile);return new Uint8Array(response)}catch{}}return getBinarySync(binaryFile)}async function instantiateArrayBuffer(binaryFile,imports){try{var binary=await getWasmBinary(binaryFile);var instance=await WebAssembly.instantiate(binary,imports);return instance}catch(reason){err(`failed to asynchronously prepare wasm: ${reason}`);abort(reason)}}async function instantiateAsync(binary,binaryFile,imports){if(!binary&&!ENVIRONMENT_IS_NODE){try{var response=fetch(binaryFile,{credentials:"same-origin"});var instantiationResult=await WebAssembly.instantiateStreaming(response,imports);return instantiationResult}catch(reason){err(`wasm streaming compile failed: ${reason}`);err("falling back to ArrayBuffer instantiation")}}return instantiateArrayBuffer(binaryFile,imports)}function getWasmImports(){var imports={a:wasmImports};return imports}async function createWasm(){function receiveInstance(instance,module){wasmExports=instance.exports;assignWasmExports(wasmExports);updateMemoryViews();return wasmExports}function receiveInstantiationResult(result){return receiveInstance(result["instance"])}var info=getWasmImports();if(Module["instantiateWasm"]){return new Promise((resolve,reject)=>{Module["instantiateWasm"](info,(inst,mod)=>{resolve(receiveInstance(inst,mod))})})}wasmBinaryFile??=findWasmBinary();var result=await instantiateAsync(wasmBinary,wasmBinaryFile,info);var exports=receiveInstantiationResult(result);return exports}class ExitStatus{name="ExitStatus";constructor(status){this.message=`Program terminated with exit(${status})`;this.status=status}}var callRuntimeCallbacks=callbacks=>{while(callbacks.length>0){callbacks.shift()(Module)}};var onPostRuns=[];var addOnPostRun=cb=>onPostRuns.push(cb);var onPreRuns=[];var addOnPreRun=cb=>onPreRuns.push(cb);var noExitRuntime=true;var stackRestore=val=>__emscripten_stack_restore(val);var stackSave=()=>_emscripten_stack_get_current();var getHeapMax=()=>2147483648;var alignMemory=(size,alignment)=>Math.ceil(size/alignment)*alignment;var growMemory=size=>{var oldHeapSize=wasmMemory.buffer.byteLength;var pages=(size-oldHeapSize+65535)/65536|0;try{wasmMemory.grow(pages);updateMemoryViews();return 1}catch(e){}};var _emscripten_resize_heap=requestedSize=>{var oldSize=HEAPU8.length;requestedSize>>>=0;var maxHeapSize=getHeapMax();if(requestedSize>maxHeapSize){return false}for(var cutDown=1;cutDown<=4;cutDown*=2){var overGrownHeapSize=oldSize*(1+.2/cutDown);overGrownHeapSize=Math.min(overGrownHeapSize,requestedSize+100663296);var newSize=Math.min(maxHeapSize,alignMemory(Math.max(requestedSize,overGrownHeapSize),65536));var replacement=growMemory(newSize);if(replacement){return true}}return false};var getCFunc=ident=>{var func=Module["_"+ident];return func};var writeArrayToMemory=(array,buffer)=>{HEAP8.set(array,buffer)};var lengthBytesUTF8=str=>{var len=0;for(var i=0;i<str.length;++i){var c=str.charCodeAt(i);if(c<=127){len++}else if(c<=2047){len+=2}else if(c>=55296&&c<=57343){len+=4;++i}else{len+=3}}return len};var stringToUTF8Array=(str,heap,outIdx,maxBytesToWrite)=>{if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i<str.length;++i){var u=str.codePointAt(i);if(u<=127){if(outIdx>=endIdx)break;heap[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;heap[outIdx++]=192|u>>6;heap[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;heap[outIdx++]=224|u>>12;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}else{if(outIdx+3>=endIdx)break;heap[outIdx++]=240|u>>18;heap[outIdx++]=128|u>>12&63;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63;i++}}heap[outIdx]=0;return outIdx-startIdx};var stringToUTF8=(str,outPtr,maxBytesToWrite)=>stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite);var stackAlloc=sz=>__emscripten_stack_alloc(sz);var stringToUTF8OnStack=str=>{var size=lengthBytesUTF8(str)+1;var ret=stackAlloc(size);stringToUTF8(str,ret,size);return ret};var UTF8Decoder=globalThis.TextDecoder&&new TextDecoder;var findStringEnd=(heapOrArray,idx,maxBytesToRead,ignoreNul)=>{var maxIdx=idx+maxBytesToRead;if(ignoreNul)return maxIdx;while(heapOrArray[idx]&&!(idx>=maxIdx))++idx;return idx};var UTF8ArrayToString=(heapOrArray,idx=0,maxBytesToRead,ignoreNul)=>{var endPtr=findStringEnd(heapOrArray,idx,maxBytesToRead,ignoreNul);if(endPtr-idx>16&&heapOrArray.buffer&&UTF8Decoder){return UTF8Decoder.decode(heapOrArray.subarray(idx,endPtr))}var str="";while(idx<endPtr){var u0=heapOrArray[idx++];if(!(u0&128)){str+=String.fromCharCode(u0);continue}var u1=heapOrArray[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}var u2=heapOrArray[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u0=(u0&7)<<18|u1<<12|u2<<6|heapOrArray[idx++]&63}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}return str};var UTF8ToString=(ptr,maxBytesToRead,ignoreNul)=>ptr?UTF8ArrayToString(HEAPU8,ptr,maxBytesToRead,ignoreNul):"";var ccall=(ident,returnType,argTypes,args,opts)=>{var toC={string:str=>{var ret=0;if(str!==null&&str!==undefined&&str!==0){ret=stringToUTF8OnStack(str)}return ret},array:arr=>{var ret=stackAlloc(arr.length);writeArrayToMemory(arr,ret);return ret}};function convertReturnValue(ret){if(returnType==="string"){return UTF8ToString(ret)}if(returnType==="boolean")return Boolean(ret);return ret}var func=getCFunc(ident);var cArgs=[];var stack=0;if(args){for(var i=0;i<args.length;i++){var converter=toC[argTypes[i]];if(converter){if(stack===0)stack=stackSave();cArgs[i]=converter(args[i])}else{cArgs[i]=args[i]}}}var ret=func(...cArgs);function onDone(ret){if(stack!==0)stackRestore(stack);return convertReturnValue(ret)}ret=onDone(ret);return ret};var cwrap=(ident,returnType,argTypes,opts)=>{var numericArgs=!argTypes||argTypes.every(type=>type==="number"||type==="boolean");var numericRet=returnType!=="string";if(numericRet&&numericArgs&&!opts){return getCFunc(ident)}return(...args)=>ccall(ident,returnType,argTypes,args,opts)};{if(Module["noExitRuntime"])noExitRuntime=Module["noExitRuntime"];if(Module["print"])out=Module["print"];if(Module["printErr"])err=Module["printErr"];if(Module["wasmBinary"])wasmBinary=Module["wasmBinary"];if(Module["arguments"])arguments_=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].shift()()}}}Module["ccall"]=ccall;Module["cwrap"]=cwrap;var _rs_alloc,_malloc,_rs_free,_free,_rs_resample,__emscripten_stack_restore,__emscripten_stack_alloc,_emscripten_stack_get_current,memory,__indirect_function_table,wasmMemory;function assignWasmExports(wasmExports){_rs_alloc=Module["_rs_alloc"]=wasmExports["d"];_malloc=Module["_malloc"]=wasmExports["e"];_rs_free=Module["_rs_free"]=wasmExports["f"];_free=Module["_free"]=wasmExports["g"];_rs_resample=Module["_rs_resample"]=wasmExports["h"];__emscripten_stack_restore=wasmExports["i"];__emscripten_stack_alloc=wasmExports["j"];_emscripten_stack_get_current=wasmExports["k"];memory=wasmMemory=wasmExports["b"];__indirect_function_table=wasmExports["__indirect_function_table"]}var wasmImports={a:_emscripten_resize_heap};function run(){preRun();function doRun(){Module["calledRun"]=true;if(ABORT)return;initRuntime();readyPromiseResolve?.(Module);Module["onRuntimeInitialized"]?.();postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout(()=>{setTimeout(()=>Module["setStatus"](""),1);doRun()},1)}else{doRun()}}var wasmExports;wasmExports=await (createWasm());run();if(runtimeInitialized){moduleRtn=Module}else{moduleRtn=new Promise((resolve,reject)=>{readyPromiseResolve=resolve;readyPromiseReject=reject})}
+;return moduleRtn}export default Module;

package/src/toolchains/arm-none-eabi-gcc/gcc.js

@@ -1,216 +1,67 @@
 // arm-none-eabi-gcc — WASM toolchain wrappers for GBA C builds.
 //
-// Mirrors src/toolchains/m68k-elf-gcc/gcc.js. The GBA target uses
-// ARM7TDMI in Thumb-interwork mode by default (matches libgba's
-// expectations).
+// The full pipeline:
+//   runCc1arm({source, headers, options}) → ARM assembly text (.s)
+//   runArmAs({source, includes})           → .o ELF object
+//   runArmLd({objects, linkScript})        → linked .elf (+ map)
+//   runArmObjcopy({elf})                   → raw .gba ROM
 //
-// Pipeline:
-//   runCc1arm({source, headers, options})   → ARM assembly text (.s)
-//   runArmAs({asmSource, includes})         → .o ELF object
-//   runArmLd({objects, linkScript})         → linked .elf
-//   runArmObjcopy({elf})                    → raw .gba ROM
+// 0.81.0: the 4 stages come from the shared makeGccToolchain() factory
+// (common/gcc-toolchain.js); this file is just the ARM config + thin re-exports
+// so existing call sites keep their runArm*/runCc1arm names.
 //
-// Each step runs as a WASM module through the worker pool (R12
-// crash isolation). The WASM tools live under wasm/ (cc1-arm.{mjs,wasm}
-// etc.). emcc emits ESM (EXPORT_ES6=1) so we use .mjs extensions.
-
+// The WASM glue ships in romdev-platform-gba (155MB, incl. the 135MB cc1-arm);
+// resolution is lazy + memoized, so booting never loads it unless a GBA C ROM
+// is actually built. ARMv4T (arm7tdmi), thumb-interwork.
 import { fileURLToPath } from "node:url";
-import { existsSync } from "node:fs";
 import path from "node:path";
 
-import { runIsolated, textFile, binaryFile, getOutputBytes, getOutputText } from "../_worker/run.js";
+import { makeGccToolchain } from "../common/gcc-toolchain.js";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-// arm-none-eabi-gcc's WASM ships in romdev-platform-gba (the GBA platform is
-// the only consumer). Resolve each tool's glue from that package; fall back to
-// a local copy under src/ if present (transition / dev). emcc emits ESM
-// (EXPORT_ES6=1) so the glue uses .mjs extensions. The package is a hard dep
-// of romdev.
-function resolveArmGlue(file) {
-  try {
-    const u = import.meta.resolve("romdev-platform-gba");
-    const p = path.join(path.dirname(fileURLToPath(u)), "wasm", file);
-    if (existsSync(p)) return p;
-  } catch { /* package not resolvable — fall through to local */ }
-  const local = path.join(__dirname, "wasm", file);
-  if (existsSync(local)) return local;
-  throw new Error(`arm-none-eabi-gcc WASM (${file}) not found — install romdev-platform-gba`);
-}
+const ARM_FLAGS = ["-mcpu=arm7tdmi", "-mthumb-interwork"];
 
-// Lazy + memoized per tool: resolve only on the first GBA-C build that uses
-// each tool, not at module load — so booting the server never touches this
-// (155MB, incl. the 135MB cc1-arm) package unless a GBA C ROM is actually built.
-const _glue = {};
-const armGlue = (file) => (_glue[file] ??= resolveArmGlue(file));
+const { runCc1, runAs, runLd, runObjcopy } = makeGccToolchain({
+  pkg: "romdev-platform-gba",
+  localDir: __dirname,
+  label: "arm-none-eabi-gcc",
+  glue: {
+    cc1: "cc1-arm.mjs",
+    as: "arm-none-eabi-as.mjs",
+    ld: "arm-none-eabi-ld.mjs",
+    objcopy: "arm-none-eabi-objcopy.mjs",
+  },
+  cc1Flags: ARM_FLAGS,
+  asFlags: ARM_FLAGS,
+  ldScriptName: "gba.ld",
+  outputName: "main.gba",
+});
 
 /**
  * Compile a C source to ARM assembly via cc1.
- *
- * @param {Object} args
- * @param {string} args.source main C source text
- * @param {Record<string, string>} [args.headers] virtual headers visible via -I/work
- * @param {string[]} [args.options] extra cc1 flags
+ * @param {{source:string, headers?:Record<string,string>, options?:string[]}} args
  * @returns {Promise<{log:string, exitCode:number, asmSource:string|null, crash?:any}>}
  */
-export async function runCc1arm(args) {
-  const { source, options = [] } = args;
-  const headers = args.headers ?? {};
-  /** @type {import("../_worker/run.js").InputFile[]} */
-  const inputFiles = [textFile("/work/main.c", source)];
-  for (const [name, content] of Object.entries(headers)) {
-    inputFiles.push(textFile("/work/" + name, content));
-  }
-  const argv = [
-    // GBA = ARM7TDMI. Thumb-interwork allows mixed ARM/Thumb code.
-    "-mcpu=arm7tdmi",
-    "-mthumb-interwork",
-    "-iquote", "/work",
-    "-I", "/work",
-    ...options,
-    "/work/main.c",
-    "-o", "/work/main.s",
-  ];
-  const r = await runIsolated({
-    gluePath: armGlue("cc1-arm.mjs"),
-    argv,
-    inputFiles,
-    outputFiles: [{ vfsPath: "/work/main.s", encoding: "utf8" }],
-  });
-  return {
-    log: r.log,
-    exitCode: r.exitCode,
-    asmSource: getOutputText(r, "/work/main.s") || null,
-    ...(r.crash ? { crash: r.crash, stage: "crash" } : {}),
-  };
-}
+export const runCc1arm = runCc1;
 
 /**
  * Assemble ARM assembly with arm-none-eabi-as.
- *
- * @param {Object} args
- * @param {string} args.source assembly source text
- * @param {Record<string, string>} [args.includes]
- * @param {Record<string, Uint8Array>} [args.binaryIncludes]
- * @param {string[]} [args.options]
+ * @param {{source:string, includes?:Record<string,string>, binaryIncludes?:Record<string,Uint8Array>, options?:string[]}} args
  * @returns {Promise<{log:string, exitCode:number, object:Uint8Array|null, crash?:any}>}
  */
-export async function runArmAs(args) {
-  const { source, options = [] } = args;
-  const includes = args.includes ?? {};
-  const binaryIncludes = args.binaryIncludes ?? {};
-  /** @type {import("../_worker/run.js").InputFile[]} */
-  const inputFiles = [textFile("/work/main.s", source)];
-  for (const [name, content] of Object.entries(includes)) {
-    inputFiles.push(textFile("/work/" + name, content));
-  }
-  for (const [name, bytes] of Object.entries(binaryIncludes)) {
-    inputFiles.push(binaryFile("/work/" + name, bytes));
-  }
-  const argv = [
-    "-mcpu=arm7tdmi",
-    "-mthumb-interwork",
-    "-I", "/work",
-    ...options,
-    "/work/main.s",
-    "-o", "/work/main.o",
-  ];
-  const r = await runIsolated({
-    gluePath: armGlue("arm-none-eabi-as.mjs"),
-    argv,
-    inputFiles,
-    outputFiles: [{ vfsPath: "/work/main.o", encoding: "base64" }],
-  });
-  return {
-    log: r.log,
-    exitCode: r.exitCode,
-    object: getOutputBytes(r, "/work/main.o"),
-    ...(r.crash ? { crash: r.crash, stage: "crash" } : {}),
-  };
-}
+export const runArmAs = runAs;
 
 /**
- * Link ARM object files into an ELF executable.
- *
- * @param {Object} args
- * @param {Record<string, Uint8Array>} args.objects
- * @param {string} args.linkScript linker script contents (lnkscript / gba.ld)
- * @param {string[]} [args.libraryPaths]
- * @param {string[]} [args.libraries]
- * @param {Record<string, Uint8Array>} [args.archives]
- * @param {string[]} [args.options]
- * @returns {Promise<{log:string, exitCode:number, elf:Uint8Array|null, crash?:any}>}
+ * Link ARM object files into an ELF executable (+ linker map).
+ * @param {{objects:Record<string,Uint8Array>, linkScript:string, libraries?:string[], libraryPaths?:string[], archives?:Record<string,Uint8Array>, options?:string[]}} args
+ * @returns {Promise<{log:string, exitCode:number, elf:Uint8Array|null, map:string|null, crash?:any}>}
  */
-export async function runArmLd(args) {
-  const { objects, linkScript, libraries = [], libraryPaths = [], options = [] } = args;
-  const archives = args.archives ?? {};
-  /** @type {import("../_worker/run.js").InputFile[]} */
-  const inputFiles = [textFile("/work/gba.ld", linkScript)];
-  for (const [name, bytes] of Object.entries(objects)) {
-    inputFiles.push(binaryFile("/work/" + name, bytes));
-  }
-  for (const [name, bytes] of Object.entries(archives)) {
-    inputFiles.push(binaryFile("/work/" + name, bytes));
-  }
-  const argv = [
-    "-T", "/work/gba.ld",
-    "-o", "/work/main.elf",
-    // Emit a GNU ld map so symbols({op:'resolve'/'lookup'/'list'/'map'}) can turn
-    // a C global's name into an address (parsed by gnu-ld-map.js) — same as the
-    // m68k/Genesis path. Without this the GBA build returns no symbol table.
-    "-Map=/work/main.map",
-    ...libraryPaths.flatMap((p) => ["-L", p]),
-    ...Object.keys(objects).map((n) => "/work/" + n),
-    ...libraries.map((l) => `-l${l}`),
-    ...options,
-  ];
-  const r = await runIsolated({
-    gluePath: armGlue("arm-none-eabi-ld.mjs"),
-    argv,
-    inputFiles,
-    outputFiles: [
-      { vfsPath: "/work/main.elf", encoding: "base64" },
-      { vfsPath: "/work/main.map", encoding: "utf8" },
-    ],
-  });
-  return {
-    log: r.log,
-    exitCode: r.exitCode,
-    elf: getOutputBytes(r, "/work/main.elf"),
-    map: getOutputText(r, "/work/main.map") || null,
-    ...(r.crash ? { crash: r.crash, stage: "crash" } : {}),
-  };
-}
+export const runArmLd = runLd;
 
 /**
  * Strip an ELF down to a raw .gba ROM.
- *
- * @param {Object} args
- * @param {Uint8Array} args.elf
- * @param {string[]} [args.options]
+ * @param {{elf:Uint8Array, options?:string[]}} args
  * @returns {Promise<{log:string, exitCode:number, binary:Uint8Array|null, crash?:any}>}
  */
-export async function runArmObjcopy(args) {
-  const { elf, options = [] } = args;
-  /** @type {import("../_worker/run.js").InputFile[]} */
-  const inputFiles = [binaryFile("/work/main.elf", elf)];
-  const argv = [
-    "-O", "binary",
-    ...options,
-    "/work/main.elf",
-    "/work/main.gba",
-  ];
-  const r = await runIsolated({
-    gluePath: armGlue("arm-none-eabi-objcopy.mjs"),
-    argv,
-    inputFiles,
-    outputFiles: [{ vfsPath: "/work/main.gba", encoding: "base64" }],
-  });
-  return {
-    log: r.log,
-    exitCode: r.exitCode,
-    binary: getOutputBytes(r, "/work/main.gba"),
-    ...(r.crash ? { crash: r.crash, stage: "crash" } : {}),
-  };
-}
+export const runArmObjcopy = runObjcopy;

package/src/toolchains/asar/asar.js

@@ -5,30 +5,25 @@
 // directives.
 
 import { fileURLToPath } from "node:url";
-import { existsSync } from "node:fs";
 import path from "node:path";
 
 import { runIsolated, textFile, binaryFile, getOutputBytes, getOutputText } from "../_worker/run.js";
+import { resolveGlueFile } from "../common/wasm-tool.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 // asar's WASM ships in romdev-platform-snes (the SNES platform is the only
-// consumer). Resolve from that package; fall back to a local copy under src/
-// if present (transition / dev). The package is a hard dep of romdev.
-function resolveAsarGlue() {
-  try {
-    const u = import.meta.resolve("romdev-platform-snes");
-    const p = path.join(path.dirname(fileURLToPath(u)), "wasm", "asar.js");
-    if (existsSync(p)) return p;
-  } catch { /* package not resolvable — fall through to local */ }
-  const local = path.join(__dirname, "wasm", "asar.js");
-  if (existsSync(local)) return local;
-  throw new Error("asar WASM not found — install romdev-platform-snes");
-}
-// Lazy + memoized: resolve only on the first asar (SNES asm) build, not at boot.
+// consumer); a local src/ copy is the dev fallback. Lazy + memoized: resolve
+// only on the first asar (SNES asm) build, not at boot.
 let _gluePath;
-const gluePath = () => (_gluePath ??= resolveAsarGlue());
+const gluePath = () =>
+  (_gluePath ??= resolveGlueFile({
+    pkg: "romdev-platform-snes",
+    file: "asar.js",
+    localDir: __dirname,
+    label: "asar",
+  }));
 
 /**
  * Assemble an asar source.