Support imports in wasm2obj
This commit is contained in:
committed by
Dan Gohman
parent
cc5efeb54d
commit
474809f5f3
@@ -4,12 +4,36 @@ use cranelift_entity::EntityRef;
|
||||
use faerie::{Artifact, Decl, Link};
|
||||
use wasmtime_environ::{Compilation, Module, RelocationTarget, Relocations};
|
||||
|
||||
fn get_reloc_target_special_import_name(target: RelocationTarget) -> Option<&'static str> {
|
||||
Some(match target {
|
||||
RelocationTarget::Memory32Grow => &"wasmtime_memory32_grow",
|
||||
RelocationTarget::ImportedMemory32Grow => &"wasmtime_memory32_grow",
|
||||
RelocationTarget::Memory32Size => &"wasmtime_memory32_size",
|
||||
RelocationTarget::ImportedMemory32Size => &"wasmtime_imported_memory32_size",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
/// Defines module functions
|
||||
pub fn declare_functions(
|
||||
obj: &mut Artifact,
|
||||
module: &Module,
|
||||
relocations: &Relocations,
|
||||
) -> Result<(), String> {
|
||||
for i in 0..module.imported_funcs.len() {
|
||||
let string_name = format!("_wasm_function_{}", i);
|
||||
obj.declare(string_name, Decl::function_import())
|
||||
.map_err(|err| format!("{}", err))?;
|
||||
}
|
||||
for (_, function_relocs) in relocations.iter() {
|
||||
for r in function_relocs {
|
||||
let special_import_name = get_reloc_target_special_import_name(r.reloc_target);
|
||||
if let Some(special_import_name) = special_import_name {
|
||||
obj.declare(special_import_name, Decl::function_import())
|
||||
.map_err(|err| format!("{}", err))?;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (i, _function_relocs) in relocations.iter().rev() {
|
||||
let func_index = module.func_index(i);
|
||||
let string_name = format!("_wasm_function_{}", func_index.index());
|
||||
@@ -61,7 +85,18 @@ pub fn emit_functions(
|
||||
})
|
||||
.map_err(|err| format!("{}", err))?;
|
||||
}
|
||||
_ => panic!("relocations target not supported yet"),
|
||||
RelocationTarget::Memory32Grow
|
||||
| RelocationTarget::ImportedMemory32Grow
|
||||
| RelocationTarget::Memory32Size
|
||||
| RelocationTarget::ImportedMemory32Size => {
|
||||
obj.link(Link {
|
||||
from: &string_name,
|
||||
to: get_reloc_target_special_import_name(r.reloc_target).expect("name"),
|
||||
at: r.offset as u64,
|
||||
})
|
||||
.map_err(|err| format!("{}", err))?;
|
||||
}
|
||||
_ => panic!("relocations target not supported yet: {:?}", r.reloc_target),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user