closer

runtime/pom.xml

@@ -39,6 +39,9 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <wastToProcess>i32.wast,i64.wast,local_get.wast,memory.wast,return.wast</wastToProcess>
+        </configuration>
       </plugin>
     </plugins>
   </build>

runtime/src/main/java/com/dylibso/chicory/runtime/ExportFunction.java

@@ -1,5 +1,6 @@
 package com.dylibso.chicory.runtime;
 
+import com.dylibso.chicory.runtime.exceptions.ChicoryException;
 import com.dylibso.chicory.wasm.types.Value;
 
 /**

runtime/src/main/java/com/dylibso/chicory/runtime/Machine.java

@@ -1,5 +1,6 @@
 package com.dylibso.chicory.runtime;
 
+import com.dylibso.chicory.runtime.exceptions.ChicoryException;
 import com.dylibso.chicory.wasm.types.*;
 
 import java.util.*;

runtime/src/main/java/com/dylibso/chicory/runtime/Module.java

@@ -1,10 +1,11 @@
 package com.dylibso.chicory.runtime;
 
+import com.dylibso.chicory.runtime.exceptions.ChicoryException;
+import com.dylibso.chicory.runtime.exceptions.InvalidException;
 import com.dylibso.chicory.wasm.Parser;
 import com.dylibso.chicory.wasm.types.*;
 
 import java.util.HashMap;
-import java.util.Map;
 
 public class Module {
     private com.dylibso.chicory.wasm.Module module;
@@ -15,6 +16,16 @@ public static Module build(String wasmFile) {
         return new Module(parser.parseModule());
     }
 
+    public static Module build(String wasmFile, ModuleType type) {
+        switch (type) {
+            case TEXT:
+                return build(wasmFile);
+            default:
+                // TODO: implement me
+                throw new InvalidException("type mismatch");
+        }
+    }
+
     protected Module(com.dylibso.chicory.wasm.Module module) {
         this.module = module;
         this.exports = new HashMap<>();

runtime/src/main/java/com/dylibso/chicory/runtime/ModuleType.java

@@ -0,0 +1,6 @@
+package com.dylibso.chicory.runtime;
+
+public enum ModuleType {
+    TEXT,
+    BINARY
+}

runtime/src/main/java/com/dylibso/chicory/runtime/TrapException.java

@@ -1,5 +1,7 @@
 package com.dylibso.chicory.runtime;
 
+import com.dylibso.chicory.runtime.exceptions.ChicoryException;
+
 import java.util.List;
 import java.util.Stack;
 

runtime/src/main/java/com/dylibso/chicory/runtime/exceptions/ChicoryException.java

@@ -0,0 +1,13 @@
+package com.dylibso.chicory.runtime.exceptions;
+
+public class ChicoryException extends RuntimeException {
+    public ChicoryException(String msg) {
+        super(msg);
+    }
+    public ChicoryException(Throwable cause) {
+        super(cause);
+    }
+    public ChicoryException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}

runtime/src/main/java/com/dylibso/chicory/runtime/exceptions/InvalidException.java

@@ -0,0 +1,13 @@
+package com.dylibso.chicory.runtime.exceptions;
+
+public class InvalidException extends ChicoryException {
+    public InvalidException(String msg) {
+        super(msg);
+    }
+    public InvalidException(Throwable cause) {
+        super(cause);
+    }
+    public InvalidException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}

runtime/src/main/java/com/dylibso/chicory/runtime/exceptions/MalformedException.java

@@ -0,0 +1,13 @@
+package com.dylibso.chicory.runtime.exceptions;
+
+public class MalformedException extends ChicoryException {
+    public MalformedException(String msg) {
+        super(msg);
+    }
+    public MalformedException(Throwable cause) {
+        super(cause);
+    }
+    public MalformedException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}

runtime/src/main/java/com/dylibso/chicory/runtime/exceptions/WASMRuntimeException.java

@@ -0,0 +1,13 @@
+package com.dylibso.chicory.runtime.exceptions;
+
+public class WASMRuntimeException extends ChicoryException {
+    public WASMRuntimeException(String msg) {
+        super(msg);
+    }
+    public WASMRuntimeException(Throwable cause) {
+        super(cause);
+    }
+    public WASMRuntimeException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}