mirrors/embedded-trainings-2020
1
0
Fork 0
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git synced 2024-05-19 16:58:30 +00:00
Code Issues Projects Releases Wiki Activity

dk-run: rename first rtt to rtt_addr for clarity

Browse source
This commit is contained in:
Lotte Steenbrink 2020-06-19 09:21:53 +02:00
parent 806c4f09a0
commit ed537ec7e1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/dk-run/src/main.rs
View file

@ -64,7 +64,7 @@ fn notmain() -> Result<i32, anyhow::Error> {
let mut debug_frame = None; let mut debug_frame = None;
let mut range_names = None; let mut range_names = None;
let mut rtt = None; let mut rtt_addr = None;
let mut sections = vec![]; let mut sections = vec![];
let mut dotdata = None; let mut dotdata = None;
let mut registers = None; let mut registers = None;
@ -77,9 +77,9 @@ fn notmain() -> Result<i32, anyhow::Error> {
if name == ".symtab" { if name == ".symtab" {
if let Ok(symtab) = sect.get_data(&elf) { if let Ok(symtab) = sect.get_data(&elf) {
let (rn, rtt_) = range_names_from(&elf, symtab, text)?; let (rn, rtt_addr_) = range_names_from(&elf, symtab, text)?;
range_names = Some(rn); range_names = Some(rn);
rtt = rtt_; rtt_addr = rtt_addr_;
} }
} }
@ -195,8 +195,9 @@ fn notmain() -> Result<i32, anyhow::Error> {
let mut rtt = Rtt::attach_region( let mut rtt = Rtt::attach_region(
core.clone(), core.clone(),
&sess, &sess,
&ScanRegion::Exact(rtt.ok_or_else(|| anyhow!("RTT control block not found"))?), &ScanRegion::Exact(rtt_addr.ok_or_else(|| anyhow!("RTT control block not available"))?),
)?; )?;
let channel = rtt let channel = rtt
.up_channels() .up_channels()
.take(0) .take(0)