wabt: use the new method

Signed-off-by: Edoardo Vacchi <[email protected]>
dylibso · Aug 22, 2024 · afa9b5c · afa9b5c
1 parent 5989b31
commit afa9b5c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/wabt/src/main/java/com/dylibso/chicory/wabt/Wast2Json.java b/wabt/src/main/java/com/dylibso/chicory/wabt/Wast2Json.java
@@ -7,6 +7,7 @@
 import com.dylibso.chicory.log.SystemLogger;
 import com.dylibso.chicory.runtime.HostImports;
 import com.dylibso.chicory.runtime.Instance;
+import com.dylibso.chicory.wasi.HostModule;
 import com.dylibso.chicory.wasi.WasiOptions;
 import com.dylibso.chicory.wasi.WasiPreview1;
 import com.dylibso.chicory.wasm.Module;
@@ -82,12 +83,16 @@ public void process() {
                 args.addAll(List.of(options));
                 wasiOpts.withArguments(args);
 
+                HostModule hostModule = WasiPreview1.toHostModule();
+
                 try (var wasi =
-                        WasiPreview1.builder()
-                                .withLogger(logger)
-                                .withOpts(wasiOpts.build())
-                                .build()) {
-                    HostImports imports = new HostImports(wasi.toHostFunctions());
+                        WasiPreview1.instance(
+                                hostModule,
+                                WasiPreview1.builder()
+                                        .withLogger(logger)
+                                        .withOpts(wasiOpts.build())
+                                        .build())) {
+                    HostImports imports = new HostImports(wasi.hostFunctions());
                     Instance.builder(MODULE).withHostImports(imports).build();
                 }
 

diff --git a/wabt/src/main/java/com/dylibso/chicory/wabt/Wat2Wasm.java b/wabt/src/main/java/com/dylibso/chicory/wabt/Wat2Wasm.java
@@ -6,6 +6,7 @@
 import com.dylibso.chicory.log.SystemLogger;
 import com.dylibso.chicory.runtime.HostImports;
 import com.dylibso.chicory.runtime.Instance;
+import com.dylibso.chicory.wasi.HostModule;
 import com.dylibso.chicory.wasi.WasiOptions;
 import com.dylibso.chicory.wasi.WasiPreview1;
 import com.dylibso.chicory.wasm.Module;
@@ -69,9 +70,15 @@ private static byte[] parse(InputStream is, String fileName) {
                                 .withArguments(List.of("wat2wasm", path.toString(), "--output=-"))
                                 .build();
 
+                HostModule hostModule = WasiPreview1.toHostModule();
                 try (var wasi =
-                        WasiPreview1.builder().withLogger(logger).withOpts(wasiOpts).build()) {
-                    HostImports imports = new HostImports(wasi.toHostFunctions());
+                        WasiPreview1.instance(
+                                hostModule,
+                                WasiPreview1.builder()
+                                        .withLogger(logger)
+                                        .withOpts(wasiOpts)
+                                        .build())) {
+                    HostImports imports = new HostImports(wasi.hostFunctions());
                     Instance.builder(MODULE).withHostImports(imports).build();
                 }