alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Handle this in both panic handlers

Browse source
This commit is contained in:
Gwilym Inzani 2024-04-17 17:49:31 +01:00
parent 9fe526d0bc
commit 18b25e242e
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
agb/src/lib.rs
View file

@ -203,6 +203,9 @@ pub use {agb_alloc::ExternalAllocator, agb_alloc::InternalAllocator};
#[panic_handler] #[panic_handler]
#[allow(unused_must_use)] #[allow(unused_must_use)]
fn panic_implementation(info: &core::panic::PanicInfo) -> ! { fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
avoid_double_panic();
use core::fmt::Write;
if let Some(mut mgba) = mgba::Mgba::new() { if let Some(mut mgba) = mgba::Mgba::new() {
let _ = mgba.print(format_args!("{info}"), mgba::DebugLevel::Fatal); let _ = mgba.print(format_args!("{info}"), mgba::DebugLevel::Fatal);
} }
@ -211,6 +214,16 @@ fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
loop {} loop {}
} }
fn avoid_double_panic() {
static IS_PANICKING: portable_atomic::AtomicBool = portable_atomic::AtomicBool::new(false);
if IS_PANICKING.load(portable_atomic::Ordering::SeqCst) {
// we panicked during the panic handler, so not much we can do here
loop {}
} else {
IS_PANICKING.store(true, portable_atomic::Ordering::SeqCst);
}
}
/// The Gba struct is used to control access to the Game Boy Advance's hardware in a way which makes it the /// The Gba struct is used to control access to the Game Boy Advance's hardware in a way which makes it the
/// borrow checker's responsibility to ensure no clashes of global resources. /// borrow checker's responsibility to ensure no clashes of global resources.
/// ///
@ -325,13 +338,7 @@ pub mod test_runner {
#[panic_handler] #[panic_handler]
fn panic_implementation(info: &core::panic::PanicInfo) -> ! { fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
static IS_PANICKING: portable_atomic::AtomicBool = portable_atomic::AtomicBool::new(false); avoid_double_panic();
if IS_PANICKING.load(portable_atomic::Ordering::SeqCst) {
// we panicked during the panic handler, so not much we can do here
loop {}
} else {
IS_PANICKING.store(true, portable_atomic::Ordering::SeqCst);
}
#[cfg(feature = "backtrace")] #[cfg(feature = "backtrace")]
let frames = backtrace::unwind_exception(); let frames = backtrace::unwind_exception();