mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #115547 - WaffleLapkin:spin_looping, r=Mark-Simulacrum

Browse Source 
Simplify `core::hint::spin_loop`

The grouping was inconsistent and not really helpful.

r? t-libs
This commit is contained in:
bors 2023-09-18 00:02:40 +00:00
commit 8a7cab8d0e
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
library/core/src/hint.rs
View File

@ -175,34 +175,27 @@ pub fn spin_loop() {
unsafe { crate::arch::x86_64::_mm_pause() }; unsafe { crate::arch::x86_64::_mm_pause() };
} }
// RISC-V platform spin loop hint implementation #[cfg(target_arch = "riscv32")]
{ {
// RISC-V RV32 and RV64 share the same PAUSE instruction, but they are located in different crate::arch::riscv32::pause();
// modules in `core::arch`.
// In this case, here we call `pause` function in each core arch module.
#[cfg(target_arch = "riscv32")]
{
crate::arch::riscv32::pause();
}
#[cfg(target_arch = "riscv64")]
{
crate::arch::riscv64::pause();
}
} }
#[cfg(any(target_arch = "aarch64", all(target_arch = "arm", target_feature = "v6")))] #[cfg(target_arch = "riscv64")]
{ {
#[cfg(target_arch = "aarch64")] crate::arch::riscv64::pause();
{ }
// SAFETY: the `cfg` attr ensures that we only execute this on aarch64 targets.
unsafe { crate::arch::aarch64::__isb(crate::arch::aarch64::SY) }; #[cfg(target_arch = "aarch64")]
} {
#[cfg(target_arch = "arm")] // SAFETY: the `cfg` attr ensures that we only execute this on aarch64 targets.
{ unsafe { crate::arch::aarch64::__isb(crate::arch::aarch64::SY) };
// SAFETY: the `cfg` attr ensures that we only execute this on arm targets }
// with support for the v6 feature.
unsafe { crate::arch::arm::__yield() }; #[cfg(all(target_arch = "arm", target_feature = "v6"))]
} {
// SAFETY: the `cfg` attr ensures that we only execute this on arm targets
// with support for the v6 feature.
unsafe { crate::arch::arm::__yield() };
} }
} }