about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--miasm2/arch/ppc/arch.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/miasm2/arch/ppc/arch.py b/miasm2/arch/ppc/arch.py
index d47c2aad..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
@@ -462,9 +462,7 @@ def ppc_bo_bi_to_mnemo(bo, bi, prefer_taken=True, default_taken=True):
     return mnem
 
 def ppc_all_bo_bi():
-    yield 20, 0
-
-    for bo in [0, 2, 4, 8, 10, 12, 16, 18]:
+    for bo in [0, 2, 4, 8, 10, 12, 16, 18, 20]:
         for bi in xrange(4):
             yield bo, bi