Skip to content

Commit fcc0985

Browse files
committed
asm/inline: also use asm macro in mods
1 parent 2bf12c6 commit fcc0985

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

asm/inline.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ pub unsafe fn __bootstrap(msp: u32, rv: u32) -> ! {
215215
pub use self::v7m::*;
216216
#[cfg(any(armv7m, armv8m_main))]
217217
mod v7m {
218+
use core::arch::asm;
218219
use core::sync::atomic::{compiler_fence, Ordering};
219220

220221
#[inline(always)]
@@ -284,6 +285,8 @@ mod v7m {
284285
pub use self::v7em::*;
285286
#[cfg(armv7em)]
286287
mod v7em {
288+
use core::arch::asm;
289+
287290
#[inline(always)]
288291
pub unsafe fn __basepri_max_cm7_r0p1(val: u8) {
289292
asm!(
@@ -320,6 +323,8 @@ pub use self::v8m::*;
320323
/// Baseline and Mainline.
321324
#[cfg(armv8m)]
322325
mod v8m {
326+
use core::arch::asm;
327+
323328
#[inline(always)]
324329
pub unsafe fn __tt(mut target: u32) -> u32 {
325330
asm!("tt {target}, {target}", target = inout(reg) target);
@@ -367,6 +372,8 @@ pub use self::v8m_main::*;
367372
/// Mainline only.
368373
#[cfg(armv8m_main)]
369374
mod v8m_main {
375+
use core::arch::asm;
376+
370377
#[inline(always)]
371378
pub unsafe fn __msplim_r() -> u32 {
372379
let r;
@@ -397,6 +404,8 @@ pub use self::fpu::*;
397404
/// All targets with FPU.
398405
#[cfg(has_fpu)]
399406
mod fpu {
407+
use core::arch::asm;
408+
400409
#[inline(always)]
401410
pub unsafe fn __fpscr_r() -> u32 {
402411
let r;

0 commit comments

Comments
 (0)