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

Use module instead of module.local

Browse Source
This commit is contained in:
Syrus
2020-04-21 23:27:43 -07:00
parent 5e59eb895b
commit 57af68df13
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/compiler-llvm/src/translator/code.rs
View File

@@ -90,7 +90,7 @@ impl FuncTranslator {
function_body: &FunctionBodyData,
config: &LLVMConfig,
) -> Result<CompiledFunction, CompileError> {
let func_index = wasm_module.local.func_index(*func_index);
let func_index = wasm_module.func_index(*func_index);
let func_name = wasm_module.func_names.get(&func_index).unwrap().as_str();
let module_name = match wasm_module.name.as_ref() {
None => format!("<anonymous module> function {}", func_name),
@@ -105,7 +105,7 @@ impl FuncTranslator {
let wasm_fn_type = wasm_module
.local
.signatures
.get(*wasm_module.local.functions.get(func_index).unwrap())
.get(*wasm_module.functions.get(func_index).unwrap())
.unwrap();
let intrinsics = Intrinsics::declare(&module, &self.ctx);
@@ -2031,8 +2031,8 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
}
Operator::Call { function_index } => {
let func_index = FuncIndex::from_u32(function_index);
let sigindex = module.local.functions.get(func_index).unwrap();
let func_type = module.local.signatures.get(*sigindex).unwrap();
let sigindex = module.functions.get(func_index).unwrap();
let func_type = module.signatures.get(*sigindex).unwrap();
let func_name = module.func_names.get(&func_index).unwrap();
let llvm_func_type = func_type_to_llvm(&self.context, &intrinsics, func_type);
@@ -2125,7 +2125,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
}
Operator::CallIndirect { index, table_index } => {
let sigindex = SignatureIndex::from_u32(index);
let func_type = module.local.signatures.get(sigindex).unwrap();
let func_type = module.signatures.get(sigindex).unwrap();
let expected_dynamic_sigindex = ctx.dynamic_sigindex(sigindex, intrinsics);
let (table_base, table_bound) = ctx.table(
TableIndex::from_u32(table_index),
@@ -8630,12 +8630,12 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
Operator::MemoryGrow { reserved } => {
let mem_index = MemoryIndex::from_u32(reserved);
let func_value = if let Some(local_mem_index) =
module.local.local_memory_index(mem_index)
module.local_memory_index(mem_index)
{
match module
.local
.memory_plans
.get(module.local.memory_index(local_mem_index))
.get(module.memory_index(local_mem_index))
.unwrap()
.style
{
@@ -8643,7 +8643,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
MemoryStyle::Static { bound: _ } => intrinsics.memory_grow_static_local,
}
} else {
match module.local.memory_plans.get(mem_index).unwrap().style {
match module.memory_plans.get(mem_index).unwrap().style {
MemoryStyle::Dynamic => intrinsics.memory_grow_dynamic_import,
MemoryStyle::Static { bound: _ } => intrinsics.memory_grow_static_import,
}
@@ -8665,12 +8665,12 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
Operator::MemorySize { reserved } => {
let mem_index = MemoryIndex::from_u32(reserved);
let func_value = if let Some(local_mem_index) =
module.local.local_memory_index(mem_index)
module.local_memory_index(mem_index)
{
match module
.local
.memory_plans
.get(module.local.memory_index(local_mem_index))
.get(module.memory_index(local_mem_index))
.unwrap()
.style
{
@@ -8678,7 +8678,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
MemoryStyle::Static { bound: _ } => intrinsics.memory_size_static_local,
}
} else {
match module.local.memory_plans.get(mem_index).unwrap().style {
match module.memory_plans.get(mem_index).unwrap().style {
MemoryStyle::Dynamic => intrinsics.memory_size_dynamic_import,
MemoryStyle::Static { bound: _ } => intrinsics.memory_size_static_import,
}

10
lib/compiler-llvm/src/translator/intrinsics.rs
View File

@@ -703,8 +703,8 @@ impl<'ctx, 'a> CtxType<'ctx, 'a> {
*cached_memories.entry(index).or_insert_with(|| {
let (memory_array_ptr_ptr, index, memory_type, minimum, maximum, field_name) = {
let desc = wasm_module.local.memory_plans.get(index).unwrap();
if let Some(local_mem_index) = wasm_module.local.local_memory_index(index) {
let desc = wasm_module.memory_plans.get(index).unwrap();
if let Some(local_mem_index) = wasm_module.local_memory_index(index) {
(
unsafe {
cache_builder.build_struct_gep(
@@ -832,7 +832,7 @@ impl<'ctx, 'a> CtxType<'ctx, 'a> {
ptr_to_bounds,
} = *cached_tables.entry(index).or_insert_with(|| {
let (table_array_ptr_ptr, index, field_name) =
if let Some(local_table_index) = wasm_module.local.local_table_index(index) {
if let Some(local_table_index) = wasm_module.local_table_index(index) {
(
unsafe {
cache_builder.build_struct_gep(
@@ -985,8 +985,8 @@ impl<'ctx, 'a> CtxType<'ctx, 'a> {
*cached_globals.entry(index).or_insert_with(|| {
let (globals_array_ptr_ptr, index, mutable, wasmer_ty, field_name) = {
let desc = wasm_module.local.globals.get(index).unwrap();
if let Some(_local_global_index) = wasm_module.local.local_global_index(index) {
let desc = wasm_module.globals.get(index).unwrap();
if let Some(_local_global_index) = wasm_module.local_global_index(index) {
(
unsafe {
cache_builder.build_struct_gep(