Merge pull request #3537 from enebo/topic/javawasm_changes

[java-wasm] Allow serialize to be called separately from serializeParse.

Author: enebo

java-wasm/src/main/java/org/prism/Prism.java

@@ -2,11 +2,11 @@
 
 import com.dylibso.chicory.runtime.ByteArrayMemory;
 import com.dylibso.chicory.experimental.hostmodule.annotations.WasmModuleInterface;
-import com.dylibso.chicory.runtime.ByteArrayMemory;
 import com.dylibso.chicory.runtime.ImportValues;
 import com.dylibso.chicory.runtime.Instance;
 import com.dylibso.chicory.wasi.WasiOptions;
 import com.dylibso.chicory.wasi.WasiPreview1;
+import com.dylibso.chicory.wasm.types.MemoryLimits;
 
 import java.nio.charset.StandardCharsets;
 
@@ -22,7 +22,7 @@ public Prism() {
     public Prism(WasiOptions wasiOpts) {
         wasi = WasiPreview1.builder().withOptions(wasiOpts).build();
         instance = Instance.builder(PrismModule.load())
-            .withMemoryFactory(ByteArrayMemory::new)
+            .withMemoryFactory(limits -> new ByteArrayMemory(new MemoryLimits(10, MemoryLimits.MAX_PAGES)))
             .withMachineFactory(PrismModule::create)
             .withImportValues(ImportValues.builder().addFunction(wasi.toHostFunctions()).build())
             .build();
@@ -33,25 +33,23 @@ public Prism_ModuleExports exports() {
         return exports;
     }
 
-    public ParseResult serializeParse(byte[] packedOptions, String source) {
-        var sourceBytes = source.getBytes(StandardCharsets.US_ASCII);
-
+    public byte[] serialize(byte[] packedOptions, byte[] source, int sourceLength) {
         int sourcePointer = 0;
         int optionsPointer = 0;
         int bufferPointer = 0;
         int resultPointer = 0;
         byte[] result;
         try {
-            sourcePointer = exports.calloc(1, source.length());
-            exports.memory().writeString(sourcePointer, source);
+            sourcePointer = exports.calloc(1, sourceLength);
+            exports.memory().write(sourcePointer, source);
 
             optionsPointer = exports.calloc(1, packedOptions.length);
             exports.memory().write(optionsPointer, packedOptions);
 
             bufferPointer = exports.calloc(exports.pmBufferSizeof(), 1);
             exports.pmBufferInit(bufferPointer);
 
-            exports.pmSerializeParse(bufferPointer, sourcePointer, source.length(), optionsPointer);
+            exports.pmSerializeParse(bufferPointer, sourcePointer, sourceLength, optionsPointer);
 
             resultPointer = exports.pmBufferValue(bufferPointer);
 
@@ -73,6 +71,14 @@ public ParseResult serializeParse(byte[] packedOptions, String source) {
             }
         }
 
+        return result;
+    }
+
+    public ParseResult serializeParse(byte[] packedOptions, String source) {
+        var sourceBytes = source.getBytes(StandardCharsets.US_ASCII);
+
+        byte[] result = serialize(packedOptions, sourceBytes, sourceBytes.length);
+
         return Loader.load(result, sourceBytes);
     }