mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 21:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed c-api compilation

Browse Source
This commit is contained in:
Syrus
2020-06-17 23:17:13 -07:00
parent 99bd98458a
commit 5f6c931710
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/c-api/src/lib.rs
View File

@@ -195,7 +195,7 @@ pub(crate) unsafe fn get_slice_checked<'a, T>(ptr: *const T, len: usize) -> &'a
lazy_static! { lazy_static! {
pub(crate) static ref GLOBAL_STORE: wasmer::Store = pub(crate) static ref GLOBAL_STORE: wasmer::Store =
wasmer::Store::new(&crate::wasm_c_api::wasm_engine_new().inner); wasmer::Store::new(&*crate::wasm_c_api::wasm_engine_new().inner);
} }
pub(crate) fn get_global_store() -> &'static wasmer::Store { pub(crate) fn get_global_store() -> &'static wasmer::Store {

15
lib/c-api/src/wasm_c_api.rs
View File

@@ -10,9 +10,9 @@ use std::sync::Arc;
#[cfg(feature = "engine")] #[cfg(feature = "engine")]
use wasmer::Tunables; use wasmer::Tunables;
use wasmer::{ use wasmer::{
Engine, ExportType, Extern, ExternType, Function, FunctionType, Global, GlobalType, Instance, Engine, ExportType, Extern, ExternType, Features, Function, FunctionType, Global, GlobalType,
Memory, MemoryType, Module, Mutability, OrderedResolver, Pages, RuntimeError, Store, Table, Instance, Memory, MemoryType, Module, Mutability, OrderedResolver, Pages, RuntimeError, Store,
TableType, Val, ValType, Table, TableType, Val, ValType,
}; };
#[cfg(feature = "jit")] #[cfg(feature = "jit")]
use wasmer_engine_jit::JITEngine; use wasmer_engine_jit::JITEngine;
@@ -48,7 +48,7 @@ pub extern "C" fn wasm_config_new() -> *mut wasm_config_t {
#[repr(C)] #[repr(C)]
pub struct wasm_engine_t { pub struct wasm_engine_t {
pub(crate) inner: Arc<dyn Engine + Send + Sync>, pub(crate) inner: Box<dyn Engine + Send + Sync>,
} }
cfg_if! { cfg_if! {
@@ -73,7 +73,8 @@ cfg_if! {
pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> { pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
let compiler_config: Box<dyn CompilerConfig> = get_default_compiler_config(); let compiler_config: Box<dyn CompilerConfig> = get_default_compiler_config();
let tunables = Tunables::default(); let tunables = Tunables::default();
let engine: Arc<dyn Engine + Send + Sync> = Arc::new(JITEngine::new(compiler_config, tunables)); let features = Features::default();
let engine: Box<dyn Engine + Send + Sync> = Box::new(JITEngine::new(compiler_config, tunables, features));
Box::new(wasm_engine_t { inner: engine }) Box::new(wasm_engine_t { inner: engine })
} }
} }
@@ -82,7 +83,7 @@ cfg_if! {
#[no_mangle] #[no_mangle]
pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> { pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
let tunables = Tunables::default(); let tunables = Tunables::default();
let engine: Arc<dyn Engine + Send + Sync> = Arc::new(JITEngine::headless(tunables)); let engine: Box<dyn Engine + Send + Sync> = Arc::new(JITEngine::headless(tunables));
Box::new(wasm_engine_t { inner: engine }) Box::new(wasm_engine_t { inner: engine })
} }
} }
@@ -299,7 +300,7 @@ pub unsafe extern "C" fn wasm_store_new(
) -> Option<NonNull<wasm_store_t>> { ) -> Option<NonNull<wasm_store_t>> {
let wasm_engine_ptr = wasm_engine_ptr?; let wasm_engine_ptr = wasm_engine_ptr?;
let wasm_engine = wasm_engine_ptr.as_ref(); let wasm_engine = wasm_engine_ptr.as_ref();
let store = Store::new(&wasm_engine.inner); let store = Store::new(&*wasm_engine.inner);
Some(NonNull::new_unchecked( Some(NonNull::new_unchecked(
Box::into_raw(Box::new(store)) as *mut wasm_store_t Box::into_raw(Box::new(store)) as *mut wasm_store_t
)) ))