forked from M-Labs/artiq
firmware: update the signature of #[lang="panic_fmt"].
This commit is contained in:
parent
c18a73d45f
commit
b54926134c
|
@ -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 {}
|
||||
}
|
||||
|
|
|
@ -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 {}
|
||||
}
|
||||
|
|
|
@ -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")));
|
||||
|
|
|
@ -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 {}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue