Skip to content

asm/inline: explicitly use asm macro #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 19, 2021
Merged

asm/inline: explicitly use asm macro #372

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd72f11
asm/inline: explicitly use asm macro
jordens Dec 16, 2021
2bf12c6
fmt [nfc]
jordens Dec 16, 2021
fcc0985
asm/inline: also use asm macro in mods
jordens Dec 16, 2021
46a3320
asm: silence warning about asm being stable
jordens Dec 16, 2021
d40970c
bump asm-toolchain
jordens Dec 17, 2021
981ce3a
asm: allow stable asm
jordens Dec 17, 2021
587bf1d
bkpt: nostack
jordens Dec 17, 2021
7e1548f
Add nomem, nostack and preserves_flags options to appropriate asm calls.
adamgreig Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions asm/inline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//! All of these functions should be blanket-`unsafe`. `cortex-m` provides safe wrappers where
//! applicable.

use core::arch::asm;
use core::sync::atomic::{compiler_fence, Ordering};

#[inline(always)]
Expand Down Expand Up @@ -214,6 +215,7 @@ pub unsafe fn __bootstrap(msp: u32, rv: u32) -> ! {
pub use self::v7m::*;
#[cfg(any(armv7m, armv8m_main))]
mod v7m {
use core::arch::asm;
use core::sync::atomic::{compiler_fence, Ordering};

#[inline(always)]
Expand Down Expand Up @@ -283,6 +285,8 @@ mod v7m {
pub use self::v7em::*;
#[cfg(armv7em)]
mod v7em {
use core::arch::asm;

#[inline(always)]
pub unsafe fn __basepri_max_cm7_r0p1(val: u8) {
asm!(
Expand Down Expand Up @@ -319,6 +323,8 @@ pub use self::v8m::*;
/// Baseline and Mainline.
#[cfg(armv8m)]
mod v8m {
use core::arch::asm;

#[inline(always)]
pub unsafe fn __tt(mut target: u32) -> u32 {
asm!("tt {target}, {target}", target = inout(reg) target);
Expand Down Expand Up @@ -366,6 +372,8 @@ pub use self::v8m_main::*;
/// Mainline only.
#[cfg(armv8m_main)]
mod v8m_main {
use core::arch::asm;

#[inline(always)]
pub unsafe fn __msplim_r() -> u32 {
let r;
Expand Down Expand Up @@ -396,6 +404,8 @@ pub use self::fpu::*;
/// All targets with FPU.
#[cfg(has_fpu)]
mod fpu {
use core::arch::asm;

#[inline(always)]
pub unsafe fn __fpscr_r() -> u32 {
let r;
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
// - A generated #[derive(Debug)] function (in which case the attribute needs
// to be applied to the struct).
#![deny(clippy::missing_inline_in_public_items)]
// Don't warn about feature(asm) being stable on Rust >= 1.59.0
#![allow(stable_features)]

extern crate bare_metal;
extern crate volatile_register;
Expand Down