nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #25974 - richo:stack-msg, r=alexcrichton

Browse Source 
These are implemented in asm, they're just not inlined.

Open questions are:
* Should I just inline them? They're.. big, but it seems as though this needs violates the #[inline(always)] gaurantees the others make.
* Does something (llvm?) provide these as intrinsics? The structure of this code suggests that we could be hoisting off something else, instead of flagrantly ignoring it like we do for power and mips.
This commit is contained in:
Manish Goregaokar 2015-06-03 14:46:41 +05:30
commit e490c17eb5
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libstd/sys/common/stack.rs
View File

@ -139,7 +139,6 @@ pub unsafe fn record_os_managed_stack_bounds(stack_lo: usize, _stack_hi: usize)
pub unsafe fn record_sp_limit(limit: usize) { pub unsafe fn record_sp_limit(limit: usize) {
return target_record_sp_limit(limit); return target_record_sp_limit(limit);
// x86-64
#[cfg(all(target_arch = "x86_64", #[cfg(all(target_arch = "x86_64",
any(target_os = "macos", target_os = "ios")))] any(target_os = "macos", target_os = "ios")))]
#[inline(always)] #[inline(always)]
@ -164,7 +163,6 @@ pub unsafe fn record_sp_limit(limit: usize) {
asm!("movq $0, %fs:32" :: "r"(limit) :: "volatile") asm!("movq $0, %fs:32" :: "r"(limit) :: "volatile")
} }
// x86
#[cfg(all(target_arch = "x86", #[cfg(all(target_arch = "x86",
any(target_os = "macos", target_os = "ios")))] any(target_os = "macos", target_os = "ios")))]
#[inline(always)] #[inline(always)]
@ -182,8 +180,8 @@ pub unsafe fn record_sp_limit(limit: usize) {
unsafe fn target_record_sp_limit(_: usize) { unsafe fn target_record_sp_limit(_: usize) {
} }
// mips, arm - Some brave soul can port these to inline asm, but it's over // mips, arm - The implementations are a bit big for inline asm!
// my head personally // They can be found in src/rt/arch/$target_arch/record_sp.S
#[cfg(any(target_arch = "mips", #[cfg(any(target_arch = "mips",
target_arch = "mipsel", target_arch = "mipsel",
all(target_arch = "arm", not(target_os = "ios"))))] all(target_arch = "arm", not(target_os = "ios"))))]
@ -221,7 +219,6 @@ pub unsafe fn record_sp_limit(limit: usize) {
pub unsafe fn get_sp_limit() -> usize { pub unsafe fn get_sp_limit() -> usize {
return target_get_sp_limit(); return target_get_sp_limit();
// x86-64
#[cfg(all(target_arch = "x86_64", #[cfg(all(target_arch = "x86_64",
any(target_os = "macos", target_os = "ios")))] any(target_os = "macos", target_os = "ios")))]
#[inline(always)] #[inline(always)]
@ -255,7 +252,6 @@ pub unsafe fn get_sp_limit() -> usize {
return limit; return limit;
} }
// x86
#[cfg(all(target_arch = "x86", #[cfg(all(target_arch = "x86",
any(target_os = "macos", target_os = "ios")))] any(target_os = "macos", target_os = "ios")))]
#[inline(always)] #[inline(always)]
@ -278,8 +274,8 @@ pub unsafe fn get_sp_limit() -> usize {
return 1024; return 1024;
} }
// mips, arm - Some brave soul can port these to inline asm, but it's over // mips, arm - The implementations are a bit big for inline asm!
// my head personally // They can be found in src/rt/arch/$target_arch/record_sp.S
#[cfg(any(target_arch = "mips", #[cfg(any(target_arch = "mips",
target_arch = "mipsel", target_arch = "mipsel",
all(target_arch = "arm", not(target_os = "ios"))))] all(target_arch = "arm", not(target_os = "ios"))))]