From bcc67f63cdaa033d959c9a5518b04a819469c3f3 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Fri, 15 Feb 2013 22:42:39 +0000 Subject: [PATCH] Support newer versions of objdump --- objdump_check.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/objdump_check.py b/objdump_check.py index c0a33ee..ad073b3 100644 --- a/objdump_check.py +++ b/objdump_check.py @@ -65,7 +65,7 @@ def Callback(bytes, desc): whitespace_regexp = re.compile('\s+') comment_regexp = re.compile('\s+#.*$') jump_regexp = re.compile( - '^(jn?[a-z]{1,2}|call|jmp[lw]?|je?cxz|loop(e|ne)?) 0x[0-9a-f]+$') + '^(jn?[a-z]{1,2}|call|jmp[lw]?|j[er]?cxz|loop(e|ne)?) 0x[0-9a-f]+$') rex_regexp = re.compile(r'rex(\.W?R?X?B?)? ') @@ -86,6 +86,10 @@ def NormaliseObjdumpDisasm(disasm): .replace('0x1111', 'VALUE16') .replace('0x11', 'VALUE8') .replace(',', ', ')) + # Remove data32 annotations. + disasm = disasm.replace('data32 ', '') + # Replace movabs with mov. + disasm = disasm.replace('movabs', 'mov') return disasm