From f088351b49cb7f2e782c1d70021861612d9ab241 Mon Sep 17 00:00:00 2001 From: jdh8d <jdh8d@git.zephyr-software.com> Date: Fri, 2 Mar 2018 19:18:53 +0000 Subject: [PATCH] fixed is_pop call to use operand0 ala capstone instead of bea, and disabled some verbose output in fill_in_cfg Former-commit-id: d7ea18dcd34080d3372152f31e954044cb2c779d --- libIRDB/test/check_thunks.cpp | 2 +- libIRDB/test/fill_in_cfg.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libIRDB/test/check_thunks.cpp b/libIRDB/test/check_thunks.cpp index 189f129b9..d6705b462 100644 --- a/libIRDB/test/check_thunks.cpp +++ b/libIRDB/test/check_thunks.cpp @@ -257,7 +257,7 @@ bool is_pop(Instruction_t* insn, string ®) if(d.getMnemonic()!="pop") return false; - reg=d.getOperand(1).getString(); + reg=d.getOperand(0).getString(); return true; } diff --git a/libIRDB/test/fill_in_cfg.cpp b/libIRDB/test/fill_in_cfg.cpp index 5bc248849..443358ed0 100644 --- a/libIRDB/test/fill_in_cfg.cpp +++ b/libIRDB/test/fill_in_cfg.cpp @@ -556,7 +556,8 @@ void fill_in_landing_pads(FileIR_t *firp) { const auto eh_frame_rep_ptr = split_eh_frame_t::factory(firp); eh_frame_rep_ptr->parse(); - eh_frame_rep_ptr->print(); + if(getenv("EHIR_VERBOSE")) + eh_frame_rep_ptr->print(); cout<<"Completed eh-frame parsing"<<endl; map<Function_t*,set<Instruction_t*> > insns_to_add_to_funcs; -- GitLab