f

Author: axic

bindings/rust/evmc-loader/src/lib.rs

@@ -2,22 +2,39 @@
 // Copyright 2019 The EVMC Authors.
 // Licensed under the Apache License, Version 2.0.
 
+use std::ffi::{CStr, CString};
+
 mod sys;
 
+pub fn load_and_configure(
+    config: &str,
+) -> Result<*mut sys::evmc_vm, (sys::evmc_loader_error_code, String)> {
+    let config_cstr = CString::new(config).unwrap();
+    let mut error_code = sys::evmc_loader_error_code::EVMC_LOADER_UNSPECIFIED_ERROR;
+    let instance = unsafe { sys::evmc_load_and_configure(config_cstr.as_ptr(), &mut error_code) };
+
+    if error_code == sys::evmc_loader_error_code::EVMC_LOADER_SUCCESS {
+        assert!(!instance.is_null());
+        Ok(instance)
+    } else {
+        assert!(instance.is_null());
+        let error_msg = unsafe { CStr::from_ptr(sys::evmc_last_error_msg()) }
+            .to_str()
+            .expect("well formed error message") // TODO free the vm
+            .to_string();
+        Err((error_code, error_msg))
+    }
+}
+
 #[cfg(test)]
 mod tests {
-use std::ffi::CString;
-use std::os::raw::c_char;
+    use std::ffi::CString;
+    use std::os::raw::c_char;
 
     use super::*;
 
     #[test]
     fn load_fail() {
-        let c_str = CString::new("test.so").unwrap();
-        unsafe {
-            let mut error_code = sys::evmc_loader_error_code::EVMC_LOADER_UNSPECIFIED_ERROR;
-            let instance = sys::evmc_load_and_create(c_str.as_ptr() as *const c_char, &mut error_code);
-        println!("{:?}", error_code);
-        }
+        println!("{:?}", load_and_configure("test.so"));
     }
 }

bindings/rust/evmc-loader/src/sys.rs

@@ -10,8 +10,8 @@ include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
 #[cfg(test)]
 mod tests {
-use std::ffi::CString;
-use std::os::raw::c_char;
+    use std::ffi::CString;
+    use std::os::raw::c_char;
 
     use super::*;
 
@@ -21,7 +21,7 @@ use std::os::raw::c_char;
         unsafe {
             let mut error_code = evmc_loader_error_code::EVMC_LOADER_UNSPECIFIED_ERROR;
             let instance = evmc_load_and_create(c_str.as_ptr() as *const c_char, &mut error_code);
-        println!("{:?}", error_code);
+            println!("{:?}", error_code);
         }
     }
 }