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

Add __fastfail for Windows on arm/aarch64

Browse Source
This commit is contained in:
Ryan Levick 2020-08-27 19:11:48 +02:00
parent 6ead62235a
commit 970e7793bf
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/panic_abort/src/lib.rs
View File

@ -47,7 +47,7 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 {
} }
__rust_abort(); __rust_abort();
} }
} else if #[cfg(all(windows, any(target_arch = "x86", target_arch = "x86_64")))] { } else if #[cfg(windows)] {
// On Windows, use the processor-specific __fastfail mechanism. In Windows 8 // On Windows, use the processor-specific __fastfail mechanism. In Windows 8
// and later, this will terminate the process immediately without running any // and later, this will terminate the process immediately without running any
// in-process exception handlers. In earlier versions of Windows, this // in-process exception handlers. In earlier versions of Windows, this
@ -59,7 +59,18 @@ pub unsafe extern "C" fn __rust_start_panic(_payload: usize) -> u32 {
// //
// Note: this is the same implementation as in libstd's `abort_internal` // Note: this is the same implementation as in libstd's `abort_internal`
unsafe fn abort() -> ! { unsafe fn abort() -> ! {
llvm_asm!("int $$0x29" :: "{ecx}"(7) ::: volatile); // 7 is FAST_FAIL_FATAL_APP_EXIT const FAST_FAIL_FATAL_APP_EXIT: usize = 7;
cfg_if::cfg_if! {
if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
llvm_asm!("int $$0x29" :: "{ecx}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
} else if #[cfg(target_arch = "arm")] {
llvm_asm!(".inst 0xDEFB" :: "{r0}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
} else if #[cfg(target_arch = "aarch64")] {
llvm_asm!(".inst 0xF003" :: "{x0}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
} else {
core::intrinsics::abort();
}
}
core::intrinsics::unreachable(); core::intrinsics::unreachable();
} }
} else { } else {

16
library/std/src/sys/windows/mod.rs
View File

@ -306,10 +306,20 @@ pub fn dur2timeout(dur: Duration) -> c::DWORD {
/// that function for more information on `__fastfail` /// that function for more information on `__fastfail`
#[allow(unreachable_code)] #[allow(unreachable_code)]
pub fn abort_internal() -> ! { pub fn abort_internal() -> ! {
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] const FAST_FAIL_FATAL_APP_EXIT: usize = 7;
unsafe { unsafe {
llvm_asm!("int $$0x29" :: "{ecx}"(7) ::: volatile); // 7 is FAST_FAIL_FATAL_APP_EXIT cfg_if::cfg_if! {
crate::intrinsics::unreachable(); if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
llvm_asm!("int $$0x29" :: "{ecx}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
crate::intrinsics::unreachable();
} else if #[cfg(target_arch = "arm")] {
llvm_asm!(".inst 0xDEFB" :: "{r0}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
crate::intrinsics::unreachable();
} else if #[cfg(target_arch = "aarch64")] {
llvm_asm!(".inst 0xF003" :: "{x0}"(FAST_FAIL_FATAL_APP_EXIT) ::: volatile);
crate::intrinsics::unreachable();
}
}
} }
crate::intrinsics::abort(); crate::intrinsics::abort();
} }