@ai-ecoverse/slicc-kernel 1.98.2 → 1.98.4

package/dist/process-worker.js

@@ -2454,7 +2454,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.98.2" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.98.4" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -10224,16 +10224,18 @@ function mutableGlobals(exports) {
   }
   return out;
 }
-var UNWINDING, REWINDING, AsyncifyDriver;
+var STACK_POINTER, UNWINDING, REWINDING, AsyncifyDriver;
 var init_wasix_fork = __esm({
   "src/process/wasi/wasix-fork.ts"() {
     "use strict";
     init_wasi_abi();
+    STACK_POINTER = "__stack_pointer";
     UNWINDING = 1;
     REWINDING = 2;
     AsyncifyDriver = class {
       exports = {};
       stackUpper = 0;
+      linked;
       pending;
       answer = 0;
       snapshots = /* @__PURE__ */ new Map();
@@ -10242,10 +10244,12 @@ var init_wasix_fork = __esm({
       constructor(mem) {
         this.mem = mem;
       }
+      useStack(pointer, low) {
+        this.linked = { pointer, low };
+      }
       bind(exports) {
         this.exports = exports;
-        const sp = this.exports.__stack_pointer;
-        this.stackUpper = sp instanceof WebAssembly.Global ? sp.value : 0;
+        this.stackUpper = this.stackPointer();
       }
       get supported() {
         return typeof this.exports.asyncify_start_unwind === "function";
@@ -10280,7 +10284,7 @@ var init_wasix_fork = __esm({
       }
       fork(fork) {
         const sp = this.stackPointer();
-        const globals = mutableGlobals(this.exports);
+        const globals = this.globals();
         return this.unwind((data) => {
           this.answer = fork(data, globals, sp);
         });
@@ -10291,7 +10295,7 @@ var init_wasix_fork = __esm({
         v.setBigUint64(snapPtr, BigInt(retPtr), true);
         v.setBigUint64(snapPtr + 8, BigInt(id), true);
         v.setBigUint64(snapPtr + 16, 0x51cc5117n, true);
-        const globals = mutableGlobals(this.exports);
+        const globals = this.globals();
         return this.unwind((data) => {
           const end = this.mem.view().getUint32(data, true);
           this.snapshots.set(id, { frames: this.mem.bytes(data + 8, end - data - 8).slice(), globals });
@@ -10309,11 +10313,24 @@ var init_wasix_fork = __esm({
           this.answer = Number(val) || 1;
         });
       }
+      stackGlobal() {
+        const g = this.exports[STACK_POINTER];
+        return g instanceof WebAssembly.Global ? g : this.linked?.pointer;
+      }
       stackPointer() {
-        const g = this.exports.__stack_pointer;
-        return g instanceof WebAssembly.Global ? g.value : 0;
+        return this.stackGlobal()?.value ?? 0;
+      }
+      globals() {
+        const out = mutableGlobals(this.exports);
+        if (this.linked && !out.some(([name2]) => name2 === STACK_POINTER)) {
+          out.push([STACK_POINTER, this.linked.pointer.value]);
+        }
+        return out;
       }
       dataPointer() {
+        if (this.linked && !(this.exports[STACK_POINTER] instanceof WebAssembly.Global)) {
+          return this.linked.low + 15 & ~15;
+        }
         const g = this.exports.__data_end;
         const dataEnd = g instanceof WebAssembly.Global ? g.value : 0;
         return dataEnd < this.stackUpper ? dataEnd + 15 & ~15 : 16;
@@ -10333,7 +10350,7 @@ var init_wasix_fork = __esm({
       }
       restoreGlobals(globals) {
         for (const [name2, value2] of globals) {
-          const g = this.exports[name2];
+          const g = name2 === STACK_POINTER ? this.stackGlobal() : this.exports[name2];
           if (g instanceof WebAssembly.Global) g.value = value2;
         }
       }
@@ -12083,6 +12100,7 @@ async function instantiate(host, module, memory, threads, {
     }
   }
   if (sync) bindLinker(host, sync, instance, { thread, forked, path });
+  if (sync && !thread) driver.useStack(sync.linker.stackPointer, sync.linker.stackLow);
   return { instance, driver };
 }
 function bindLinker(host, sync, instance, at) {