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

firmware: backtrace_artiq → unwind_backtrace. 

This crate isn't ARTIQ-specific.
This commit is contained in:
whitequark 2018-05-14 07:32:55 +00:00
parent b04c7abde8
commit d543c9aa63
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
artiq/firmware/Cargo.lock generated
View File

@ -13,10 +13,6 @@ dependencies = [
"board 0.0.0", "board 0.0.0",
] ]
[[package]]
name = "backtrace_artiq"
version = "0.0.0"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.0.1" version = "1.0.1"
@ -215,7 +211,6 @@ version = "0.0.0"
dependencies = [ dependencies = [
"alloc_list 0.0.0", "alloc_list 0.0.0",
"amp 0.0.0", "amp 0.0.0",
"backtrace_artiq 0.0.0",
"board 0.0.0", "board 0.0.0",
"board_artiq 0.0.0", "board_artiq 0.0.0",
"build_artiq 0.0.0", "build_artiq 0.0.0",
@ -230,6 +225,7 @@ dependencies = [
"proto 0.0.0", "proto 0.0.0",
"smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=181083f)", "smoltcp 0.4.0 (git+https://github.com/m-labs/smoltcp?rev=181083f)",
"std_artiq 0.0.0", "std_artiq 0.0.0",
"unwind_backtrace 0.0.0",
] ]
[[package]] [[package]]
@ -270,6 +266,10 @@ dependencies = [
name = "std_artiq" name = "std_artiq"
version = "0.0.0" version = "0.0.0"
[[package]]
name = "unwind_backtrace"
version = "0.0.0"
[[package]] [[package]]
name = "walkdir" name = "walkdir"
version = "1.0.7" version = "1.0.7"

4
artiq/firmware/libbacktrace_artiq/Cargo.toml → artiq/firmware/libunwind_backtrace/Cargo.toml
View File

@ -1,8 +1,8 @@
[package] [package]
authors = ["M-Labs"] authors = ["M-Labs"]
name = "backtrace_artiq" name = "unwind_backtrace"
version = "0.0.0" version = "0.0.0"
[lib] [lib]
name = "backtrace_artiq" name = "unwind_backtrace"
path = "lib.rs" path = "lib.rs"

0
artiq/firmware/libbacktrace_artiq/lib.rs → artiq/firmware/libunwind_backtrace/lib.rs
View File

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

@ -18,11 +18,11 @@ byteorder = { version = "1.0", default-features = false }
cslice = { version = "0.3" } cslice = { version = "0.3" }
log = { version = "0.4", default-features = false } log = { version = "0.4", default-features = false }
managed = { version = "0.6", default-features = false, features = ["alloc", "map"] } managed = { version = "0.6", default-features = false, features = ["alloc", "map"] }
unwind_backtrace = { path = "../libunwind_backtrace" }
board = { path = "../libboard", features = ["uart_console", "smoltcp"] } board = { path = "../libboard", features = ["uart_console", "smoltcp"] }
alloc_list = { path = "../liballoc_list" } alloc_list = { path = "../liballoc_list" }
std_artiq = { path = "../libstd_artiq", features = ["alloc", "io_error_alloc"] } std_artiq = { path = "../libstd_artiq", features = ["alloc", "io_error_alloc"] }
logger_artiq = { path = "../liblogger_artiq" } logger_artiq = { path = "../liblogger_artiq" }
backtrace_artiq = { path = "../libbacktrace_artiq" }
board_artiq = { path = "../libboard_artiq" } board_artiq = { path = "../libboard_artiq" }
proto = { path = "../libproto", features = ["log"] } proto = { path = "../libproto", features = ["log"] }
amp = { path = "../libamp" } amp = { path = "../libamp" }

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

@ -11,10 +11,10 @@ extern crate managed;
extern crate smoltcp; extern crate smoltcp;
extern crate alloc_list; extern crate alloc_list;
extern crate unwind_backtrace;
#[macro_use] #[macro_use]
extern crate std_artiq as std; extern crate std_artiq as std;
extern crate logger_artiq; extern crate logger_artiq;
extern crate backtrace_artiq;
#[macro_use] #[macro_use]
extern crate board; extern crate board;
extern crate board_artiq; extern crate board_artiq;
@ -304,7 +304,7 @@ pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u3
println!("backtrace for software version {}:", println!("backtrace for software version {}:",
include_str!(concat!(env!("OUT_DIR"), "/git-describe"))); include_str!(concat!(env!("OUT_DIR"), "/git-describe")));
let _ = backtrace_artiq::backtrace(|ip| { let _ = unwind_backtrace::backtrace(|ip| {
println!("{:#08x}", ip); println!("{:#08x}", ip);
}); });