fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-25 06:31:32 +00:00
Code Issues Projects Releases Wiki Activity

Update C API to use new API

Browse Source
This commit is contained in:
Mark McCaskey
2020-04-06 17:09:50 -07:00
parent 99f8c949d1
commit 83f0a043e7
12 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/runtime-c-api/src/instance.rs
View File

@ -10,11 +10,9 @@ use crate::{
};
use libc::{c_char, c_int, c_void};
use std::{collections::HashMap, ffi::CStr, ptr, slice};
use wasmer_runtime::{Ctx, Global, Instance, Memory, Table, Value};
use wasmer_runtime_core::{
export::Export,
import::{ImportObject, Namespace},
};
use wasmer::import::{ImportObject, Namespace};
use wasmer::wasm::{Ctx, Global, Instance, Memory, Table, Value};
use wasmer_runtime_core::export::Export;
/// Opaque pointer to a `wasmer_runtime::Instance` value in Rust.
///
@ -166,7 +164,15 @@ pub unsafe extern "C" fn wasmer_instantiate(
}
let bytes: &[u8] = slice::from_raw_parts_mut(wasm_bytes, wasm_bytes_len as usize);
let result = wasmer_runtime::instantiate(bytes, &import_object);
let module_result = wasmer::compile(bytes);
let module = match module_result {
Ok(module) => module,
Err(error) => {
update_last_error(error);
return wasmer_result_t::WASMER_ERROR;
}
};
let result = module.instantiate(&import_object);
let new_instance = match result {
Ok(instance) => instance,
Err(error) => {