Skip to content

Fix hardcoded NOP instructions for ARM/AARCH64 #971

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

Jump to bottom
Merged
merged 6 commits into from
Jul 22, 2023
Merged

Fix hardcoded NOP instructions for ARM/AARCH64 #971

merged 6 commits into from
Jul 22, 2023

Conversation

@hugsy
Copy link
Owner

@hugsy hugsy commented Jul 22, 2023 •
edited
Loading

Description/Motivation/Screenshots

Fixes ARM and ARM64 NOP instructions

Fixes an off-by-one in gdb_get_nth_next_instruction_address() for fixed-size instruction archs.

Result: nop works fine on ARM/AARCH64

image

Against which architecture was this tested ?

"Tested" indicates that the PR works and the unit test (see docs/testing.md) run passes without issue.

  • x86-32
  • x86-64
  • ARM
  • AARCH64
  • MIPS
  • POWERPC
  • SPARC
  • RISC-V

Checklist

  • My PR was done against the dev branch, not main.
  • My code follows the code style of this project.
  • My change includes a change to the documentation, if required.
  • If my change adds new code, adequate tests have been added.
  • I have read and agree to the CONTRIBUTING document.

@hugsy hugsy changed the title Fix nop insns Fix hardcoded NOP instructions for ARM/AARCH64 Jul 22, 2023
@hugsy hugsy marked this pull request as ready for review July 22, 2023 01:38
@hugsy hugsy added this to the 2023.08 milestone Jul 22, 2023
@github-actions
Copy link

github-actions bot commented Jul 22, 2023

🤖 Coverage Update

  • Commit: f6c149c
  • Current Coverage: 71.6013%
  • New Coverage: 71.5983%
  • Diff: -0.0030000000000001137

Grazfather
Grazfather approved these changes Jul 22, 2023
View reviewed changes
Grazfather
Grazfather reviewed Jul 22, 2023
View reviewed changes
hugsy
hugsy commented Jul 22, 2023
View reviewed changes
gef.py
arch = frame.architecture()

for insn in arch.disassemble(start_pc, **kwargs):
assert isinstance(insn["addr"], int)
Copy link
Owner Author

@hugsy hugsy Jul 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those asserts are mostly for pylance, as the gdb.pyi simply uses a dict[str, object] for instruction

@hugsy hugsy merged commit 0461d6f into dev Jul 22, 2023
@hugsy hugsy deleted the fix_nop_insns branch July 22, 2023 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Grazfather Grazfather Grazfather approved these changes

Assignees

No one assigned

Labels

arch: arm/arm64 bug

Projects

None yet

Milestone

2023.08

Development

Successfully merging this pull request may close these issues.

3 participants

@hugsy @Grazfather