0313e30d76
This commit started off by deleting the `cranelift_codegen::settings` reexport in the `wasmtime-environ` crate and then basically played whack-a-mole until everything compiled again. The main result of this is that the `wasmtime-*` family of crates have generally less of a dependency on the `TargetIsa` trait and type from Cranelift. While the dependency isn't entirely severed yet this is at least a significant start. This commit is intended to be largely refactorings, no functional changes are intended here. The refactorings are: * A `CompilerBuilder` trait has been added to `wasmtime_environ` which server as an abstraction used to create compilers and configure them in a uniform fashion. The `wasmtime::Config` type now uses this instead of cranelift-specific settings. The `wasmtime-jit` crate exports the ability to create a compiler builder from a `CompilationStrategy`, which only works for Cranelift right now. In a cranelift-less build of Wasmtime this is expected to return a trait object that fails all requests to compile. * The `Compiler` trait in the `wasmtime_environ` crate has been souped up with a number of methods that Wasmtime and other crates needed. * The `wasmtime-debug` crate is now moved entirely behind the `wasmtime-cranelift` crate. * The `wasmtime-cranelift` crate is now only depended on by the `wasmtime-jit` crate. * Wasm types in `cranelift-wasm` no longer contain their IR type, instead they only contain the `WasmType`. This is required to get everything to align correctly but will also be required in a future refactoring where the types used by `cranelift-wasm` will be extracted to a separate crate. * I moved around a fair bit of code in `wasmtime-cranelift`. * Some gdb-specific jit-specific code has moved from `wasmtime-debug` to `wasmtime-jit`.
93 lines
2.7 KiB
Rust
93 lines
2.7 KiB
Rust
//! Module for Windows x64 ABI unwind registry.
|
|
|
|
use crate::Compiler;
|
|
use anyhow::{bail, Result};
|
|
use wasmtime_environ::isa::unwind::UnwindInfo;
|
|
use winapi::um::winnt;
|
|
|
|
/// Represents a registry of function unwind information for Windows x64 ABI.
|
|
pub struct UnwindRegistry {
|
|
base_address: usize,
|
|
functions: Vec<winnt::RUNTIME_FUNCTION>,
|
|
published: bool,
|
|
}
|
|
|
|
impl UnwindRegistry {
|
|
/// Creates a new unwind registry with the given base address.
|
|
pub fn new(base_address: usize) -> Self {
|
|
Self {
|
|
base_address,
|
|
functions: Vec::new(),
|
|
published: false,
|
|
}
|
|
}
|
|
|
|
/// Registers a function given the start offset, length, and unwind information.
|
|
pub fn register(&mut self, func_start: u32, func_len: u32, info: &UnwindInfo) -> Result<()> {
|
|
if self.published {
|
|
bail!("unwind registry has already been published");
|
|
}
|
|
|
|
match info {
|
|
UnwindInfo::WindowsX64(_) => {
|
|
let mut entry = winnt::RUNTIME_FUNCTION::default();
|
|
|
|
entry.BeginAddress = func_start;
|
|
entry.EndAddress = func_start + func_len;
|
|
|
|
// The unwind information should be immediately following the function
|
|
// with padding for 4 byte alignment
|
|
unsafe {
|
|
*entry.u.UnwindInfoAddress_mut() = (entry.EndAddress + 3) & !3;
|
|
}
|
|
|
|
self.functions.push(entry);
|
|
|
|
Ok(())
|
|
}
|
|
_ => bail!("unsupported unwind information"),
|
|
}
|
|
}
|
|
|
|
/// Publishes all registered functions.
|
|
pub fn publish(&mut self, _compiler: &Compiler) -> Result<()> {
|
|
if self.published {
|
|
bail!("unwind registry has already been published");
|
|
}
|
|
|
|
self.published = true;
|
|
|
|
if !self.functions.is_empty() {
|
|
// Windows heap allocations are 32-bit aligned, but assert just in case
|
|
assert_eq!(
|
|
(self.functions.as_mut_ptr() as u64) % 4,
|
|
0,
|
|
"function table allocation was not aligned"
|
|
);
|
|
|
|
unsafe {
|
|
if winnt::RtlAddFunctionTable(
|
|
self.functions.as_mut_ptr(),
|
|
self.functions.len() as u32,
|
|
self.base_address as u64,
|
|
) == 0
|
|
{
|
|
bail!("failed to register function table");
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl Drop for UnwindRegistry {
|
|
fn drop(&mut self) {
|
|
if self.published {
|
|
unsafe {
|
|
winnt::RtlDeleteFunctionTable(self.functions.as_mut_ptr());
|
|
}
|
|
}
|
|
}
|
|
}
|