diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/focaccia/lldb_target.py | 5 | ||||
| -rw-r--r-- | src/focaccia/symbolic.py | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/focaccia/lldb_target.py b/src/focaccia/lldb_target.py index c5042d5..8d3dbd9 100644 --- a/src/focaccia/lldb_target.py +++ b/src/focaccia/lldb_target.py @@ -316,3 +316,8 @@ class LLDBConcreteTarget: if s.GetStartAddress().GetLoadAddress(self.target) > addr: addr = s.GetEndAddress().GetLoadAddress(self.target) return addr + + def get_disassembly(self, addr: int) -> str: + inst = self.target.ReadInstructions(lldb.SBAddress(addr, self.target), 1)[0] + return f'{inst.GetMnemonic(self.target)} {inst.GetOperands(self.target)}' + diff --git a/src/focaccia/symbolic.py b/src/focaccia/symbolic.py index 6ede2c1..c02adfc 100644 --- a/src/focaccia/symbolic.py +++ b/src/focaccia/symbolic.py @@ -646,7 +646,14 @@ def collect_symbolic_trace(env: TraceEnvironment, instr = ctx.mdis.dis_instr(pc) except: err = sys.exc_info()[1] - warn(f'Unable to disassemble instruction at {hex(pc)}: {err}.' + + # Try to get the LLDB disassembly instead to simplify debugging + try: + alt_disas = target.get_disassembly(pc) + except: + warn(f'Unable to disassemble instruction at {hex(pc)}: {err}.' + f' Skipping.') + warn(f'Unable to disassemble instruction {alt_disas} at {hex(pc)}: {err}.' f' Skipping.') target.step() continue |