Some Python 3.6 bytecode->wordcode fixes

rocky · rocky · commit 7755563b6512 · 2016-12-15T02:54:25.000-05:00
diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py
@@ -228,7 +228,7 @@ def op_size(self, op):
         if op < self.opc.HAVE_ARGUMENT:
             return 1
         else:
-            return 3
+            return 2 if self.version >= 3.6 else 3
 
     def remove_mid_line_ifs(self, ifs):
         """
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
@@ -562,9 +562,15 @@ def get_target(self, offset):
         Get target offset for op located at given <offset>.
         """
         op = self.code[offset]
-        target = self.code[offset+1] + self.code[offset+2] * 256
-        if op in op3.hasjrel:
-            target += offset + 3
+        if self.version  >= 3.6:
+            target = self.code[offset+1]
+            if op in op3.hasjrel:
+                target += offset + 2
+        else:
+            target = self.code[offset+1] + self.code[offset+2] * 256
+            if op in op3.hasjrel:
+                target += offset + 3
+
         return target
 
     def detect_structure(self, offset, targets):
@@ -678,6 +684,11 @@ def detect_structure(self, offset, targets):
             # rocky: if we have a conditional jump to the next instruction, then
             # possibly I am "skipping over" a "pass" or null statement.
 
+            try:
+                code[prev_op[target]]
+            except:
+                from trepan.api import debug; debug()
+
             if ((code[prev_op[target]] in self.pop_jump_if_pop) and
                 (target > offset) and prev_op[target] != offset):
                 self.fixed_jumps[offset] = prev_op[target]
