9364eb1d98
* Compute instance exports on demand. Instead having instances eagerly compute a Vec of Externs, and bumping the refcount for each Extern, compute Externs on demand. This also enables `Instance::get_export` to avoid doing a linear search. This also means that the closure returned by `get0` and friends now holds an `InstanceHandle` to dynamically hold the instance live rather than being scoped to a lifetime. * Compute module imports and exports on demand too. And compute Extern::ty on demand too. * Add a utility function for computing an ExternType. * Add a utility function for looking up a function's signature. * Add a utility function for computing the ValType of a Global. * Rename wasmtime_environ::Export to EntityIndex. This helps differentiate it from other Export types in the tree, and describes what it is. * Fix a typo in a comment. * Simplify module imports and exports. * Make `Instance::exports` return the export names. This significantly simplifies the public API, as it's relatively common to need the names, and this avoids the need to do a zip with `Module::exports`. This also changes `ImportType` and `ExportType` to have public members instead of private members and accessors, as I find that simplifies the usage particularly in cases where there are temporary instances. * Remove `Instance::module`. This doesn't quite remove `Instance`'s `module` member, it gets a step closer. * Use a InstanceHandle utility function. * Don't consume self in the `Func::get*` methods. Instead, just create a closure containing the instance handle and the export for them to call. * Use `ExactSizeIterator` to avoid needing separate `num_*` methods. * Rename `Extern::func()` etc. to `into_func()` etc. * Revise examples to avoid using `nth`. * Add convenience methods to instance for getting specific extern types. * Use the convenience functions in more tests and examples. * Avoid cloning strings for `ImportType` and `ExportType`. * Remove more obviated clone() calls. * Simplify `Func`'s closure state. * Make wasmtime::Export's fields private. This makes them more consistent with ExportType. * Fix compilation error. * Make a lifetime parameter explicit, and use better lifetime names. Instead of 'me, use 'instance and 'module to make it clear what the lifetime is. * More lifetime cleanups.
76 lines
2.5 KiB
Rust
76 lines
2.5 KiB
Rust
use anyhow::Result;
|
|
use faerie::{Artifact, Decl, Link};
|
|
use wasmtime_environ::entity::EntityRef;
|
|
use wasmtime_environ::settings;
|
|
use wasmtime_environ::settings::Configurable;
|
|
use wasmtime_environ::{Compilation, Module, RelocationTarget, Relocations};
|
|
|
|
/// Defines module functions
|
|
pub fn declare_functions(
|
|
obj: &mut Artifact,
|
|
module: &Module,
|
|
relocations: &Relocations,
|
|
) -> Result<()> {
|
|
for i in 0..module.local.num_imported_funcs {
|
|
let string_name = format!("_wasm_function_{}", i);
|
|
obj.declare(string_name, Decl::function_import())?;
|
|
}
|
|
for (i, _function_relocs) in relocations.iter().rev() {
|
|
let func_index = module.local.func_index(i);
|
|
let string_name = format!("_wasm_function_{}", func_index.index());
|
|
obj.declare(string_name, Decl::function().global())?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// Emits module functions
|
|
pub fn emit_functions(
|
|
obj: &mut Artifact,
|
|
module: &Module,
|
|
compilation: &Compilation,
|
|
relocations: &Relocations,
|
|
) -> Result<()> {
|
|
debug_assert!(
|
|
module.start_func.is_none()
|
|
|| module.start_func.unwrap().index() >= module.local.num_imported_funcs,
|
|
"imported start functions not supported yet"
|
|
);
|
|
|
|
let mut shared_builder = settings::builder();
|
|
shared_builder
|
|
.enable("enable_verifier")
|
|
.expect("Missing enable_verifier setting");
|
|
|
|
for (i, _function_relocs) in relocations.iter() {
|
|
let body = &compilation.get(i).body;
|
|
let func_index = module.local.func_index(i);
|
|
let string_name = format!("_wasm_function_{}", func_index.index());
|
|
|
|
obj.define(string_name, body.clone())?;
|
|
}
|
|
|
|
for (i, function_relocs) in relocations.iter() {
|
|
let func_index = module.local.func_index(i);
|
|
let string_name = format!("_wasm_function_{}", func_index.index());
|
|
for r in function_relocs {
|
|
debug_assert_eq!(r.addend, 0);
|
|
match r.reloc_target {
|
|
RelocationTarget::UserFunc(target_index) => {
|
|
let target_name = format!("_wasm_function_{}", target_index.index());
|
|
obj.link(Link {
|
|
from: &string_name,
|
|
to: &target_name,
|
|
at: r.offset as u64,
|
|
})?;
|
|
}
|
|
RelocationTarget::JumpTable(_, _) => {
|
|
// ignore relocations for jump tables
|
|
}
|
|
_ => panic!("relocations target not supported yet: {:?}", r.reloc_target),
|
|
};
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|