about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2018-03-09 13:34:59 +0100
committerGitHub <noreply@github.com>2018-03-09 13:34:59 +0100
commit6fea9e7c789133f4ab8c454d59ad0663afbcc1a3 (patch)
treeb57fe70001d67c29bc0e95226a7a8fcceb860e85
parentba7e5a0f0d6ea91074e740d01433a0477c1008ed (diff)
parentefb3be7a3303f9d4cbf77a8ed676ccedf8d8373f (diff)
downloadmiasm-6fea9e7c789133f4ab8c454d59ad0663afbcc1a3.tar.gz
miasm-6fea9e7c789133f4ab8c454d59ad0663afbcc1a3.zip
Merge pull request #693 from a-vincent/ppc-fix-getdstflow
Fix getdstflow(): some branches currently have a useless CR field
-rw-r--r--miasm2/arch/ppc/arch.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/arch/ppc/arch.py b/miasm2/arch/ppc/arch.py
index 170a005d..87147f1c 100644
--- a/miasm2/arch/ppc/arch.py
+++ b/miasm2/arch/ppc/arch.py
@@ -115,7 +115,7 @@ class instruction_ppc(instruction):
             name = name[:-2] + 'A'
 
         if name[-2:] != 'LR' and name[-3:] != 'CTR':
-            if self.is_conditional_jump(name):
+            if len(self.args) == 2:
                 address_index = 1
             else:
                 address_index = 0
@@ -144,7 +144,7 @@ class instruction_ppc(instruction):
             return [ LR ]
         elif 'CTR' in self.name:
             return [ CTR ]
-        elif self.is_conditional_jump(self.name):
+        elif len(self.args) == 2:
             address_index = 1
         else:
             address_index = 0