mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-08-24 17:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parse a relocation to a different user function out of the object file.

Browse Source 
This updates to a newer inkwell to pick up a fix to Section::get_contents. Picking that up changed builder.build_struct_gep to return a Result, and there's many API updates scattered around to support that.

Compute the function names for all local and imported functions in the module in advance and pass that mapping to the function code generation.

debug_trap is added to Intrinsics, though all users are commented out.
This commit is contained in:
Nick Lewycky
2020-04-29 17:38:57 -07:00
parent d88fb959b9
commit 71eeb135bc
5 changed files with 159 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/compiler-llvm/src/compiler.rs
View File

@ -6,7 +6,7 @@ use crate::config::LLVMConfig;
use crate::trampoline::FuncTrampoline;
use crate::translator::FuncTranslator;
use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
use wasm_common::entity::{EntityRef, PrimaryMap};
use wasm_common::entity::{EntityRef, PrimaryMap, SecondaryMap};
use wasm_common::Features;
use wasm_common::{FuncIndex, FuncType, LocalFuncIndex, MemoryIndex, TableIndex};
use wasmer_compiler::FunctionBodyData;
@ -60,14 +60,22 @@ impl Compiler for LLVMCompiler {
memory_plans: PrimaryMap<MemoryIndex, MemoryPlan>,
table_plans: PrimaryMap<TableIndex, TablePlan>,
) -> Result<Compilation, CompileError> {
let data = Arc::new(Mutex::new(0));
//let data = Arc::new(Mutex::new(0));
let mut func_names = SecondaryMap::new();
for (func_index, _) in &module.functions {
func_names[func_index] = module
.func_names
.get(&func_index)
.cloned()
.unwrap_or_else(|| format!("fn{}", func_index.index()));
}
let functions = function_body_inputs
.into_iter()
.collect::<Vec<(LocalFuncIndex, &FunctionBodyData<'_>)>>()
.par_iter()
.map_init(FuncTranslator::new, |func_translator, (i, input)| {
// TODO: remove (to serialize)
let mut data = data.lock().unwrap();
//let mut data = data.lock().unwrap();
func_translator.translate(
module,
i,
@ -75,6 +83,7 @@ impl Compiler for LLVMCompiler {
self.config(),
&memory_plans,
&table_plans,
&func_names,
)
})
.collect::<Result<Vec<_>, CompileError>>()?