Skip to content
Snippets Groups Projects
Commit 461e20c0 authored by jdh8d's avatar jdh8d
Browse files

updated debug output to use <id>:<assembly> nomenclature for debug output

parent c4747a9c
No related branches found
No related tags found
No related merge requests found
......@@ -775,9 +775,15 @@ bool NonceRelocs_t::WillPluginPlop(libIRDB::Instruction_t* insn)
if(string(d.Instruction.Mnemonic) == "call ")
return true;
bool will_plop=(get_cfi_space(insn) > 0 && insn->GetIndirectBranchTargetAddress()==NULL);
if (m_verbose)
cout << "WillPluginPlop: " << std::boolalpha << (get_cfi_space(insn) > 0 && insn->GetIndirectBranchTargetAddress()==NULL) << endl;
return get_cfi_space(insn) > 0 && insn->GetIndirectBranchTargetAddress()==NULL;
{
cout << "NonceRelocs::WillPluginPlop:WillPlop=" <<std::boolalpha <<will_plop<<" for "
<< dec << insn->GetBaseID()<<":"<<insn->getDisassembly()<<endl;
}
return will_plop;
}
size_t NonceRelocs_t::DollopEntryOpeningSize(DollopEntry_t* entry)
{
......@@ -914,6 +920,8 @@ RangeAddress_t NonceRelocs_t::PlopDollopEntry(Zipr_SDK::DollopEntry_t *de,
if (m_verbose)
{
cout << "NonceRelocs::Plopping Instruction : " << dec
<< de->Instruction()->GetBaseID() <<":"<<de->Instruction()->getDisassembly()<<endl;
cout << "placed_address : " << std::hex << placed_addr << endl;
cout << "de->Place() : " << std::hex << de->Place() << endl;
cout << "instruction_size: " << std::dec << instruction_size << endl;
......@@ -991,7 +999,8 @@ RangeAddress_t NonceRelocs_t::PlopDollopEntry(Zipr_SDK::DollopEntry_t *de,
if(string(d.Instruction.Mnemonic) == "call ")
{
cout<<"NonceRelocs::adding executable nonce "<<de->Instruction()->getDisassembly()<<" at "<<hex<<placed_addr+instruction_size<<endl;
cout<<"NonceRelocs::adding executable nonce "<< de->Instruction()->GetBaseID()<<":"
<<de->Instruction()->getDisassembly()<<" at "<<hex<<placed_addr+instruction_size<<endl;
m_memory_space[ret]=0x90; // put executable nonce down.
ret++;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment