Remove some of the 3.0 3.x instruction hackiness

rocky · rocky · commit c6b3e20b4729 · 2018-06-24T18:23:38.000-04:00
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
@@ -663,7 +663,9 @@ def detect_control_flow(self, offset, targets, inst_index):
                 if not jump_back:
                     return
 
-                jump_back += 2  # FIXME ???
+                jb_inst = self.get_inst(jump_back)
+                jump_back = self.next_offset(jb_inst.opcode, jump_back)
+
                 if_offset = None
                 if code[self.prev_op[next_line_byte]] not in self.pop_jump_tf:
                     if_offset = self.prev[next_line_byte]
diff --git a/uncompyle6/scanners/scanner30.py b/uncompyle6/scanners/scanner30.py
@@ -85,7 +85,9 @@ def detect_control_flow(self, offset, targets, inst_index):
                 if not jump_back:
                     return
 
-                jump_back += 2  # FIXME ???
+                jb_inst = self.get_inst(jump_back)
+                jump_back = self.next_offset(jb_inst.opcode, jump_back)
+
                 if_offset = None
                 if code[self.prev_op[next_line_byte]] not in JUMP_TF:
                     if_offset = self.prev[next_line_byte]
