Skip to content

Fix disassembly flavour warning on non x86 targets #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephen-f0 merged 3 commits into from
Dec 30, 2025
Merged

Fix disassembly flavour warning on non x86 targets #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a184cb
Fix disassembly flavour warnings on non- x86 targets
stephen-f0 Dec 29, 2025
6d88556
Sort imports
stephen-f0 Dec 29, 2025
2ea01e3
arch is not a class instance
stephen-f0 Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions common/context_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,9 @@ def display_code(self) -> None:

output_line(f"{filename}'{function_name}:")

pre_instructions = extract_instructions(self.target, function_start, pc - 1, self.state.disassembly_syntax)[-3:]
pre_instructions = extract_instructions(
self.target, self.arch, function_start, pc - 1, self.state.disassembly_syntax
)[-3:]
print_instructions(
self.target,
pre_instructions,
Expand All @@ -381,7 +383,7 @@ def display_code(self) -> None:
disassembly_end_address = min(frame_end_address, max_disassembly_end_address)

post_instructions = extract_instructions(
self.target, pc, disassembly_end_address, self.state.disassembly_syntax
self.target, self.arch, pc, disassembly_end_address, self.state.disassembly_syntax
)

if len(post_instructions) > 0:
Expand Down
8 changes: 6 additions & 2 deletions common/instruction_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from lldb import SBAddress, SBInstruction, SBTarget

from arch import I386, X86_64, BaseArch
from common.color_settings import LLEFColorSettings
from common.golang.analysis import go_annotate_jumps
from common.golang.util import go_context_analysis
Expand All @@ -11,7 +12,7 @@


def extract_instructions(
target: SBTarget, start_address: int, end_address: int, disassembly_flavour: str
target: SBTarget, arch: BaseArch, start_address: int, end_address: int, disassembly_flavour: str
) -> list[SBInstruction]:
"""
Returns a list of instructions between a range of memory address defined by @start_address and @end_address.
Expand All @@ -25,7 +26,10 @@ def extract_instructions(
current = start_address
while current <= end_address:
address = SBAddress(current, target)
instruction = target.ReadInstructions(address, 1, disassembly_flavour).GetInstructionAtIndex(0)
if arch is I386 or arch is X86_64:
instruction = target.ReadInstructions(address, 1, disassembly_flavour).GetInstructionAtIndex(0)
else:
instruction = target.ReadInstructions(address, 1).GetInstructionAtIndex(0)
instructions.append(instruction)
instruction_size = instruction.GetByteSize()
if instruction_size > 0:
Expand Down