Skip to content
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.

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

Final AArch64 Merge #1424

Merged
merged 15 commits into from
Apr 30, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Revert "fixup: remove x86-specific code from '_reg_name'"
nkaretnikov committed Apr 30, 2019
commit f6db31cc2436962be7387cd376854ca8b1b99b28
5 changes: 5 additions & 0 deletions manticore/native/cpu/abstractcpu.py
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@
from ...utils.fallback_emulator import UnicornEmulator
from ...utils.helpers import issymbolic

from capstone.x86 import X86_REG_ENDING

logger = logging.getLogger(__name__)
register_logger = logging.getLogger(f'{__name__}.registers')

@@ -144,6 +146,9 @@ def _reg_name(self, reg_id):

:param int reg_id: Register ID
"""
if reg_id >= X86_REG_ENDING:
logger.warning("Trying to get register name for a non-register")
return None
cs_reg_name = self.cpu.instruction.reg_name(reg_id)
if cs_reg_name is None or cs_reg_name.lower() == '(invalid)':
return None