about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2015-02-10 11:30:38 +0100
committerCamille Mougey <commial@gmail.com>2015-02-10 11:30:38 +0100
commit67b513a29f6bfdb3c9a32676a790863e0b6ff521 (patch)
treeb5edbd81609e5329cb6aea516d6663dd0edb2449
parent3884615ff5555f41c45f8811946a13d2eb6911f9 (diff)
parent63d8b17ae58c0ad7e3aa91c1fbfeb7e0730182cc (diff)
downloadmiasm-67b513a29f6bfdb3c9a32676a790863e0b6ff521.tar.gz
miasm-67b513a29f6bfdb3c9a32676a790863e0b6ff521.zip
Merge pull request #55 from serpilliere/x86_breakflow_fix
X86 breakflow fix
Diffstat (limited to '')
-rw-r--r--miasm2/arch/x86/arch.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py
index 85356468..e75c22a9 100644
--- a/miasm2/arch/x86/arch.py
+++ b/miasm2/arch/x86/arch.py
@@ -20,8 +20,10 @@ conditional_branch = ["JO", "JNO", "JB", "JAE",
                       "JZ", "JNZ", "JBE", "JA",
                       "JS", "JNS", "JPE", "JNP",
                       #"L", "NL", "NG", "G"]
-                      "JL", "JGE", "JLE", "JG"]
-unconditional_branch = ['JMP']
+                      "JL", "JGE", "JLE", "JG",
+                      "JCXZ", "JECXZ", "JRCXZ"]
+
+unconditional_branch = ['JMP', 'JMPF']
 
 f_isad = "AD"
 f_s08 = "S08"