Implementing instantiate and call

This commit is contained in:
Brandon Fish
2019-02-02 00:26:10 -06:00
parent 62f7bb607e
commit be19e96669
6 changed files with 98 additions and 8 deletions

View File

@ -1,8 +1,9 @@
extern crate wasmer_runtime;
use std::os::raw::c_char;
use wasmer_runtime::ImportObject;
use libc::{c_char, c_int, uint32_t, uint8_t};
use std::ffi::CStr;
use std::str;
use wasmer_runtime::{Instance, ImportObject, Value};
#[allow(non_camel_case_types)]
pub struct wasmer_import_object_t();
@ -18,6 +19,14 @@ pub enum wasmer_compile_result_t {
WASMER_COMPILE_ERROR = 2,
}
#[allow(non_camel_case_types)]
#[no_mangle]
#[repr(C)]
pub enum wasmer_call_result_t {
WASMER_CALL_OK = 1,
WASMER_CALL_ERROR = 2,
}
#[no_mangle]
pub extern "C" fn wasmer_import_object_new() -> *mut wasmer_import_object_t {
Box::into_raw(Box::new(ImportObject::new())) as *mut wasmer_import_object_t
@ -35,16 +44,61 @@ pub extern "C" fn wasmer_import_object_destroy(import_object: *mut wasmer_import
#[no_mangle]
pub extern "C" fn wasmer_instantiate(
mut instance: *mut wasmer_instance_t,
bytes: *const c_char,
wasm_bytes: *mut uint8_t,
wasm_bytes_len: uint32_t,
import_object: *mut wasmer_import_object_t,
) -> wasmer_compile_result_t {
let import_object = unsafe { Box::from_raw(import_object as *mut ImportObject) };
let bytes = &[];
if wasm_bytes.is_null() {
return wasmer_compile_result_t::WASMER_COMPILE_ERROR
}
let bytes: &[u8] = unsafe { ::std::slice::from_raw_parts_mut(wasm_bytes, wasm_bytes_len as usize) };
let result = wasmer_runtime::instantiate(bytes, *import_object);
let new_instance = match result {
Ok(instance) => instance,
Err(error) => return wasmer_compile_result_t::WASMER_COMPILE_ERROR,
Err(error) => {
println!("Err: {:?}", error);
return wasmer_compile_result_t::WASMER_COMPILE_ERROR
},
};
instance = Box::into_raw(Box::new(new_instance)) as *mut wasmer_instance_t;
wasmer_compile_result_t::WASMER_COMPILE_OK
}
#[allow(clippy::cast_ptr_alignment)]
#[no_mangle]
pub extern "C" fn wasmer_instance_call(instance: *mut wasmer_instance_t,
name: *const c_char) -> wasmer_call_result_t {
// TODO handle params and results
if instance.is_null(){
println!("Instance null");
return wasmer_call_result_t::WASMER_CALL_ERROR;
}
if name.is_null(){
println!("Name null");
return wasmer_call_result_t::WASMER_CALL_ERROR;
}
let func_name_c = unsafe {
CStr::from_ptr(name)
};
let func_name_r = func_name_c.to_str().unwrap();
let instance = unsafe { Box::from_raw(instance as *mut Instance) };
let result = instance.call(func_name_r, &[Value::I32(1), Value::I32(2)]);
match result {
Ok(res) => {
wasmer_call_result_t::WASMER_CALL_OK
},
Err(err) => {
println!("Err: {:?}", err);
wasmer_call_result_t::WASMER_CALL_ERROR
}
}
}
#[allow(clippy::cast_ptr_alignment)]
#[no_mangle]
pub extern "C" fn wasmer_instance_destroy(instance: *mut wasmer_instance_t) {
if !instance.is_null() {
drop(unsafe { Box::from_raw(instance as *mut Instance) });
}
}