From afa9b5c0606244ba444856b1560cf48ee073edca Mon Sep 17 00:00:00 2001 From: Edoardo Vacchi Date: Thu, 22 Aug 2024 17:08:33 +0200 Subject: [PATCH] wabt: use the new method Signed-off-by: Edoardo Vacchi --- .../java/com/dylibso/chicory/wabt/Wast2Json.java | 15 ++++++++++----- .../java/com/dylibso/chicory/wabt/Wat2Wasm.java | 11 +++++++++-- 2 files changed, 19 insertions(+), 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 index c51a1786e..2efea111a 100644 --- 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 index f8f6dd913..344850c25 100644 --- 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(); }