@ai-ecoverse/slicc-kernel 1.7.1 → 1.8.0

package/dist/process-worker.js

@@ -734,7 +734,7 @@ function sabViews(sab) {
     window: new Uint8Array(sab, SAB_HEADER_BYTES)
   };
 }
-var SAB_HEADER_I32, SAB_HEADER_BYTES, SAB_I_STATE, SAB_I_SEQ, SAB_I_STATUS, SAB_I_TOTAL, SAB_I_CHUNK, SAB_I_OFFSET, SAB_I_SIGNALS, SAB_I_TIMERS, SAB_STATE_IDLE, SAB_STATE_PENDING, SAB_STATE_READY, SAB_STATUS_BYTES, SAB_STATUS_JSON, SAB_STATUS_VOID, SAB_STATUS_ERRNO, SAB_DEFAULT_WINDOW_BYTES, SAB_MIN_BYTES, SYNC_SAB_REQ_MSG, SYNC_SAB_NEXT_MSG, encoder, decoder;
+var SAB_HEADER_I32, SAB_HEADER_BYTES, SAB_I_STATE, SAB_I_SEQ, SAB_I_STATUS, SAB_I_TOTAL, SAB_I_CHUNK, SAB_I_OFFSET, SAB_I_REQ, SAB_I_PUB, SAB_I_SIGNALS, SAB_I_TIMERS, SAB_STATE_IDLE, SAB_STATE_PENDING, SAB_STATE_READY, SAB_STATUS_BYTES, SAB_STATUS_JSON, SAB_STATUS_VOID, SAB_STATUS_ERRNO, SAB_DEFAULT_WINDOW_BYTES, SAB_MIN_BYTES, SYNC_SAB_REQ_MSG, SYNC_SAB_NEXT_MSG, encoder, decoder;
 var init_sync_sab_wire = __esm({
   "src/realm/sync-sab-wire.ts"() {
     "use strict";
@@ -746,6 +746,8 @@ var init_sync_sab_wire = __esm({
     SAB_I_TOTAL = 3;
     SAB_I_CHUNK = 4;
     SAB_I_OFFSET = 5;
+    SAB_I_REQ = 6;
+    SAB_I_PUB = 7;
     SAB_I_SIGNALS = 8;
     SAB_I_TIMERS = 9;
     SAB_STATE_IDLE = 0;
@@ -773,15 +775,13 @@ function createSyncSabTransport(sab, port, deps = {}) {
   let seq = 0;
   function awaitReady(id, deadline, label) {
     for (; ; ) {
-      const remaining = deadline - now();
-      if (remaining <= 0) throw syncError("ETIMEDOUT", label);
-      wait(header, SAB_I_STATE, SAB_STATE_PENDING, remaining);
+      const published = Atomics.load(header, SAB_I_PUB);
       if (Atomics.load(header, SAB_I_STATE) === SAB_STATE_READY && Atomics.load(header, SAB_I_SEQ) === id) {
         return;
       }
-      if (Atomics.load(header, SAB_I_STATE) === SAB_STATE_READY) {
-        Atomics.store(header, SAB_I_STATE, SAB_STATE_PENDING);
-      }
+      const remaining = deadline - now();
+      if (remaining <= 0) throw syncError("ETIMEDOUT", label);
+      wait(header, SAB_I_PUB, published, remaining);
     }
   }
   return {
@@ -791,6 +791,7 @@ function createSyncSabTransport(sab, port, deps = {}) {
       let out = null;
       let status2 = 0;
       let offset = 0;
+      Atomics.store(header, SAB_I_REQ, id);
       try {
         for (; ; ) {
           Atomics.store(header, SAB_I_STATE, SAB_STATE_PENDING);
@@ -817,6 +818,7 @@ function createSyncSabTransport(sab, port, deps = {}) {
           if (chunk === 0) throw syncError("EIO", label);
         }
       } finally {
+        Atomics.store(header, SAB_I_REQ, 0);
         Atomics.store(header, SAB_I_STATE, SAB_STATE_IDLE);
       }
       return decodeSabResult(status2, out);
@@ -5887,22 +5889,27 @@ __export(wasi_runtime_exports, {
   trapMessage: () => trapMessage,
   unsupportedImport: () => unsupportedImport
 });
+function accepted(imp, scope2) {
+  const { module, name, kind } = imp;
+  if (module === PREVIEW1 || module === WASIX) return true;
+  if (!RESERVED.has(module) && (scope2.extended || scope2.wasi && kind === "function")) return true;
+  if (scope2.pie && (module === "GOT.mem" || module === "GOT.func")) return true;
+  if (scope2.pie && module === "env" && kind !== "memory") return true;
+  if (kind === "memory" && scope2.memory?.module === module && scope2.memory.name === name)
+    return true;
+  return module === "wasi" && name === "thread-spawn" && (scope2.wasix || !!scope2.memory?.shared);
+}
 function unsupportedImport(module, memory, extended = false) {
   const imports = WebAssembly.Module.imports(module);
   const wasix = imports.some((i) => i.module === WASIX);
-  const pie = dylinkInfo(module) !== void 0;
-  for (const imp of imports) {
-    if (imp.module === PREVIEW1 || imp.module === WASIX) continue;
-    if (extended && !RESERVED.has(imp.module)) continue;
-    if (pie && (imp.module === "GOT.mem" || imp.module === "GOT.func")) continue;
-    if (pie && imp.module === "env" && imp.kind !== "memory") continue;
-    if (imp.kind === "memory" && memory?.module === imp.module && memory.name === imp.name)
-      continue;
-    if (imp.module === "wasi" && imp.name === "thread-spawn" && (wasix || memory?.shared)) continue;
-    if (imp.kind === "memory" || imp.module === "wasi") {
-      return `imports ${imp.module}.${imp.name}: no WASI program this host runs`;
+  const wasi = wasix || imports.some((i) => i.module === PREVIEW1);
+  const scope2 = { extended, wasi, wasix, pie: dylinkInfo(module) !== void 0, memory };
+  const refused = imports.find((imp) => !accepted(imp, scope2));
+  if (refused) {
+    if (refused.kind === "memory" || refused.module === "wasi") {
+      return `imports ${refused.module}.${refused.name}: no WASI program this host runs`;
     }
-    return `imports ${imp.module}.${imp.name}: no WASI preview1 program (an Emscripten one runs with its glue)`;
+    return `imports ${refused.module}.${refused.name}: no WASI preview1 program (an Emscripten one runs with its glue)`;
   }
   if (!WebAssembly.Module.exports(module).some((e) => e.name === "_start")) {
     return "no WASI command (it exports no _start)";
@@ -5923,7 +5930,9 @@ function linkImports(module, preview1, wasix, memory, threads, program = {}) {
     const ns = imports[imp.module] ??= {};
     if (imp.name in ns) continue;
     if (imp.kind === "memory" && memory) ns[imp.name] = memory;
-    else if (imp.kind === "function") ns[imp.name] = () => imp.name === "thread-spawn" ? -1 : 52;
+    else if (imp.kind === "function") {
+      ns[imp.name] = () => imp.module === "wasi" && imp.name === "thread-spawn" ? -1 : 52;
+    }
   }
   return imports;
 }