jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-02 16:44:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging in recent 3.7 and 3.8 improvements from decompyle6

Browse Source 
This rebases 3.7, 3.8 ...decompilation off of 3.7ish rather than a 3.4
base.

Add more 3.7 and 3.8 tests
This commit is contained in:
rocky
2019-12-08 13:12:05 -05:00
parent 301464d646
commit c6ddefcef5
30 changed files with 3971 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
uncompyle6/scanners/scanner37.py
View File

@@ -22,24 +22,50 @@ This sets up opcodes Python's 3.7 and calls a generalized
scanner routine for Python 3.
"""
from uncompyle6.scanners.scanner36 import Scanner36
from uncompyle6.scanners.scanner3 import Scanner3
from uncompyle6.scanners.scanner37base import Scanner37Base
# bytecode verification, verify(), uses JUMP_OPs from here
from xdis.opcodes import opcode_37 as opc
# bytecode verification, verify(), uses JUMP_OPS from here
JUMP_OPs = opc.JUMP_OPS
class Scanner37(Scanner36):
class Scanner37(Scanner37Base):
def __init__(self, show_asm=None):
Scanner3.__init__(self, 3.7, show_asm)
Scanner37Base.__init__(self, 3.7, show_asm)
return
pass
def ingest(self, co, classname=None, code_objects={}, show_asm=None):
tokens, customize = Scanner37Base.ingest(self, co, classname, code_objects, show_asm)
for t in tokens:
# The lowest bit of flags indicates whether the
# var-keyword argument is placed at the top of the stack
if t.op == self.opc.CALL_FUNCTION_EX and t.attr & 1:
t.kind = "CALL_FUNCTION_EX_KW"
pass
elif t.op == self.opc.BUILD_STRING:
t.kind = "BUILD_STRING_%s" % t.attr
elif t.op == self.opc.CALL_FUNCTION_KW:
t.kind = "CALL_FUNCTION_KW_%s" % t.attr
elif t.op == self.opc.FORMAT_VALUE:
if t.attr & 0x4:
t.kind = "FORMAT_VALUE_ATTR"
pass
elif t.op == self.opc.BUILD_MAP_UNPACK_WITH_CALL:
t.kind = "BUILD_MAP_UNPACK_WITH_CALL_%d" % t.attr
elif t.op == self.opc.BUILD_TUPLE_UNPACK_WITH_CALL:
t.kind = "BUILD_TUPLE_UNPACK_WITH_CALL_%d" % t.attr
pass
return tokens, customize
if __name__ == "__main__":
from uncompyle6 import PYTHON_VERSION
if PYTHON_VERSION == 3.7:
import inspect
co = inspect.currentframe().f_code
tokens, customize = Scanner37().ingest(co)
for t in tokens: