You've already forked python-uncompyle6
mirror of
https://github.com/rocky/python-uncompyle6.git
synced 2025-08-03 08:49:51 +08:00
Start slice and build list on Python3. Do sanity check on marshal load
of code.
This commit is contained in:
BIN
test/bytecode_2.7/01-slice.pyc
Normal file
BIN
test/bytecode_2.7/01-slice.pyc
Normal file
Binary file not shown.
BIN
test/bytecode_3.4/01-slice.pyc
Normal file
BIN
test/bytecode_3.4/01-slice.pyc
Normal file
Binary file not shown.
@@ -52,8 +52,6 @@ import uncompyle6.semantics.pysource
|
|||||||
import uncompyle6.semantics.fragments
|
import uncompyle6.semantics.fragments
|
||||||
|
|
||||||
# Conventience functions so you can say:
|
# Conventience functions so you can say:
|
||||||
# from uncompyle6 import deparse_code and
|
# from uncompyle6 import deparse_code
|
||||||
# from uncompyle6 import deparse_code_fragments
|
|
||||||
|
|
||||||
deparse_code = uncompyle6.semantics.pysource.deparse_code
|
deparse_code = uncompyle6.semantics.pysource.deparse_code
|
||||||
deparse_fragments = uncompyle6.semantics.fragments.deparse_code
|
|
||||||
|
@@ -41,12 +41,19 @@ def load_code(fp, magic_int):
|
|||||||
"""
|
"""
|
||||||
global internStrings
|
global internStrings
|
||||||
internStrings = []
|
internStrings = []
|
||||||
|
seek_pos = fp.tell()
|
||||||
|
# Do a sanity check. Is this a code type?
|
||||||
|
if fp.read(1).decode('utf-8') != 'c':
|
||||||
|
raise TypeError("File %s doesn't smell like Python bytecode" % fp.name)
|
||||||
|
|
||||||
|
fp.seek(seek_pos)
|
||||||
return load_code_internal(fp, magic_int)
|
return load_code_internal(fp, magic_int)
|
||||||
|
|
||||||
def load_code_internal(fp, magic_int, bytes_for_s=False):
|
def load_code_internal(fp, magic_int, bytes_for_s=False):
|
||||||
global internStrings
|
global internStrings
|
||||||
|
|
||||||
marshalType = fp.read(1).decode('utf-8')
|
b1 = fp.read(1)
|
||||||
|
marshalType = b1.decode('utf-8')
|
||||||
if marshalType == 'c':
|
if marshalType == 'c':
|
||||||
Code = types.CodeType
|
Code = types.CodeType
|
||||||
|
|
||||||
|
@@ -650,11 +650,12 @@ class Python2Parser(PythonParser):
|
|||||||
Special handling for opcodes that take a variable number
|
Special handling for opcodes that take a variable number
|
||||||
of arguments -- we add a new rule for each:
|
of arguments -- we add a new rule for each:
|
||||||
|
|
||||||
expr ::= {expr}^n BUILD_LIST_n
|
build_list ::= {expr}^n BUILD_TUPLE_n
|
||||||
expr ::= {expr}^n BUILD_TUPLE_n
|
build_list ::= {expr}^n BUILD_LIST_n
|
||||||
unpack_list ::= UNPACK_LIST {expr}^n
|
unpack_list ::= UNPACK_LIST {expr}^n
|
||||||
unpack ::= UNPACK_TUPLE {expr}^n
|
unpack ::= UNPACK_TUPLE {expr}^n
|
||||||
unpack ::= UNPACK_SEQEUENE {expr}^n
|
unpack ::= UNPACK_SEQEUENCE {expr}^n
|
||||||
|
|
||||||
mkfunc ::= {expr}^n LOAD_CONST MAKE_FUNCTION_n
|
mkfunc ::= {expr}^n LOAD_CONST MAKE_FUNCTION_n
|
||||||
mklambda ::= {expr}^n LOAD_LAMBDA MAKE_FUNCTION_n
|
mklambda ::= {expr}^n LOAD_LAMBDA MAKE_FUNCTION_n
|
||||||
mkfunc ::= {expr}^n load_closure LOAD_CONST MAKE_FUNCTION_n
|
mkfunc ::= {expr}^n load_closure LOAD_CONST MAKE_FUNCTION_n
|
||||||
|
@@ -26,7 +26,6 @@ class Python3Parser(PythonParser):
|
|||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.added_rules = set()
|
self.added_rules = set()
|
||||||
GenericASTBuilder.__init__(self, AST, 'stmts')
|
GenericASTBuilder.__init__(self, AST, 'stmts')
|
||||||
self.customized = {}
|
|
||||||
self.new_rules = set()
|
self.new_rules = set()
|
||||||
|
|
||||||
def add_unique_rule(self, rule, opname, count, customize):
|
def add_unique_rule(self, rule, opname, count, customize):
|
||||||
@@ -36,6 +35,7 @@ class Python3Parser(PythonParser):
|
|||||||
self.new_rules.add(rule)
|
self.new_rules.add(rule)
|
||||||
self.addRule(rule, nop_func)
|
self.addRule(rule, nop_func)
|
||||||
customize[opname] = count
|
customize[opname] = count
|
||||||
|
# print("XXXX" , rule)
|
||||||
pass
|
pass
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -666,11 +666,12 @@ class Python3Parser(PythonParser):
|
|||||||
Special handling for opcodes that take a variable number
|
Special handling for opcodes that take a variable number
|
||||||
of arguments -- we add a new rule for each:
|
of arguments -- we add a new rule for each:
|
||||||
|
|
||||||
expr ::= {expr}^n BUILD_LIST_n
|
build_list ::= {expr}^n BUILD_LIST_n
|
||||||
expr ::= {expr}^n BUILD_TUPLE_n
|
build_list ::= {expr}^n BUILD_TUPLE_n
|
||||||
unpack_list ::= UNPACK_LIST {expr}^n
|
unpack_list ::= UNPACK_LIST {expr}^n
|
||||||
unpack ::= UNPACK_TUPLE {expr}^n
|
unpack ::= UNPACK_TUPLE {expr}^n
|
||||||
unpack ::= UNPACK_SEQEUENE {expr}^n
|
unpack ::= UNPACK_SEQEUENCE {expr}^n
|
||||||
|
|
||||||
mkfunc ::= {expr}^n LOAD_CONST MAKE_FUNCTION_n
|
mkfunc ::= {expr}^n LOAD_CONST MAKE_FUNCTION_n
|
||||||
mklambda ::= {expr}^n LOAD_LAMBDA MAKE_FUNCTION_n
|
mklambda ::= {expr}^n LOAD_LAMBDA MAKE_FUNCTION_n
|
||||||
mkfunc ::= {expr}^n load_closure LOAD_CONST MAKE_FUNCTION_n
|
mkfunc ::= {expr}^n load_closure LOAD_CONST MAKE_FUNCTION_n
|
||||||
@@ -679,8 +680,13 @@ class Python3Parser(PythonParser):
|
|||||||
expr ::= expr {expr}^n CALL_FUNCTION_VAR_KW_n POP_TOP
|
expr ::= expr {expr}^n CALL_FUNCTION_VAR_KW_n POP_TOP
|
||||||
expr ::= expr {expr}^n CALL_FUNCTION_KW_n POP_TOP
|
expr ::= expr {expr}^n CALL_FUNCTION_KW_n POP_TOP
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
# from trepan.api import debug
|
||||||
|
# debug(start_opts={'startup-profile': True})
|
||||||
for token in tokens:
|
for token in tokens:
|
||||||
opname = token.type
|
opname = token.type
|
||||||
|
opname_base = opname[:opname.rfind('_')]
|
||||||
|
|
||||||
if opname in ('CALL_FUNCTION', 'CALL_FUNCTION_VAR',
|
if opname in ('CALL_FUNCTION', 'CALL_FUNCTION_VAR',
|
||||||
'CALL_FUNCTION_VAR_KW', 'CALL_FUNCTION_KW'):
|
'CALL_FUNCTION_VAR_KW', 'CALL_FUNCTION_KW'):
|
||||||
# Low byte indicates number of positional paramters,
|
# Low byte indicates number of positional paramters,
|
||||||
@@ -694,9 +700,15 @@ class Python3Parser(PythonParser):
|
|||||||
+ ('kwarg ' * args_kw)
|
+ ('kwarg ' * args_kw)
|
||||||
+ 'expr ' * nak + token.type)
|
+ 'expr ' * nak + token.type)
|
||||||
self.add_unique_rule(rule, token.type, args_pos, customize)
|
self.add_unique_rule(rule, token.type, args_pos, customize)
|
||||||
elif opname.startswith('MAKE_FUNCTION_'):
|
elif opname_base in ('BUILD_LIST', 'BUILD_TUPLE', 'BUILD_SET'):
|
||||||
# from trepan.api import debug
|
rule = 'build_list ::= ' + 'expr ' * token.attr + opname
|
||||||
# debug(start_opts={'startup-profile': True})
|
self.add_unique_rule(rule, opname, token.attr, customize)
|
||||||
|
elif opname_base in ('UNPACK_TUPLE', 'UNPACK_SEQUENCE'):
|
||||||
|
rule = 'unpack ::= ' + opname + ' designator' * token.attr
|
||||||
|
self.add_unique_rule(rule, opname, token.attr, customize)
|
||||||
|
elif opname_base == 'UNPACK_LIST':
|
||||||
|
rule = 'unpack_list ::= ' + opname + ' designator' * token.attr
|
||||||
|
elif opname_base == ('MAKE_FUNCTION'):
|
||||||
self.addRule('mklambda ::= %s LOAD_LAMBDA %s' %
|
self.addRule('mklambda ::= %s LOAD_LAMBDA %s' %
|
||||||
('expr ' * token.attr, opname), nop_func)
|
('expr ' * token.attr, opname), nop_func)
|
||||||
rule = 'mkfunc ::= %s LOAD_CONST LOAD_CONST %s' % ('expr ' * token.attr, opname)
|
rule = 'mkfunc ::= %s LOAD_CONST LOAD_CONST %s' % ('expr ' * token.attr, opname)
|
||||||
|
Reference in New Issue
Block a user