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

Remove TablePlans

Browse Source
This commit is contained in:
Syrus
2020-07-07 15:10:03 -07:00
parent 931aa94587
commit 98f2e8fe26
18 changed files with 74 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/compiler-cranelift/src/func_environ.rs
View File

@@ -18,7 +18,7 @@ use wasm_common::{FunctionIndex, GlobalIndex, MemoryIndex, SignatureIndex, Table
use wasmer_compiler::{WasmError, WasmResult};
use wasmer_runtime::VMBuiltinFunctionIndex;
use wasmer_runtime::VMOffsets;
use wasmer_runtime::{MemoryPlan, MemoryStyle, ModuleInfo, TablePlan, TableStyle};
use wasmer_runtime::{MemoryPlan, MemoryStyle, ModuleInfo, TableStyle};
/// Compute an `ir::ExternalName` for a given wasm function index.
pub fn get_func_name(func_index: FunctionIndex) -> ir::ExternalName {
@@ -88,7 +88,7 @@ pub struct FuncEnvironment<'module_environment> {
memory_plans: &'module_environment PrimaryMap<MemoryIndex, MemoryPlan>,
/// The table plans
table_plans: &'module_environment PrimaryMap<TableIndex, TablePlan>,
table_styles: &'module_environment PrimaryMap<TableIndex, TableStyle>,
}
impl<'module_environment> FuncEnvironment<'module_environment> {
@@ -97,7 +97,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {
module: &'module_environment ModuleInfo,
signatures: &'module_environment PrimaryMap<SignatureIndex, ir::Signature>,
memory_plans: &'module_environment PrimaryMap<MemoryIndex, MemoryPlan>,
table_plans: &'module_environment PrimaryMap<TableIndex, TablePlan>,
table_styles: &'module_environment PrimaryMap<TableIndex, TableStyle>,
) -> Self {
Self {
target_config,
@@ -115,7 +115,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {
data_drop_sig: None,
offsets: VMOffsets::new(target_config.pointer_bytes(), module),
memory_plans,
table_plans,
table_styles,
}
}
@@ -521,7 +521,7 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
readonly: false,
});
let element_size = match self.table_plans[index].style {
let element_size = match self.table_styles[index] {
TableStyle::CallerChecksSignature => {
u64::from(self.offsets.size_of_vmcaller_checked_anyfunc())
}
@@ -774,7 +774,7 @@ impl<'module_environment> BaseFuncEnvironment for FuncEnvironment<'module_enviro
pos.ins().trapz(func_addr, ir::TrapCode::IndirectCallToNull);
// If necessary, check the signature.
match self.table_plans[table_index].style {
match self.table_styles[table_index] {
TableStyle::CallerChecksSignature => {
let sig_id_size = self.offsets.size_of_vmshared_signature_index();
let sig_id_type = Type::int(u16::from(sig_id_size) * 8).unwrap();