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

feat(api,emscritpen,wasi) Update WasmExternType to FromToNativeWasmType.

Browse Source
This commit is contained in:
Ivan Enderlin
2020-06-30 12:10:27 +02:00
parent 12c04fbd94
commit 3f924dbb45
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api/src/externals/mod.rs vendored
View File

@@ -3,7 +3,7 @@ mod global;
mod memory; mod memory;
mod table; mod table;
pub use self::function::{Function, HostFunction, WasmExternType, WasmTypeList}; pub use self::function::{FromToNativeWasmType, Function, HostFunction, WasmTypeList};
pub use self::global::Global; pub use self::global::Global;
pub use self::memory::Memory; pub use self::memory::Memory;
pub use self::table::Table; pub use self::table::Table;

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

@@ -19,7 +19,7 @@ mod utils;
pub use crate::exports::{ExportError, Exportable, Exports}; pub use crate::exports::{ExportError, Exportable, Exports};
pub use crate::externals::{ pub use crate::externals::{
Extern, Function, Global, HostFunction, Memory, Table, WasmExternType, WasmTypeList, Extern, FromToNativeWasmType, Function, Global, HostFunction, Memory, Table, WasmTypeList,
}; };
pub use crate::import_object::{ImportObject, ImportObjectIterator, LikeNamespace}; pub use crate::import_object::{ImportObject, ImportObjectIterator, LikeNamespace};
pub use crate::instance::Instance; pub use crate::instance::Instance;

4
lib/api/src/native.rs
View File

@@ -13,7 +13,7 @@ use crate::externals::function::{
FunctionDefinition, HostFunctionDefinition, VMDynamicFunction, VMDynamicFunctionWithEnv, FunctionDefinition, HostFunctionDefinition, VMDynamicFunction, VMDynamicFunctionWithEnv,
VMDynamicFunctionWithoutEnv, WasmFunctionDefinition, VMDynamicFunctionWithoutEnv, WasmFunctionDefinition,
}; };
use crate::{Function, FunctionType, RuntimeError, Store, WasmExternType, WasmTypeList}; use crate::{FromToNativeWasmType, Function, FunctionType, RuntimeError, Store, WasmTypeList};
use std::panic::{catch_unwind, AssertUnwindSafe}; use std::panic::{catch_unwind, AssertUnwindSafe};
use wasm_common::NativeWasmType; use wasm_common::NativeWasmType;
use wasmer_runtime::{ use wasmer_runtime::{
@@ -97,7 +97,7 @@ macro_rules! impl_native_traits {
#[allow(unused_parens, non_snake_case)] #[allow(unused_parens, non_snake_case)]
impl<'a $( , $x )*, Rets> NativeFunc<'a, ( $( $x ),* ), Rets> impl<'a $( , $x )*, Rets> NativeFunc<'a, ( $( $x ),* ), Rets>
where where
$( $x: WasmExternType, )* $( $x: FromToNativeWasmType, )*
Rets: WasmTypeList, Rets: WasmTypeList,
{ {
/// Call the typed func and return results. /// Call the typed func and return results.

4
lib/api/src/ptr.rs
View File

@@ -6,7 +6,7 @@
//! Therefore, you should use this abstraction whenever possible to avoid memory //! Therefore, you should use this abstraction whenever possible to avoid memory
//! related bugs when implementing an ABI. //! related bugs when implementing an ABI.
use crate::{externals::Memory, WasmExternType}; use crate::{externals::Memory, FromToNativeWasmType};
use std::{cell::Cell, fmt, marker::PhantomData, mem}; use std::{cell::Cell, fmt, marker::PhantomData, mem};
use wasm_common::ValueType; use wasm_common::ValueType;
@@ -218,7 +218,7 @@ impl<T: Copy + ValueType> WasmPtr<T, Array> {
} }
} }
unsafe impl<T: Copy, Ty> WasmExternType for WasmPtr<T, Ty> { unsafe impl<T: Copy, Ty> FromToNativeWasmType for WasmPtr<T, Ty> {
type Native = i32; type Native = i32;
fn to_native(self) -> Self::Native { fn to_native(self) -> Self::Native {

6
lib/emscripten/src/ptr.rs
View File

@@ -6,7 +6,7 @@
#![allow(dead_code)] #![allow(dead_code)]
use std::{cell::Cell, fmt}; use std::{cell::Cell, fmt};
pub use wasmer::{Array, Memory, ValueType, WasmExternType}; pub use wasmer::{Array, FromToNativeWasmType, Memory, ValueType};
#[repr(transparent)] #[repr(transparent)]
pub struct WasmPtr<T: Copy, Ty = wasmer::Item>(wasmer::WasmPtr<T, Ty>); pub struct WasmPtr<T: Copy, Ty = wasmer::Item>(wasmer::WasmPtr<T, Ty>);
@@ -26,8 +26,8 @@ impl<T: Copy, Ty> fmt::Debug for WasmPtr<T, Ty> {
} }
} }
unsafe impl<T: Copy, Ty> WasmExternType for WasmPtr<T, Ty> { unsafe impl<T: Copy, Ty> FromToNativeWasmType for WasmPtr<T, Ty> {
type Native = <wasmer::WasmPtr<T, Ty> as WasmExternType>::Native; type Native = <wasmer::WasmPtr<T, Ty> as FromToNativeWasmType>::Native;
fn to_native(self) -> Self::Native { fn to_native(self) -> Self::Native {
self.0.to_native() self.0.to_native()

4
lib/emscripten/src/varargs.rs
View File

@@ -1,6 +1,6 @@
use crate::EmEnv; use crate::EmEnv;
use std::mem; use std::mem;
use wasmer::WasmExternType; use wasmer::FromToNativeWasmType;
// use std::ffi::CStr; // use std::ffi::CStr;
use std::os::raw::c_char; use std::os::raw::c_char;
@@ -26,7 +26,7 @@ impl VarArgs {
} }
} }
unsafe impl WasmExternType for VarArgs { unsafe impl FromToNativeWasmType for VarArgs {
type Native = i32; type Native = i32;
fn to_native(self) -> Self::Native { fn to_native(self) -> Self::Native {

6
lib/wasi/src/ptr.rs
View File

@@ -3,7 +3,7 @@
use crate::syscalls::types::{__wasi_errno_t, __WASI_EFAULT}; use crate::syscalls::types::{__wasi_errno_t, __WASI_EFAULT};
use std::{cell::Cell, fmt}; use std::{cell::Cell, fmt};
pub use wasmer::{Array, Item, Memory, ValueType, WasmExternType, WasmPtr as BaseWasmPtr}; pub use wasmer::{Array, FromToNativeWasmType, Item, Memory, ValueType, WasmPtr as BaseWasmPtr};
#[repr(transparent)] #[repr(transparent)]
pub struct WasmPtr<T: Copy, Ty = Item>(BaseWasmPtr<T, Ty>); pub struct WasmPtr<T: Copy, Ty = Item>(BaseWasmPtr<T, Ty>);
@@ -24,8 +24,8 @@ impl<T: Copy, Ty> fmt::Debug for WasmPtr<T, Ty> {
} }
} }
unsafe impl<T: Copy, Ty> WasmExternType for WasmPtr<T, Ty> { unsafe impl<T: Copy, Ty> FromToNativeWasmType for WasmPtr<T, Ty> {
type Native = <BaseWasmPtr<T, Ty> as WasmExternType>::Native; type Native = <BaseWasmPtr<T, Ty> as FromToNativeWasmType>::Native;
fn to_native(self) -> Self::Native { fn to_native(self) -> Self::Native {
self.0.to_native() self.0.to_native()