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

ksupport: fix panic, libc, unwind

This commit is contained in:
occheung 2021-08-11 12:21:56 +08:00
parent 905330b0f1
commit 1b8b4baf6a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/firmware/ksupport/Cargo.toml
View File

@ -20,3 +20,5 @@ dyld = { path = "../libdyld" }
board_misoc = { path = "../libboard_misoc" } board_misoc = { path = "../libboard_misoc" }
board_artiq = { path = "../libboard_artiq" } board_artiq = { path = "../libboard_artiq" }
riscv = { version = "0.6.0", features = ["inline-asm"] } riscv = { version = "0.6.0", features = ["inline-asm"] }
libc = { path = "../libc" }
unwind = { path = "../libunwind" }

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

@ -1,5 +1,5 @@
#![feature(lang_items, asm, panic_unwind, libc, unwind_attributes, #![feature(lang_items, asm, panic_unwind, libc, unwind_attributes,
panic_implementation, panic_info_message, nll)] panic_handler, panic_info_message, nll)]
#![no_std] #![no_std]
extern crate libc; extern crate libc;
@ -51,7 +51,7 @@ macro_rules! recv {
} }
#[no_mangle] // https://github.com/rust-lang/rust/issues/{38281,51647} #[no_mangle] // https://github.com/rust-lang/rust/issues/{38281,51647}
#[panic_implementation] #[panic_handler]
pub fn panic_fmt(info: &core::panic::PanicInfo) -> ! { pub fn panic_fmt(info: &core::panic::PanicInfo) -> ! {
if let Some(location) = info.location() { if let Some(location) = info.location() {
send(&Log(format_args!("panic at {}:{}:{}", send(&Log(format_args!("panic at {}:{}:{}",