diff --git a/Cargo.lock b/Cargo.lock index 373e4dcd0c..fc6bda086a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1591,9 +1591,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "ittapi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "663fe0550070071ff59e981864a9cd3ee1c869ed0a088140d9ac4dc05ea6b1a1" +checksum = "2e648c437172ce7d3ac35ca11a068755072054826fa455a916b43524fa4a62a7" dependencies = [ "anyhow", "ittapi-sys", @@ -1602,9 +1602,9 @@ dependencies = [ [[package]] name = "ittapi-sys" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e21911b7183f38c71d75ab478a527f314e28db51027037ece2e5511ed9410703" +checksum = "a9b32a4d23f72548178dde54f3c12c6b6a08598e25575c0d0fa5bd861e0dc1a5" dependencies = [ "cc", ] diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml index 5a21eb7d84..8529392840 100644 --- a/crates/jit/Cargo.toml +++ b/crates/jit/Cargo.toml @@ -34,7 +34,7 @@ features = [ ] [target.'cfg(target_arch = "x86_64")'.dependencies] -ittapi = { version = "0.3.0", optional = true } +ittapi = { version = "0.3.3", optional = true } [features] jitdump = ['wasmtime-jit-debug'] diff --git a/crates/runtime/src/traphandlers/unix.rs b/crates/runtime/src/traphandlers/unix.rs index de7b335ce1..889867ba1b 100644 --- a/crates/runtime/src/traphandlers/unix.rs +++ b/crates/runtime/src/traphandlers/unix.rs @@ -224,6 +224,12 @@ unsafe fn get_pc_and_fp(cx: *mut libc::c_void, _signum: libc::c_int) -> (*const cx.uc_mcontext.__gregs[libc::REG_PC] as *const u8, cx.uc_mcontext.__gregs[libc::REG_S0] as usize, ) + } else if #[cfg(all(target_os = "freebsd", target_arch = "aarch64"))] { + let cx = &*(cx as *const libc::mcontext_t); + ( + cx.mc_gpregs.gp_elr as *const u8, + cx.mc_gpregs.gp_x[29] as usize, + ) } else { compile_error!("unsupported platform"); diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 82a3a59d10..e4054b4378 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -290,6 +290,18 @@ criteria = "safe-to-deploy" version = "0.4.1" notes = "Contains only unsafe code for interacting with the crate's intended purpose." +[[audits.ittapi]] +who = "Andrew Brown " +criteria = "safe-to-deploy" +delta = "0.3.1 -> 0.3.3" +notes = "I am the author of this crate." + +[[audits.ittapi-sys]] +who = "Andrew Brown " +criteria = "safe-to-deploy" +delta = "0.3.1 -> 0.3.3" +notes = "Unsafe code is due to auto-generated bindings to a widely-deployed C library." + [[audits.leb128]] who = "Nick Fitzgerald " criteria = "safe-to-deploy"