From ed537ec7e1144f75fe6f17756cdc17ec24081ff1 Mon Sep 17 00:00:00 2001 From: Lotte Steenbrink Date: Fri, 19 Jun 2020 09:21:53 +0200 Subject: [PATCH] dk-run: rename first rtt to rtt_addr for clarity --- tools/dk-run/src/main.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/dk-run/src/main.rs b/tools/dk-run/src/main.rs index 6061512..43b7504 100644 --- a/tools/dk-run/src/main.rs +++ b/tools/dk-run/src/main.rs @@ -64,7 +64,7 @@ fn notmain() -> Result { let mut debug_frame = None; let mut range_names = None; - let mut rtt = None; + let mut rtt_addr = None; let mut sections = vec![]; let mut dotdata = None; let mut registers = None; @@ -77,9 +77,9 @@ fn notmain() -> Result { if name == ".symtab" { 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); - rtt = rtt_; + rtt_addr = rtt_addr_; } } @@ -195,8 +195,9 @@ fn notmain() -> Result { let mut rtt = Rtt::attach_region( core.clone(), &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 .up_channels() .take(0)