39e57e3e9a
* Migrate back to `std::` stylistically This commit moves away from idioms such as `alloc::` and `core::` as imports of standard data structures and types. Instead it migrates all crates to uniformly use `std::` for importing standard data structures and types. This also removes the `std` and `core` features from all crates to and removes any conditional checking for `feature = "std"` All of this support was previously added in #407 in an effort to make wasmtime/cranelift "`no_std` compatible". Unfortunately though this change comes at a cost: * The usage of `alloc` and `core` isn't idiomatic. Especially trying to dual between types like `HashMap` from `std` as well as from `hashbrown` causes imports to be surprising in some cases. * Unfortunately there was no CI check that crates were `no_std`, so none of them actually were. Many crates still imported from `std` or depended on crates that used `std`. It's important to note, however, that **this does not mean that wasmtime will not run in embedded environments**. The style of the code today and idioms aren't ready in Rust to support this degree of multiplexing and makes it somewhat difficult to keep up with the style of `wasmtime`. Instead it's intended that embedded runtime support will be added as necessary. Currently only `std` is necessary to build `wasmtime`, and platforms that natively need to execute `wasmtime` will need to use a Rust target that supports `std`. Note though that not all of `std` needs to be supported, but instead much of it could be configured off to return errors, and `wasmtime` would be configured to gracefully handle errors. The goal of this PR is to move `wasmtime` back to idiomatic usage of features/`std`/imports/etc and help development in the short-term. Long-term when platform concerns arise (if any) they can be addressed by moving back to `no_std` crates (but fixing the issues mentioned above) or ensuring that the target in Rust has `std` available. * Start filling out platform support doc
59 lines
1.8 KiB
Rust
59 lines
1.8 KiB
Rust
//! Data structures to provide transformation of the source
|
|
// addresses of a WebAssembly module into the native code.
|
|
|
|
use cranelift_codegen::ir;
|
|
use cranelift_entity::PrimaryMap;
|
|
use cranelift_wasm::DefinedFuncIndex;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
/// Single source location to generated address mapping.
|
|
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
|
|
pub struct InstructionAddressMap {
|
|
/// Original source location.
|
|
pub srcloc: ir::SourceLoc,
|
|
|
|
/// Generated instructions offset.
|
|
pub code_offset: usize,
|
|
|
|
/// Generated instructions length.
|
|
pub code_len: usize,
|
|
}
|
|
|
|
/// Function and its instructions addresses mappings.
|
|
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
|
|
pub struct FunctionAddressMap {
|
|
/// Instructions maps.
|
|
/// The array is sorted by the InstructionAddressMap::code_offset field.
|
|
pub instructions: Vec<InstructionAddressMap>,
|
|
|
|
/// Function start source location (normally declaration).
|
|
pub start_srcloc: ir::SourceLoc,
|
|
|
|
/// Function end source location.
|
|
pub end_srcloc: ir::SourceLoc,
|
|
|
|
/// Generated function body offset if applicable, otherwise 0.
|
|
pub body_offset: usize,
|
|
|
|
/// Generated function body length.
|
|
pub body_len: usize,
|
|
}
|
|
|
|
/// Module functions addresses mappings.
|
|
pub type ModuleAddressMap = PrimaryMap<DefinedFuncIndex, FunctionAddressMap>;
|
|
|
|
/// Value ranges for functions.
|
|
pub type ValueLabelsRanges = PrimaryMap<DefinedFuncIndex, cranelift_codegen::ValueLabelsRanges>;
|
|
|
|
/// Stack slots for functions.
|
|
pub type StackSlots = PrimaryMap<DefinedFuncIndex, ir::StackSlots>;
|
|
|
|
/// Module `vmctx` related info.
|
|
pub struct ModuleVmctxInfo {
|
|
/// The memory definition offset in the VMContext structure.
|
|
pub memory_offset: i64,
|
|
|
|
/// The functions stack slots.
|
|
pub stack_slots: StackSlots,
|
|
}
|