fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-29 16:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Remove more uses of wasmer_runtime_core from the C API

Browse Source
This commit is contained in:
Mark McCaskey
2020-04-07 17:28:23 -07:00
parent 83f0a043e7
commit db76aea198
5 changed files with 74 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/runtime-c-api/src/export.rs
View File

@ -13,9 +13,9 @@ use crate::{
}; };
use libc::{c_int, c_uint}; use libc::{c_int, c_uint};
use std::{ptr, slice}; use std::{ptr, slice};
use wasmer::wasm::Value; use wasmer::export::{ExportDescriptor, ExternDescriptor};
use wasmer::wasm::{Memory, Value};
use wasmer::{Instance, Module}; use wasmer::{Instance, Module};
use wasmer_runtime_core::{export::Export, module::ExportIndex};
/// Intermediate representation of an `Export` instance that is /// Intermediate representation of an `Export` instance that is
/// exposed to C. /// exposed to C.
@ -24,7 +24,7 @@ pub(crate) struct NamedExport {
pub(crate) name: String, pub(crate) name: String,
/// The export instance. /// The export instance.
pub(crate) export: Export, pub(crate) extern_descriptor: ExternDescriptor,
/// The instance that holds the export. /// The instance that holds the export.
pub(crate) instance: *mut Instance, pub(crate) instance: *mut Instance,
@ -146,7 +146,7 @@ pub unsafe extern "C" fn wasmer_export_descriptors(
let module = &*(module as *const Module); let module = &*(module as *const Module);
let named_export_descriptors: Box<NamedExportDescriptors> = Box::new(NamedExportDescriptors( let named_export_descriptors: Box<NamedExportDescriptors> = Box::new(NamedExportDescriptors(
module.info().exports.iter().map(|e| e.into()).collect(), module.exports().into_iter().map(|e| e.into()).collect(),
)); ));
*export_descriptors = *export_descriptors =
Box::into_raw(named_export_descriptors) as *mut wasmer_export_descriptors_t; Box::into_raw(named_export_descriptors) as *mut wasmer_export_descriptors_t;
@ -269,11 +269,11 @@ pub unsafe extern "C" fn wasmer_export_kind(
export: *mut wasmer_export_t, export: *mut wasmer_export_t,
) -> wasmer_import_export_kind { ) -> wasmer_import_export_kind {
let named_export = &*(export as *mut NamedExport); let named_export = &*(export as *mut NamedExport);
match named_export.export { match named_export.extern_descriptor {
Export::Table(_) => wasmer_import_export_kind::WASM_TABLE, ExternDescriptor::Table(_) => wasmer_import_export_kind::WASM_TABLE,
Export::Function { .. } => wasmer_import_export_kind::WASM_FUNCTION, ExternDescriptor::Function { .. } => wasmer_import_export_kind::WASM_FUNCTION,
Export::Global(_) => wasmer_import_export_kind::WASM_GLOBAL, ExternDescriptor::Global(_) => wasmer_import_export_kind::WASM_GLOBAL,
Export::Memory(_) => wasmer_import_export_kind::WASM_MEMORY, ExternDescriptor::Memory(_) => wasmer_import_export_kind::WASM_MEMORY,
} }
} }
@ -290,8 +290,8 @@ pub unsafe extern "C" fn wasmer_export_func_params_arity(
result: *mut u32, result: *mut u32,
) -> wasmer_result_t { ) -> wasmer_result_t {
let named_export = &*(func as *const NamedExport); let named_export = &*(func as *const NamedExport);
let export = &named_export.export; let export = &named_export.extern_descriptor;
if let Export::Function { ref signature, .. } = *export { if let ExternDescriptor::Function(ref signature) = *export {
*result = signature.params().len() as u32; *result = signature.params().len() as u32;
wasmer_result_t::WASMER_OK wasmer_result_t::WASMER_OK
} else { } else {
@ -316,8 +316,8 @@ pub unsafe extern "C" fn wasmer_export_func_params(
params_len: u32, params_len: u32,
) -> wasmer_result_t { ) -> wasmer_result_t {
let named_export = &*(func as *const NamedExport); let named_export = &*(func as *const NamedExport);
let export = &named_export.export; let export = &named_export.extern_descriptor;
if let Export::Function { ref signature, .. } = *export { if let ExternDescriptor::Function(ref signature) = *export {
let params: &mut [wasmer_value_tag] = let params: &mut [wasmer_value_tag] =
slice::from_raw_parts_mut(params, params_len as usize); slice::from_raw_parts_mut(params, params_len as usize);
for (i, item) in signature.params().iter().enumerate() { for (i, item) in signature.params().iter().enumerate() {
@ -346,8 +346,8 @@ pub unsafe extern "C" fn wasmer_export_func_returns(
returns_len: u32, returns_len: u32,
) -> wasmer_result_t { ) -> wasmer_result_t {
let named_export = &*(func as *const NamedExport); let named_export = &*(func as *const NamedExport);
let export = &named_export.export; let export = &named_export.extern_descriptor;
if let Export::Function { ref signature, .. } = *export { if let ExternDescriptor::Function(ref signature) = *export {
let returns: &mut [wasmer_value_tag] = let returns: &mut [wasmer_value_tag] =
slice::from_raw_parts_mut(returns, returns_len as usize); slice::from_raw_parts_mut(returns, returns_len as usize);
for (i, item) in signature.returns().iter().enumerate() { for (i, item) in signature.returns().iter().enumerate() {
@ -375,8 +375,8 @@ pub unsafe extern "C" fn wasmer_export_func_returns_arity(
result: *mut u32, result: *mut u32,
) -> wasmer_result_t { ) -> wasmer_result_t {
let named_export = &*(func as *const NamedExport); let named_export = &*(func as *const NamedExport);
let export = &named_export.export; let export = &named_export.extern_descriptor;
if let Export::Function { ref signature, .. } = *export { if let ExternDescriptor::Function(ref signature) = *export {
*result = signature.returns().len() as u32; *result = signature.returns().len() as u32;
wasmer_result_t::WASMER_OK wasmer_result_t::WASMER_OK
} else { } else {
@ -409,9 +409,9 @@ pub unsafe extern "C" fn wasmer_export_to_memory(
memory: *mut *mut wasmer_memory_t, memory: *mut *mut wasmer_memory_t,
) -> wasmer_result_t { ) -> wasmer_result_t {
let named_export = &*(export as *const NamedExport); let named_export = &*(export as *const NamedExport);
let export = &named_export.export; let instance = &*named_export.instance;
if let Export::Memory(exported_memory) = export { if let Ok(exported_memory) = instance.exports.get::<Memory>(&named_export.name) {
let mem = Box::new(exported_memory.clone()); let mem = Box::new(exported_memory.clone());
*memory = Box::into_raw(mem) as *mut wasmer_memory_t; *memory = Box::into_raw(mem) as *mut wasmer_memory_t;
wasmer_result_t::WASMER_OK wasmer_result_t::WASMER_OK
@ -518,16 +518,16 @@ pub unsafe extern "C" fn wasmer_export_func_call(
} }
} }
impl From<(&std::string::String, &ExportIndex)> for NamedExportDescriptor { impl<'a> From<ExportDescriptor<'a>> for NamedExportDescriptor {
fn from((name, export_index): (&String, &ExportIndex)) -> Self { fn from(ed: ExportDescriptor) -> Self {
let kind = match *export_index { let kind = match ed.ty {
ExportIndex::Memory(_) => wasmer_import_export_kind::WASM_MEMORY, ExternDescriptor::Memory(_) => wasmer_import_export_kind::WASM_MEMORY,
ExportIndex::Global(_) => wasmer_import_export_kind::WASM_GLOBAL, ExternDescriptor::Global(_) => wasmer_import_export_kind::WASM_GLOBAL,
ExportIndex::Table(_) => wasmer_import_export_kind::WASM_TABLE, ExternDescriptor::Table(_) => wasmer_import_export_kind::WASM_TABLE,
ExportIndex::Func(_) => wasmer_import_export_kind::WASM_FUNCTION, ExternDescriptor::Function(_) => wasmer_import_export_kind::WASM_FUNCTION,
}; };
NamedExportDescriptor { NamedExportDescriptor {
name: name.clone(), name: ed.name.to_string(),
kind, kind,
} }
} }

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

@ -393,10 +393,10 @@ pub unsafe extern "C" fn wasmer_instance_exports(
let instance_ref = &mut *(instance as *mut Instance); let instance_ref = &mut *(instance as *mut Instance);
let mut exports_vec: Vec<NamedExport> = Vec::with_capacity(instance_ref.exports().count()); let mut exports_vec: Vec<NamedExport> = Vec::with_capacity(instance_ref.exports().count());
for (name, export) in instance_ref.exports() { for export_descriptor in instance_ref.module.exports().into_iter() {
exports_vec.push(NamedExport { exports_vec.push(NamedExport {
name: name.clone(), name: export_descriptor.name.to_string(),
export: export.clone(), extern_descriptor: export_descriptor.ty,
instance: instance as *mut Instance, instance: instance as *mut Instance,
}); });
} }

4
lib/runtime-c-api/src/module.rs
View File

@ -9,10 +9,10 @@ use crate::{
}; };
use libc::c_int; use libc::c_int;
use std::{collections::HashMap, slice}; use std::{collections::HashMap, slice};
use wasmer::import::ImportObject; use wasmer::import::{ImportObject, Namespace};
use wasmer::wasm::{Global, Table}; use wasmer::wasm::{Global, Table};
use wasmer::{compile, default_compiler, Instance, Memory, Module}; use wasmer::{compile, default_compiler, Instance, Memory, Module};
use wasmer_runtime_core::{cache::Artifact, export::Export, import::Namespace, load_cache_with}; use wasmer_runtime_core::{cache::Artifact, export::Export, load_cache_with};
#[repr(C)] #[repr(C)]
pub struct wasmer_module_t; pub struct wasmer_module_t;

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

@ -44,7 +44,7 @@ pub unsafe extern "C" fn wasmer_trampoline_buffer_builder_add_callinfo_trampolin
ctx: *const c_void, ctx: *const c_void,
num_params: u32, num_params: u32,
) -> usize { ) -> usize {
use wasmer_runtime_core::types::Type; use wasmer::types::Type;
let builder = &mut *(builder as *mut TrampolineBufferBuilder); let builder = &mut *(builder as *mut TrampolineBufferBuilder);
builder.add_callinfo_trampoline( builder.add_callinfo_trampoline(
mem::transmute(func), mem::transmute(func),

77
lib/runtime-core/src/module.rs
View File

@ -171,43 +171,9 @@ impl Module {
&self.inner.info &self.inner.info
} }
/// Iterate over the [`ExportDescriptor`]s of the exports that this module provides.
pub(crate) fn exports_iter(&self) -> impl Iterator<Item = ExportDescriptor> + '_ {
self.info()
.exports
.iter()
.map(move |(name, &ei)| ExportDescriptor {
name,
ty: match ei {
ExportIndex::Func(f_idx) => {
let sig_idx = self.info().func_assoc[f_idx].into();
self.info().signatures[sig_idx].clone().into()
}
ExportIndex::Global(g_idx) => {
let info = self.info();
let local_global_idx =
LocalGlobalIndex::new(g_idx.index() - info.imported_globals.len());
info.globals[local_global_idx].desc.into()
}
ExportIndex::Memory(m_idx) => {
let info = self.info();
let local_memory_idx =
LocalMemoryIndex::new(m_idx.index() - info.imported_memories.len());
info.memories[local_memory_idx].into()
}
ExportIndex::Table(t_idx) => {
let info = self.info();
let local_table_idx =
LocalTableIndex::new(t_idx.index() - info.imported_tables.len());
info.tables[local_table_idx].into()
}
},
})
}
/// Get the [`ExportDescriptor`]s of the exports this [`Module`] provides. /// Get the [`ExportDescriptor`]s of the exports this [`Module`] provides.
pub fn exports(&self) -> Vec<ExportDescriptor> { pub fn exports(&self) -> Vec<ExportDescriptor> {
self.exports_iter().collect() self.inner.exports()
} }
/// Get the [`ImportDescriptor`]s describing the imports this [`Module`] /// Get the [`ImportDescriptor`]s describing the imports this [`Module`]
@ -304,7 +270,46 @@ impl Clone for Module {
} }
} }
impl ModuleInner {} impl ModuleInner {
/// Iterate over the [`ExportDescriptor`]s of the exports that this module provides.
pub(crate) fn exports_iter(&self) -> impl Iterator<Item = ExportDescriptor> + '_ {
self.info
.exports
.iter()
.map(move |(name, &ei)| ExportDescriptor {
name,
ty: match ei {
ExportIndex::Func(f_idx) => {
let sig_idx = self.info.func_assoc[f_idx].into();
self.info.signatures[sig_idx].clone().into()
}
ExportIndex::Global(g_idx) => {
let info = &self.info;
let local_global_idx =
LocalGlobalIndex::new(g_idx.index() - info.imported_globals.len());
info.globals[local_global_idx].desc.into()
}
ExportIndex::Memory(m_idx) => {
let info = &self.info;
let local_memory_idx =
LocalMemoryIndex::new(m_idx.index() - info.imported_memories.len());
info.memories[local_memory_idx].into()
}
ExportIndex::Table(t_idx) => {
let info = &self.info;
let local_table_idx =
LocalTableIndex::new(t_idx.index() - info.imported_tables.len());
info.tables[local_table_idx].into()
}
},
})
}
/// Get the [`ExportDescriptor`]s of the exports this [`Module`] provides.
pub fn exports(&self) -> Vec<ExportDescriptor> {
self.exports_iter().collect()
}
}
#[doc(hidden)] #[doc(hidden)]
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]