From ae968ef356d68c0d072a80e128ba62ded1ea3af2 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Wed, 2 Dec 2015 02:31:39 +0000
Subject: [PATCH]
---
src/zipr.cpp | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/zipr.cpp b/src/zipr.cpp
index 2210d39..34101f7 100644
--- a/src/zipr.cpp
+++ b/src/zipr.cpp
@@ -2250,20 +2250,23 @@ void ZiprImpl_t::dump_map()
string filename="zipr.map"; // parameterize later.
std::ofstream ofs(filename.c_str(), ios_base::out);
- ofs <<left<<setw(20)<<"ID"
- <<left<<setw(20)<<"OrigAddr"
- <<left<<setw(20)<<"NewAddr"
+ ofs <<left<<setw(10)<<"ID"
+ <<left<<setw(10)<<"OrigAddr"
+ <<left<<setw(10)<<"IBTA"
+ <<left<<setw(10)<<"NewAddr"
<<left<<"Disassembly"<<endl;
for(std::map<libIRDB::Instruction_t*,RangeAddress_t>::iterator it=final_insn_locations.begin();
it!=final_insn_locations.end(); ++it)
{
Instruction_t* insn=it->first;
+ AddressID_t* ibta=insn->GetIndirectBranchTargetAddress();
RangeAddress_t addr=it->second;
- ofs << dec << setw(20)<<insn->GetBaseID()
- <<"0x"<<hex<<left<<setw(18)<<insn->GetAddress()->GetVirtualOffset()
- <<"0x"<<hex<<left<<setw(18)<<addr
+ ofs << hex << setw(10)<<insn->GetBaseID()
+ <<hex<<left<<setw(10)<<insn->GetAddress()->GetVirtualOffset()
+ <<hex<<left<<setw(10)<< (ibta ? ibta->GetVirtualOffset() : 0)
+ <<hex<<left<<setw(10)<<addr
<< left<<insn->getDisassembly()<<endl;
--
GitLab