@ai-ecoverse/slicc-kernel 1.8.2 → 1.8.4

package/dist/process-worker.js

@@ -1681,6 +1681,12 @@ function wrapCloexecSyscalls(imports, glue, deps) {
     }
   }
 }
+function errnoOf(err) {
+  const { errno: errno2, code: code2 } = err ?? {};
+  if (typeof errno2 === "number") return errno2;
+  if (typeof code2 === "string") return wasiErrno(code2);
+  throw err;
+}
 function persistsItself(stream) {
   const type = stream.node.mount?.type;
   return typeof type?.syncfs === "function";
@@ -1697,12 +1703,66 @@ function syncFsync(imports, fs) {
         const result = stream.stream_ops.fsync?.(stream);
         return typeof result === "number" ? result : 0;
       } catch (err) {
-        const { errno: errno2, code: code2 } = err;
-        return typeof errno2 === "number" ? errno2 : wasiErrno(String(code2));
+        return errnoOf(err);
       }
     };
   }
 }
+function offsetOf(rest) {
+  const at = rest.length >= 3 ? Number(rest[1]) * 2 ** 32 + (Number(rest[0]) >>> 0) : Number(BigInt.asIntN(64, BigInt(rest[0])));
+  return at >= 0 && Number.isSafeInteger(at) ? at : void 0;
+}
+function readInto(sys, kfd, target, at) {
+  let done = 0;
+  while (done < target.length) {
+    const got = sys.pread?.(kfd, target.length - done, at + done) ?? new Uint8Array(0);
+    if (got.length === 0) break;
+    target.set(got, done);
+    done += got.length;
+  }
+  return done;
+}
+function positioned(original, write, deps) {
+  return (fd, iov, iovcnt, ...rest) => {
+    const stream = deps.fs()?.getStream(Number(fd));
+    const memory = deps.memory();
+    const kfd = stream?.sliccKernelFile ? stream.sliccKernelFd : void 0;
+    if (kfd === void 0 || !memory || !(write ? deps.sys.pwrite : deps.sys.pread)) {
+      return original(fd, iov, iovcnt, ...rest);
+    }
+    const at = offsetOf(rest);
+    if (at === void 0) return wasiErrno("EINVAL");
+    const view = new DataView(memory.buffer);
+    let done = 0;
+    try {
+      for (let i = 0; i < Number(iovcnt); i++) {
+        const ptr = view.getUint32(Number(iov) + i * 8, true);
+        const len = view.getUint32(Number(iov) + i * 8 + 4, true);
+        const part = new Uint8Array(memory.buffer, ptr, len);
+        const moved = write ? deps.sys.pwrite?.(kfd, part.slice(), at + done) ?? 0 : readInto(deps.sys, kfd, part, at + done);
+        done += moved;
+        if (moved < len) break;
+      }
+    } catch (err) {
+      return errnoOf(err);
+    }
+    view.setUint32(Number(rest[rest.length - 1]), done, true);
+    return 0;
+  };
+}
+function positionalIo(imports, deps) {
+  for (const namespace of Object.values(imports)) {
+    for (const [name, write] of [
+      ["fd_pread", false],
+      ["fd_pwrite", true]
+    ]) {
+      const original = namespace?.[name];
+      if (typeof original === "function") {
+        namespace[name] = positioned(original, write, deps);
+      }
+    }
+  }
+}
 function wasmMemory(instance, imports) {
   const isMemory = (v) => v instanceof WebAssembly.Memory;
   const exported = Object.values(instance.exports).find(isMemory);
@@ -2344,6 +2404,11 @@ function kernelSys(transport) {
       const r = call2({ op: "fd-pread", fd, max, offset: at }, `fd-pread ${fd}`);
       return r.ok && r.kind === "bytes" ? r.bytes : new Uint8Array(0);
     },
+    pwrite(fd, bytes, at) {
+      return json(
+        call2({ op: "fd-pwrite", fd, offset: at, body: bytes }, `fd-pwrite ${fd}`)
+      );
+    },
     isatty(fd) {
       return json(call2({ op: "fd-info", fd }, `fd-info ${fd}`))?.tty === true;
     },
@@ -2482,6 +2547,11 @@ async function runWasmProcess(init, port, deps = {}) {
           }
         });
         syncFsync(imports, () => ownValue(module, "FS"));
+        positionalIo(imports, {
+          fs: () => ownValue(module, "FS"),
+          sys,
+          memory: () => memory
+        });
         return WebAssembly.instantiate(init.program.module, imports);
       }).then((instance) => {
         memory = wasmMemory(instance, imports);