stevefan1999
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

satman: added unwind as it seems necessary

drtio_port
mwojcik 2021-09-01 11:42:41 +02:00
parent 5cfcee6d20
commit 1ad0e77cae
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/satman/Cargo.toml
View File

@ -24,3 +24,4 @@ libregister = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
libconfig = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["ipv6"] }
libboard_artiq = { path = "../libboard_artiq" }
unwind = { path = "../libunwind" }

8
src/satman/src/main.rs
View File

@ -14,6 +14,8 @@ extern crate libsupport_zynq;
extern crate libcortex_a9;
extern crate libregister;
extern crate unwind;
extern crate alloc;
use libboard_zynq::{i2c::I2c, timer::GlobalTimer, time::Milliseconds, print, println, mpcore, gic, stdio};
@ -597,12 +599,6 @@ pub extern fn exception(_vect: u32, _regs: *const u32, pc: u32, ea: u32) {
panic!("exception at PC 0x{:x}, EA 0x{:x}", pc, ea)
}
#[no_mangle]
pub extern fn abort() {
println!("aborted");
loop {}
}
#[no_mangle] // https://github.com/rust-lang/rust/issues/{38281,51647}
#[panic_handler]
pub fn panic_fmt(info: &core::panic::PanicInfo) -> ! {