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

Make the backtrace feature optional

Browse source
This commit is contained in:
Gwilym Inzani 2024-04-20 20:28:10 +01:00
parent b317602c6b
commit 580afa9335
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
agb/Cargo.toml
View file

@ -8,7 +8,8 @@ license = "MPL-2.0"
repository = "https://github.com/agbrs/agb" repository = "https://github.com/agbrs/agb"
[features] [features]
default = ["testing"] default = ["backtrace", "testing"]
backtrace = ["testing", "dep:qrcodegen-no-heap"]
testing = [] testing = []
multiboot = [] multiboot = []
@ -20,7 +21,7 @@ agb_macros = { version = "0.19.1", path = "../agb-macros" }
agb_fixnum = { version = "0.19.1", path = "../agb-fixnum" } agb_fixnum = { version = "0.19.1", path = "../agb-fixnum" }
agb_hashmap = { version = "0.19.1", path = "../agb-hashmap" } agb_hashmap = { version = "0.19.1", path = "../agb-hashmap" }
bilge = "0.2" bilge = "0.2"
qrcodegen-no-heap = "1.8" qrcodegen-no-heap = { version = "1.8", optional = true }
portable-atomic = { version = "1.6.0", default-features = false, features = ["unsafe-assume-single-core"] } portable-atomic = { version = "1.6.0", default-features = false, features = ["unsafe-assume-single-core"] }
once_cell = { version = "1.19.0", default-features = false, features = ["critical-section"] } once_cell = { version = "1.19.0", default-features = false, features = ["critical-section"] }
critical-section = { version = "1.1.2", features = ["restore-state-u16"] } critical-section = { version = "1.1.2", features = ["restore-state-u16"] }

17
agb/src/lib.rs
View file

@ -150,6 +150,7 @@ extern crate alloc;
mod agb_alloc; mod agb_alloc;
mod agbabi; mod agbabi;
#[cfg(feature = "backtrace")]
mod backtrace; mod backtrace;
mod bitarray; mod bitarray;
/// Implements everything relating to things that are displayed on screen. /// Implements everything relating to things that are displayed on screen.
@ -167,6 +168,7 @@ pub mod mgba;
pub use agb_fixnum as fixnum; pub use agb_fixnum as fixnum;
/// Contains an implementation of a hashmap which suits the gameboy advance's hardware. /// Contains an implementation of a hashmap which suits the gameboy advance's hardware.
pub use agb_hashmap as hash_map; pub use agb_hashmap as hash_map;
#[cfg(feature = "backtrace")]
mod panics_render; mod panics_render;
/// Simple random number generator /// Simple random number generator
pub mod rng; pub mod rng;
@ -201,10 +203,8 @@ 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) -> ! {
use core::fmt::Write;
if let Some(mut mgba) = mgba::Mgba::new() { if let Some(mut mgba) = mgba::Mgba::new() {
write!(mgba, "{}", info); let _ = mgba.print(format_args!("{info}"), mgba::DebugLevel::Fatal);
mgba.set_level(mgba::DebugLevel::Fatal);
} }
#[allow(clippy::empty_loop)] #[allow(clippy::empty_loop)]
@ -296,8 +296,6 @@ impl Gba {
/// You can run the tests using `cargo test`, but it will work better through `mgba-test-runner` by /// You can run the tests using `cargo test`, but it will work better through `mgba-test-runner` by
/// running something along the lines of `CARGO_TARGET_THUMBV4T_NONE_EABI_RUNNER=mgba-test-runner cargo test`. /// running something along the lines of `CARGO_TARGET_THUMBV4T_NONE_EABI_RUNNER=mgba-test-runner cargo test`.
pub mod test_runner { pub mod test_runner {
use self::panics_render::render_backtrace;
use super::*; use super::*;
#[doc(hidden)] #[doc(hidden)]
@ -327,13 +325,20 @@ pub mod test_runner {
#[panic_handler] #[panic_handler]
fn panic_implementation(info: &core::panic::PanicInfo) -> ! { fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
#[cfg(feature = "backtrace")]
let frames = backtrace::unwind_exception(); let frames = backtrace::unwind_exception();
if let Some(mut mgba) = mgba::Mgba::new() { if let Some(mut mgba) = mgba::Mgba::new() {
let _ = mgba.print(format_args!("[failed]"), mgba::DebugLevel::Error); let _ = mgba.print(format_args!("[failed]"), mgba::DebugLevel::Error);
} }
render_backtrace(&frames, info); #[cfg(feature = "backtrace")]
crate::panics_render::render_backtrace(&frames, info);
#[cfg(not(feature = "backtrace"))]
loop {
syscall::halt();
}
} }
static mut TEST_GBA: Option<Gba> = None; static mut TEST_GBA: Option<Gba> = None;