@yowasp/yosys 0.38.52-dev.660 → 0.39.37-dev.676

package/README.md

@@ -17,7 +17,7 @@ API reference
 
 This package provides one function:
 
-- `runYosys` (alias `cmd:yosys`)
+- `runYosys`
 
 For more detail, see the documentation for [the JavaScript YoWASP runtime](https://github.com/YoWASP/runtime-js#api-reference).
 
@@ -31,8 +31,8 @@ The version of this package is derived from the upstream Yosys package version i
 2. `Y`: Yosys minor version
 3. `Z`: Yosys patch version; ignored if present
 4. `N`: matches the `N` in the `X.Y+N` upstream version, if present
-5. `M`: package build version; disambiguates different builds produced from the same Yosys source tree
-6. `-dev`: present only for packages built from unreleased Yosys snapshots; marks these packages as pre-releases
+5. `-dev`: present only for packages built from unreleased Yosys snapshots; marks these packages as pre-releases
+6. `M`: package build version; disambiguates different builds produced from the same Yosys source tree
 
 With this scheme, there is a direct correspondence between upstream versions and [SemVer][semver] NPM package versions.
 

package/gen/bundle.js

@@ -86,6 +86,20 @@ var OutputStream = class {
     this.blockingFlush();
   }
 };
+var CallbackInputStream = class extends InputStream {
+  constructor(callback = null) {
+    super();
+    this.callback = callback;
+  }
+  read(len) {
+    if (this.callback === null)
+      throw { tag: "closed" };
+    let contents = this.callback(Number(len));
+    if (contents === null)
+      throw { tag: "closed" };
+    return contents;
+  }
+};
 var CallbackOutputStream = class extends OutputStream {
   constructor(callback = null) {
     super();
@@ -326,7 +340,7 @@ var Environment = class {
   root = new Directory({});
   constructor() {
     this.prng = new Xoroshiro128StarStar(1n);
-    this.standardInputStream = new InputStream();
+    this.standardInputStream = new CallbackInputStream();
     this.standardOutputStream = new CallbackOutputStream();
     this.standardErrorStream = new CallbackOutputStream();
     this.terminalInput = new TerminalInput();
@@ -393,6 +407,12 @@ var Environment = class {
       }
     };
   }
+  get stdin() {
+    return this.standardInputStream.callback;
+  }
+  set stdin(callback) {
+    this.standardInputStream.callback = callback;
+  }
   get stdout() {
     return this.standardOutputStream.callback;
   }
@@ -466,23 +486,26 @@ var Application = class {
     this.instantiate = instantiate2;
     this.argv0 = argv0;
   }
-  // The `printLine` option is deprecated and not documented but still accepted for compatibility.
-  async run(args = null, files = {}, { stdout, stderr, decodeASCII = true, printLine } = {}) {
+  async preload() {
     if (this.resourceData === null)
       this.resourceData = await this.resources().then(fetchResources);
-    if (args === null)
-      return;
+  }
+  // The `printLine` option is deprecated and not documented but still accepted for compatibility.
+  execute(args, files = {}, { stdin, stdout, stderr, decodeASCII = true, printLine } = {}) {
     const environment = new Environment();
     environment.args = [this.argv0].concat(args);
     environment.root = directoryFromTree(files);
     for (const [dirName, dirContents] of Object.entries(this.resourceData.filesystem))
       environment.root.files[dirName] = directoryFromTree(dirContents);
     const lineBufferedConsole = lineBuffered(printLine ?? console.log);
+    environment.stdin = stdin === void 0 ? null : stdin;
     environment.stdout = stdout === void 0 ? lineBufferedConsole : stdout;
     environment.stderr = stderr === void 0 ? lineBufferedConsole : stderr;
-    const wasmCommand = await this.instantiate(
+    const wasmCommand = this.instantiate(
       (filename) => this.resourceData.modules[filename],
-      { runtime: environment.exports }
+      { runtime: environment.exports },
+      // workaround for bytecodealliance/jco#374
+      (module, imports) => new WebAssembly.Instance(module, imports)
     );
     let error = null;
     try {
@@ -503,6 +526,13 @@ var Application = class {
       return files;
     }
   }
+  run(args = null, files = {}, options = {}) {
+    if (this.resourceData === null)
+      return this.preload().then((_) => this.run(args, files, options));
+    if (args === null)
+      return;
+    return this.execute(args, files, options);
+  }
 };
 
 // gen/yosys.js
@@ -552,7 +582,7 @@ function utf8Encode(s, realloc, memory) {
   utf8EncodedLen = writtenTotal;
   return ptr;
 }
-async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.instantiate) {
+function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.Instance) {
   const module0 = getCoreModule("yosys.core.wasm");
   const module1 = getCoreModule("yosys.core2.wasm");
   const module2 = getCoreModule("yosys.core3.wasm");
@@ -4426,10 +4456,8 @@ async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly
       handleEntry.rep[symbolDispose]();
     }
   }
-  Promise.all([module0, module1, module2, module3]).catch(() => {
-  });
-  ({ exports: exports0 } = await instantiateCore(await module2));
-  ({ exports: exports1 } = await instantiateCore(await module0, {
+  ({ exports: exports0 } = instantiateCore(module2));
+  ({ exports: exports1 } = instantiateCore(module0, {
     wasi_snapshot_preview1: {
       args_get: exports0["29"],
       args_sizes_get: exports0["30"],
@@ -4454,54 +4482,54 @@ async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly
       proc_exit: exports0["49"]
     }
   }));
-  ({ exports: exports2 } = await instantiateCore(await module1, {
+  ({ exports: exports2 } = instantiateCore(module1, {
     __main_module__: {
       _start: exports1._start
     },
     env: {
       memory: exports1.memory
     },
-    "wasi:cli/environment@0.2.0-rc-2023-12-05": {
+    "wasi:cli/environment@0.2.0": {
       "get-arguments": exports0["25"],
       "get-environment": exports0["24"]
     },
-    "wasi:cli/exit@0.2.0-rc-2023-12-05": {
+    "wasi:cli/exit@0.2.0": {
       exit: trampoline9
     },
-    "wasi:cli/stderr@0.2.0-rc-2023-12-05": {
+    "wasi:cli/stderr@0.2.0": {
       "get-stderr": trampoline8
     },
-    "wasi:cli/stdin@0.2.0-rc-2023-12-05": {
+    "wasi:cli/stdin@0.2.0": {
       "get-stdin": trampoline10
     },
-    "wasi:cli/stdout@0.2.0-rc-2023-12-05": {
+    "wasi:cli/stdout@0.2.0": {
       "get-stdout": trampoline11
     },
-    "wasi:cli/terminal-input@0.2.0-rc-2023-12-05": {
+    "wasi:cli/terminal-input@0.2.0": {
       "[resource-drop]terminal-input": trampoline7
     },
-    "wasi:cli/terminal-output@0.2.0-rc-2023-12-05": {
+    "wasi:cli/terminal-output@0.2.0": {
       "[resource-drop]terminal-output": trampoline6
     },
-    "wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05": {
+    "wasi:cli/terminal-stderr@0.2.0": {
       "get-terminal-stderr": exports0["28"]
     },
-    "wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05": {
+    "wasi:cli/terminal-stdin@0.2.0": {
       "get-terminal-stdin": exports0["26"]
     },
-    "wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05": {
+    "wasi:cli/terminal-stdout@0.2.0": {
       "get-terminal-stdout": exports0["27"]
     },
-    "wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-10": {
+    "wasi:clocks/monotonic-clock@0.2.0": {
       now: trampoline0
     },
-    "wasi:clocks/wall-clock@0.2.0-rc-2023-11-10": {
+    "wasi:clocks/wall-clock@0.2.0": {
       now: exports0["1"]
     },
-    "wasi:filesystem/preopens@0.2.0-rc-2023-11-10": {
+    "wasi:filesystem/preopens@0.2.0": {
       "get-directories": exports0["0"]
     },
-    "wasi:filesystem/types@0.2.0-rc-2023-11-10": {
+    "wasi:filesystem/types@0.2.0": {
       "[method]descriptor.append-via-stream": exports0["4"],
       "[method]descriptor.create-directory-at": exports0["8"],
       "[method]descriptor.get-flags": exports0["5"],
@@ -4521,10 +4549,10 @@ async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly
       "[resource-drop]directory-entry-stream": trampoline1,
       "filesystem-error-code": exports0["17"]
     },
-    "wasi:io/error@0.2.0-rc-2023-11-10": {
+    "wasi:io/error@0.2.0": {
       "[resource-drop]error": trampoline2
     },
-    "wasi:io/streams@0.2.0-rc-2023-11-10": {
+    "wasi:io/streams@0.2.0": {
       "[method]input-stream.blocking-read": exports0["19"],
       "[method]input-stream.read": exports0["18"],
       "[method]output-stream.blocking-flush": exports0["23"],
@@ -4537,7 +4565,7 @@ async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly
   }));
   memory0 = exports1.memory;
   realloc0 = exports2.cabi_import_realloc;
-  ({ exports: exports3 } = await instantiateCore(await module3, {
+  ({ exports: exports3 } = instantiateCore(module3, {
     "": {
       $imports: exports0.$imports,
       "0": trampoline12,
@@ -4593,7 +4621,7 @@ async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly
     }
   }));
   function run() {
-    const ret = exports2["wasi:cli/run@0.2.0-rc-2023-12-05#run"]();
+    const ret = exports2["wasi:cli/run@0.2.0#run"]();
     let variant0;
     switch (ret) {
       case 0: {
@@ -4633,10 +4661,10 @@ async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly
   let handleCnt5 = 0;
   const handleTable6 = /* @__PURE__ */ new Map();
   let handleCnt6 = 0;
-  const run0_2_0Rc20231205 = {
+  const run0_2_0 = {
     run
   };
-  return { run: run0_2_0Rc20231205, "wasi:cli/run@0.2.0-rc-2023-12-05": run0_2_0Rc20231205 };
+  return { run: run0_2_0, "wasi:cli/run@0.2.0": run0_2_0 };
 }
 
 // lib/api.js