f

Author: axic

bindings/rust/src/lib.rs

@@ -44,7 +44,7 @@ impl Drop for Instance {
 }
 
 impl Module {
-    fn instantiate(mut self) -> Option<Instance> {
+    fn instantiate(self) -> Option<Instance> {
         // An instance was already created.
         if self.ptr.is_null() {
             return None;
@@ -61,6 +61,8 @@ impl Module {
     }
 }
 
+/*
+Introduce nicer abstractions.
 enum Value {
     U32(u32),
     U64(u64),
@@ -73,10 +75,16 @@ enum Result {
     NoValue,
     Value(Value),
 }
+*/
+
+pub type Value = sys::FizzyValue;
+
+pub type ExecutionResult = sys::FizzyExecutionResult;
 
 impl Instance {
-    fn execute(&mut self, func_idx: u32, args: &[Value]) -> Result {
-        Result::Trapped
+    fn execute(&mut self, func_idx: u32, args: &[Value]) -> ExecutionResult {
+        // FIXME: pass args
+        unsafe { sys::fizzy_execute(self.ptr.as_ptr(), func_idx, std::ptr::null(), 0, 0) }
     }
 }
 
@@ -115,4 +123,15 @@ mod tests {
         let instance = module.unwrap().instantiate();
         assert!(instance.is_some());
     }
+
+    #[test]
+    fn execute_wasm() {
+        let module = parse(&[0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00]);
+        assert!(module.is_some());
+        let instance = module.unwrap().instantiate();
+        assert!(instance.is_some());
+        let result = instance.unwrap().execute(0, &[]);
+        assert!(result.trapped);
+        assert!(!result.has_value);
+    }
 }