Random cleanup

4 files changed, 8 insertions, 2 deletions

diff --git a/.cargo/config b/.cargo/config
index 3f319ae..8d2de5d 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -4,6 +4,7 @@ runner = "probe-run --chip nRF52840_xxAA --defmt"
 rustflags = [
   # LLD (shipped with the Rust toolchain) is used as the default linker
   "-C", "link-arg=--nmagic",
+  "-Z", "trap-unreachable=no",
   "-C", "link-arg=-Tlink.x",
   "-C", "link-arg=-Tdefmt.x",
 
diff --git a/Cargo.toml b/Cargo.toml
index f88cca8..c68c24a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ debug = 2
 debug-assertions = false
 incremental = false
 lto = "fat"
-opt-level = 3
+opt-level = 's'
 overflow-checks = false
 
 # do not optimize proc-macro crates = faster builds from scratch
diff --git a/nrf-softdevice-defmt-rtt/src/lib.rs b/nrf-softdevice-defmt-rtt/src/lib.rs
index 0700bf7..3889677 100644
--- a/nrf-softdevice-defmt-rtt/src/lib.rs
+++ b/nrf-softdevice-defmt-rtt/src/lib.rs
@@ -52,7 +52,7 @@ unsafe impl defmt::Logger for Logger {
 
     unsafe fn release(_: NonNull<dyn defmt::Write>) {
         TAKEN.store(false, Ordering::Relaxed);
-        unsafe { interrupt::enable_all(INTERRUPTS_TOKEN.load(Ordering::Relaxed)) };
+        interrupt::enable_all(INTERRUPTS_TOKEN.load(Ordering::Relaxed));
     }
 }
 
diff --git a/nrf-softdevice/src/interrupt.rs b/nrf-softdevice/src/interrupt.rs
index 4b2e771..255ba5c 100644
--- a/nrf-softdevice/src/interrupt.rs
+++ b/nrf-softdevice/src/interrupt.rs
@@ -143,10 +143,15 @@ pub unsafe fn disable_all() -> u8 {
             nvic.icer[1].write(!RESERVED_IRQS[1]);
         });
     }
+
+    compiler_fence(Ordering::SeqCst);
+
     return nested_cs as u8;
 }
 
 pub unsafe fn enable_all(token: u8) {
+    compiler_fence(Ordering::SeqCst);
+
     let nvic = &*NVIC::ptr();
     if token == 0 {
         raw_free(|| {