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

Include trampolines in the generated object file.

Browse Source
This commit is contained in:
Nick Lewycky
2020-08-05 14:20:47 -07:00
parent 0b62c775de
commit 9ca46f4f2d
2 changed files with 81 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,6 +163,10 @@ impl LLVMCompiler {
let target_machine = self.config().target_machine(target);
let ctx = Context::create();
let merged_module = ctx.create_module("");
// TODO: make these steps run in parallel instead of in three phases
// with a serial step in between them.
function_body_inputs
.into_iter()
.collect::<Vec<_>>()
@ -198,6 +202,52 @@ impl LLVMCompiler {
merged_module.link_in_module(m).unwrap();
});
compile_info.module
.signatures
.values()
.collect::<Vec<_>>()
.par_iter()
.map_init(
|| {
let target_machine = self.config().target_machine(target);
FuncTrampoline::new(target_machine)
},
|func_trampoline, sig| {
let module = func_trampoline.trampoline_to_module(sig, self.config())?;
Ok(module.write_bitcode_to_memory().as_slice().to_vec())
}
)
.collect::<Result<Vec<_>, CompileError>>()?
.into_iter()
.for_each(|bc| {
let membuf = MemoryBuffer::create_from_memory_range(&bc, "");
let m = Module::parse_bitcode_from_buffer(&membuf, &ctx).unwrap();
merged_module.link_in_module(m).unwrap();
});
compile_info.module
.signatures
.values()
.collect::<Vec<_>>()
.par_iter()
.map_init(
|| {
let target_machine = self.config().target_machine(target);
FuncTrampoline::new(target_machine)
},
|func_trampoline, sig| {
let module = func_trampoline.dynamic_trampoline_to_module(sig, self.config())?;
Ok(module.write_bitcode_to_memory().as_slice().to_vec())
}
)
.collect::<Result<Vec<_>, CompileError>>()?
.into_iter()
.for_each(|bc| {
let membuf = MemoryBuffer::create_from_memory_range(&bc, "");
let m = Module::parse_bitcode_from_buffer(&membuf, &ctx).unwrap();
merged_module.link_in_module(m).unwrap();
});
if self.config().enable_verifier {
merged_module.verify().unwrap();
}