alex/nih-plug
1
0
Fork 0
Code Activity

Various MIRI fixes

Browse source
This commit is contained in:
Adrien Prokopowicz 2023-05-21 23:43:09 +02:00 • committed by Robbert van der Helm
parent 727b15aa93
commit 4c87db906a
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -180,9 +180,9 @@ checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]] [[package]]
name = "anymap" name = "anymap"
version = "0.12.1" version = "1.0.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72"
[[package]] [[package]]
name = "approx" name = "approx"

2
Cargo.toml
View file

@ -75,7 +75,7 @@ docs = []
nih_plug_derive = { path = "nih_plug_derive" } nih_plug_derive = { path = "nih_plug_derive" }
anyhow = "1.0" anyhow = "1.0"
anymap = "0.12.1" anymap = "1.0.0-beta.2"
atomic_float = "0.1" atomic_float = "0.1"
atomic_refcell = "0.1" atomic_refcell = "0.1"
backtrace = "0.3.65" backtrace = "0.3.65"

2
src/event_loop/background_thread.rs
View file

@ -77,7 +77,7 @@ where
// workaround to have a singleton that also works if for whatever reason there arem ultiple `T` // workaround to have a singleton that also works if for whatever reason there arem ultiple `T`
// and `E`s in a single process (won't happen with normal plugin usage, but sho knwos). // and `E`s in a single process (won't happen with normal plugin usage, but sho knwos).
lazy_static::lazy_static! { lazy_static::lazy_static! {
static ref HANDLE_MAP: Mutex<anymap::Map<dyn anymap::any::Any + Send + 'static>> = static ref HANDLE_MAP: Mutex<anymap::Map<dyn std::any::Any + Send + 'static>> =
Mutex::new(anymap::Map::new()); Mutex::new(anymap::Map::new());
} }

2
src/wrapper/clap.rs
View file

@ -44,7 +44,7 @@ macro_rules! nih_export_clap {
&& unsafe { ::std::ffi::CStr::from_ptr(factory_id) } && unsafe { ::std::ffi::CStr::from_ptr(factory_id) }
== ::nih_plug::wrapper::clap::CLAP_PLUGIN_FACTORY_ID == ::nih_plug::wrapper::clap::CLAP_PLUGIN_FACTORY_ID
{ {
&(*FACTORY).clap_plugin_factory as *const _ as *const ::std::ffi::c_void &*FACTORY as *const _ as *const ::std::ffi::c_void
} else { } else {
std::ptr::null() std::ptr::null()
} }

5
src/wrapper/util.rs
View file

@ -204,7 +204,7 @@ struct ScopedFtz {
impl ScopedFtz { impl ScopedFtz {
fn enable() -> Self { fn enable() -> Self {
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(target_feature = "sse")] { if #[cfg(all(target_feature = "sse", not(miri)))] {
let mode = unsafe { std::arch::x86_64::_MM_GET_FLUSH_ZERO_MODE() }; let mode = unsafe { std::arch::x86_64::_MM_GET_FLUSH_ZERO_MODE() };
let should_disable_again = mode != std::arch::x86_64::_MM_FLUSH_ZERO_ON; let should_disable_again = mode != std::arch::x86_64::_MM_FLUSH_ZERO_ON;
if should_disable_again { if should_disable_again {
@ -215,7 +215,7 @@ impl ScopedFtz {
should_disable_again, should_disable_again,
_send_sync_marker: PhantomData, _send_sync_marker: PhantomData,
} }
} else if #[cfg(target_arch = "aarch64")] { } else if #[cfg(all(target_arch = "aarch64", not(miri)))] {
// There are no convient intrinsics to change the FTZ settings on AArch64, so this // There are no convient intrinsics to change the FTZ settings on AArch64, so this
// requires inline assembly: // requires inline assembly:
// https://developer.arm.com/documentation/ddi0595/2021-06/AArch64-Registers/FPCR--Floating-point-Control-Register // https://developer.arm.com/documentation/ddi0595/2021-06/AArch64-Registers/FPCR--Floating-point-Control-Register
@ -243,6 +243,7 @@ impl ScopedFtz {
impl Drop for ScopedFtz { impl Drop for ScopedFtz {
fn drop(&mut self) { fn drop(&mut self) {
#[cfg(not(miri))]
if self.should_disable_again { if self.should_disable_again {
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(target_feature = "sse")] { if #[cfg(target_feature = "sse")] {