M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

firmware: update the signature of #[lang="panic_fmt"].

pull/1017/head
whitequark 2018-05-15 14:33:30 +00:00
parent c18a73d45f
commit b54926134c
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/firmware/bootloader/main.rs
View File

@ -228,7 +228,8 @@ pub extern fn abort() {
#[no_mangle]
#[lang = "panic_fmt"]
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u32) -> ! {
println!("panic at {}:{}: {}", file, line, args);
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str,
line: u32, column: u32) -> ! {
println!("panic at {}:{}:{}: {}", file, line, column, args);
loop {}
}

5
artiq/firmware/ksupport/lib.rs
View File

@ -49,8 +49,9 @@ macro_rules! recv {
#[no_mangle]
#[lang = "panic_fmt"]
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u32) -> ! {
send(&Log(format_args!("panic at {}:{}: {}\n", file, line, args)));
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str,
line: u32, column: u32) -> ! {
send(&Log(format_args!("panic at {}:{}:{}: {}\n", file, line, column, args)));
send(&RunAborted);
loop {}
}

5
artiq/firmware/runtime/main.rs
View File

@ -303,8 +303,9 @@ pub extern fn abort() {
#[no_mangle]
#[lang = "panic_fmt"]
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u32) -> ! {
println!("panic at {}:{}: {}", file, line, args);
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str,
line: u32, column: u32) -> ! {
println!("panic at {}:{}:{}: {}", file, line, column, args);
println!("backtrace for software version {}:",
include_str!(concat!(env!("OUT_DIR"), "/git-describe")));

5
artiq/firmware/satman/main.rs
View File

@ -293,7 +293,8 @@ pub extern fn abort() {
#[no_mangle]
#[lang = "panic_fmt"]
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u32) -> ! {
println!("panic at {}:{}: {}", file, line, args);
pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str,
line: u32, column: u32) -> ! {
println!("panic at {}:{}:{}: {}", file, line, column, args);
loop {}
}