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

Fill in CompiledFunction::body with the instructions.

Browse Source 
Use a bit of a hack to find the function, we ask LLVM to emit it to a non-standard section with a name of our choosing, and that entire section should have our function body and nothing else.
This commit is contained in:
Nick Lewycky
2020-04-24 16:06:03 -07:00
parent 8b7da22a1a
commit 474b3eb2f2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,7 @@ impl FuncTranslator {
// TODO: figure out how many bytes long vmctx is, and mark it dereferenceable. (no need to mark it nonnull once we do this.) // TODO: figure out how many bytes long vmctx is, and mark it dereferenceable. (no need to mark it nonnull once we do this.)
// TODO: mark vmctx nofree // TODO: mark vmctx nofree
func.set_personality_function(intrinsics.personality); func.set_personality_function(intrinsics.personality);
func.as_global_value().set_section("wasmer_function");
let entry = self.ctx.append_basic_block(func, "entry"); let entry = self.ctx.append_basic_block(func, "entry");
let start_of_code = self.ctx.append_basic_block(func, "start_of_code"); let start_of_code = self.ctx.append_basic_block(func, "start_of_code");
@ -267,13 +268,17 @@ impl FuncTranslator {
.write_to_memory_buffer(&mut module, FileType::Object) .write_to_memory_buffer(&mut module, FileType::Object)
.unwrap(); .unwrap();
//let _mem_buf_slice = memory_buffer.as_slice(); let object = memory_buffer.create_object_file().map_err(|()| {
memory_buffer.create_object_file().map_err(|()| {
CompileError::Codegen("failed to create object file from llvm ir".to_string()) CompileError::Codegen("failed to create object file from llvm ir".to_string())
})?; })?;
// TODO: grab text section, use it to fill in 'body'. let mut bytes = vec![];
for section in object.get_sections() {
if section.get_name().to_bytes() == "wasmer_function".as_bytes() {
bytes.extend(section.get_contents().to_bytes());
break;
}
}
let address_map = FunctionAddressMap { let address_map = FunctionAddressMap {
instructions: vec![], instructions: vec![],
@ -285,7 +290,7 @@ impl FuncTranslator {
Ok(CompiledFunction { Ok(CompiledFunction {
address_map, address_map,
body: vec![], body: bytes,
jt_offsets: SecondaryMap::new(), jt_offsets: SecondaryMap::new(),
unwind_info: CompiledFunctionUnwindInfo::None, unwind_info: CompiledFunctionUnwindInfo::None,
relocations: vec![], relocations: vec![],