@ai-ecoverse/slicc-kernel 1.140.0 → 1.140.1

package/dist/process-worker.js

@@ -2775,7 +2775,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.140.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.140.1" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -14538,7 +14538,29 @@ function nameFrame(line, module, name2) {
   const found = name2(Number(m[4]));
   return found === void 0 ? line : `${m[1]}${found} (${m[2]})`;
 }
-function sidecarNames(read2, path) {
+function definedFunctions(bytes) {
+  let at = 8;
+  const leb = () => {
+    let value2 = 0;
+    let shift = 0;
+    let byte;
+    do {
+      if (at >= bytes.length) throw new RangeError("truncated module");
+      byte = bytes[at++];
+      value2 += (byte & 127) * 2 ** shift;
+      shift += 7;
+    } while (byte & 128);
+    return value2;
+  };
+  while (at < bytes.length) {
+    const id = bytes[at++];
+    const size = leb();
+    if (id === 3) return leb();
+    at += size;
+  }
+  return 0;
+}
+function sidecarNames(read2, path, fit) {
   let names;
   return (index3) => {
     if (!names) {
@@ -14547,6 +14569,20 @@ function sidecarNames(read2, path) {
       } catch {
         names = /* @__PURE__ */ new Map();
       }
+      let want = names.size;
+      try {
+        if (fit) want = fit.functions();
+      } catch {
+        fit?.warn(`${path} can't be checked against the module, so the frames show raw indices`);
+        names = /* @__PURE__ */ new Map();
+        return void 0;
+      }
+      if (fit && names.size !== want) {
+        fit.warn(
+          `${path} names ${names.size} functions, but the module has ${want}: it doesn't fit, so the frames show raw indices`
+        );
+        names = /* @__PURE__ */ new Map();
+      }
     }
     return names.get(index3);
   };
@@ -15037,7 +15073,7 @@ async function runWasiProcess(init, port2) {
     if (e instanceof WasiExit) return e.code;
     if (!(e instanceof WebAssembly.RuntimeError)) throw e;
     try {
-      say(trapMessage(e, init.env, "", programNames(host, init.program)));
+      say(trapReport(e, init, host, ""));
     } catch {
       throw new Error(`${init.argv0}: wasm trap: ${e.message}`);
     }
@@ -15056,9 +15092,21 @@ function trapMessage(e, env, where = "", name2) {
   return frames.length ? `${head}
 ${frames.join("\n")}` : head;
 }
-function programNames(host, program) {
+function trapReport(e, init, host, where) {
+  const warned = [];
+  const message2 = trapMessage(e, init.env, where, programNames(host, init.program, warned));
+  return [...warned, message2].join(`
+${init.argv0}: `);
+}
+function programNames(host, program, warned) {
   const path = program.names;
-  return path === void 0 ? void 0 : sidecarNames((p) => host.o.fs.readFile(p), path);
+  if (path === void 0) return void 0;
+  const read2 = (p) => host.o.fs.readFile(p);
+  const imported = WebAssembly.Module.imports(program.module).filter((i) => i.kind === "function");
+  return sidecarNames(read2, path, {
+    functions: () => imported.length + definedFunctions(read2(program.path)),
+    warn: (line) => warned.push(line)
+  });
 }
 async function programImports(program, host, transport, tid) {
   if (program.imports === void 0) return void 0;
@@ -15139,7 +15187,7 @@ async function runWasiThread(init, port2) {
     }
     if (e instanceof WebAssembly.RuntimeError) {
       try {
-        say(trapMessage(e, init.env, ` in thread ${thread.tid}`, programNames(host, init.program)));
+        say(trapReport(e, init, host, ` in thread ${thread.tid}`));
       } catch {
       }
       port2.postMessage({ type: WASM_PROCESS_EXIT, code: TRAPPED });