From f2b0cd76fdd8550588267f02c1a3c2a18257f840 Mon Sep 17 00:00:00 2001 From: jdh8d <jdh8d@git.zephyr-software.com> Date: Fri, 7 Oct 2016 14:44:41 +0000 Subject: [PATCH] updated debug output to use <id>:<assembly> nomenclature for debug output --- unpin.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/unpin.cpp b/unpin.cpp index fda0b91aa..5c82527d9 100644 --- a/unpin.cpp +++ b/unpin.cpp @@ -200,15 +200,18 @@ void Unpin_t::DoUnpinForScoops() if(insn->GetIndirectBranchTargetAddress()) { - cout<<"Unpin::Found data_to_insn_ptr relocation for pinned insn:"<<hex<<insn->GetBaseID()<<":" - <<insn->getDisassembly()<<" at "<<hex<< insn->GetIndirectBranchTargetAddress()->GetVirtualOffset()<<endl; + cout<<"Unpin::Found data_to_insn_ptr relocation for pinned insn:" + <<hex<<insn->GetBaseID()<<":" <<insn->getDisassembly()<<" at " + <<hex<< insn->GetIndirectBranchTargetAddress()->GetVirtualOffset()<<endl; } else { - cout<<"Unpin::Warn: unpin found non-IBTA to unpin for insn:"<<hex<<insn->GetBaseID()<<". probably it's unpinned twice. continuing anyhow."<<endl; + cout<<"Unpin::Warn: unpin found non-IBTA to unpin for insn:" + <<hex<<insn->GetBaseID()<<":" <<insn->getDisassembly() + <<". probably it's unpinned twice. continuing anyhow."<<endl; } - int found=should_cfi_pin(insn); + bool found=should_cfi_pin(insn); /* don't unpin if we found one */ if(found) @@ -510,7 +513,7 @@ void Unpin_t::DoUpdateForScoops() <<insn->getDisassembly()<<") with offset="<<hex<<reloc->GetOffset() <<". Insn moved to "<<hex<<newLoc<<endl; - int found=should_cfi_pin(insn); + bool found=should_cfi_pin(insn); /* don't unpin if we found one */ if(found) -- GitLab