gitea-mirror/capa
1
0
Fork 0
mirror of https://github.com/mandiant/capa.git synced 2025-12-12 07:40:38 -08:00
Code Issues Packages Projects Releases Wiki Activity

inspect-binexport2: better render ARM lsl/lsr and pruned expressions

Browse Source
This commit is contained in:
Willi Ballenthin
2024-12-05 14:28:59 +00:00
committed by Willi Ballenthin
parent 95fc747e6f
commit 5fdf7e61e2
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/inspect-binexport2.py
View File

@@ -128,6 +128,11 @@ def _render_expression_tree(
if expression.symbol != "!": if expression.symbol != "!":
o.write(expression.symbol) o.write(expression.symbol)
if expression.symbol in ("lsl", "lsr"):
# like: lsl 16
# not like: lsl16
o.write(" ")
child_index = children_tree_indexes[0] child_index = children_tree_indexes[0]
_render_expression_tree(be2, operand, expression_tree, child_index, o) _render_expression_tree(be2, operand, expression_tree, child_index, o)
@@ -141,7 +146,13 @@ def _render_expression_tree(
child_a = children_tree_indexes[0] child_a = children_tree_indexes[0]
child_b = children_tree_indexes[1] child_b = children_tree_indexes[1]
_render_expression_tree(be2, operand, expression_tree, child_a, o) _render_expression_tree(be2, operand, expression_tree, child_a, o)
o.write(expression.symbol) o.write(expression.symbol)
if expression.symbol == ",":
# like: 10, 20
# not like 10,20
o.write(" ")
_render_expression_tree(be2, operand, expression_tree, child_b, o) _render_expression_tree(be2, operand, expression_tree, child_b, o)
return return
@@ -152,11 +163,19 @@ def _render_expression_tree(
child_c = children_tree_indexes[2] child_c = children_tree_indexes[2]
_render_expression_tree(be2, operand, expression_tree, child_a, o) _render_expression_tree(be2, operand, expression_tree, child_a, o)
o.write(expression.symbol) o.write(expression.symbol)
if expression.symbol == ",":
o.write(" ")
_render_expression_tree(be2, operand, expression_tree, child_b, o) _render_expression_tree(be2, operand, expression_tree, child_b, o)
o.write(expression.symbol) o.write(expression.symbol)
if expression.symbol == ",":
o.write(" ")
_render_expression_tree(be2, operand, expression_tree, child_c, o) _render_expression_tree(be2, operand, expression_tree, child_c, o)
return return
elif len(children_tree_indexes) == 0:
# like when all subtrees have been pruned: don't render anything
return
else: else:
raise NotImplementedError(len(children_tree_indexes)) raise NotImplementedError(len(children_tree_indexes))
@@ -362,10 +381,17 @@ def main(argv=None):
operands = [] operands = []
for operand_index in instruction.operand_index: for operand_index in instruction.operand_index:
operand = be2.operand[operand_index] operand = be2.operand[operand_index]
# Ghidra bug where empty operands (no expressions) may if not operand.expression_index:
# exist so we skip those for now (see https://github.com/NationalSecurityAgency/ghidra/issues/6817) # Ghidra bug where empty operands (no expressions) may
if len(operand.expression_index) > 0: # exist so we skip those for now (see https://github.com/NationalSecurityAgency/ghidra/issues/6817)
operands.append(render_operand(be2, operand, index=operand_index)) continue
op = render_operand(be2, operand, index=operand_index)
if not op:
# operand has been pruned away, so don't show it
continue
operands.append(op)
call_targets = "" call_targets = ""
if instruction.call_target: if instruction.call_target: