arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 14:58:09 +00:00
Code Issues Releases Wiki Activity

feat(rust): add more details into panic handler

Browse Source
This commit is contained in:
grdddj 2022-07-20 11:18:56 +02:00 committed by Jiří Musil
parent 9dc73427fb
commit 38f7d32d94
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/embed/rust/src/lib.rs
View File

@ -19,9 +19,37 @@ mod trezorhal;
#[macro_use] #[macro_use]
pub mod ui; pub mod ui;
#[cfg(feature = "debug")]
#[panic_handler]
/// More detailed panic handling. The difference against
/// default `panic` below is that this "debug" version
/// takes around 10 kB more space in the flash region.
fn panic_debug(panic_info: &core::panic::PanicInfo) -> ! {
use cstr_core::CStr;
// SAFETY: Safe because we are passing in \0-terminated literals.
let empty = unsafe { CStr::from_bytes_with_nul_unchecked(b"\0") };
let msg = unsafe { CStr::from_bytes_with_nul_unchecked(b"rs\0") };
// Filling at least the file and line information, if available.
// TODO: find out how to display message from panic_info.message()
if let Some(location) = panic_info.location() {
let file = location.file();
let line = location.line();
let mut file_str = heapless::String::<100>::from(file);
file_str.push('\0').unwrap();
let file_cstr = unsafe { CStr::from_bytes_with_nul_unchecked(file_str.as_bytes()) };
trezorhal::common::fatal_error(empty, msg, file_cstr, line as _, empty);
} else {
trezorhal::common::fatal_error(empty, msg, empty, 0, empty);
}
}
#[cfg(not(feature = "debug"))]
#[cfg(not(test))] #[cfg(not(test))]
#[cfg(any(not(feature = "test"), feature = "clippy"))] #[cfg(any(not(feature = "test"), feature = "clippy"))]
#[panic_handler] #[panic_handler]
/// Default panic handling. Not showing any details - thus saving flash space.
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
use cstr_core::CStr; use cstr_core::CStr;
@ -35,7 +63,5 @@ fn panic(_info: &core::panic::PanicInfo) -> ! {
let empty = unsafe { CStr::from_bytes_with_nul_unchecked(b"\0") }; let empty = unsafe { CStr::from_bytes_with_nul_unchecked(b"\0") };
let msg = unsafe { CStr::from_bytes_with_nul_unchecked(b"rs\0") }; let msg = unsafe { CStr::from_bytes_with_nul_unchecked(b"rs\0") };
// TODO: Ideally we would take the file and line info out of
// `PanicInfo::location()`.
trezorhal::common::fatal_error(empty, msg, empty, 0, empty); trezorhal::common::fatal_error(empty, msg, empty, 0, empty);
} }