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

fix module & 2.6

Browse Source
This commit is contained in:
Mysterie
2012-06-12 17:43:27 +02:00
parent 87a0ad531a
commit c7506289db
2 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
uncompyle2/Scanner25.py
View File

@@ -259,7 +259,8 @@ class Scanner:
opcode = self.code[i] opcode = self.code[i]
opsize = self.op_size(opcode) opsize = self.op_size(opcode)
if opcode == EXTENDED_ARG: if opcode == EXTENDED_ARG:
raise 'A faire' raise 'TODO'
# del POP_TOP
if opcode in (PJIF,PJIT,JA,JF): if opcode in (PJIF,PJIT,JA,JF):
if self.code[i+opsize] == POP_TOP: if self.code[i+opsize] == POP_TOP:
if self.code[i+opsize] == self.code[i+opsize+1] and self.code[i+opsize] == self.code[i+opsize+2] \ if self.code[i+opsize] == self.code[i+opsize+1] and self.code[i+opsize] == self.code[i+opsize+2] \
@@ -289,7 +290,7 @@ class Scanner:
end += self.op_size(LOAD_FAST) end += self.op_size(LOAD_FAST)
# log JA/POP_TOP to del and update PJIF # log JA/POP_TOP to del and update PJIF
while start < end: while start < end:
start = self.first_instr(start, len(self.code), (PJIF)) start = self.first_instr(start, len(self.code), (PJIF,PJIT))
if start == None: break if start == None: break
target = self.get_target(start) target = self.get_target(start)
if self.code[target] == POP_TOP and self.code[target-3] == JA: if self.code[target] == POP_TOP and self.code[target-3] == JA:
@@ -297,11 +298,12 @@ class Scanner:
# update PJIF # update PJIF
target = self.get_target(target-3) target = self.get_target(target-3)
if target > 0xFFFF: if target > 0xFFFF:
raise 'A gerer' raise 'TODO'
self.code[start+1] = target & 0xFF self.code[start+1] = target & 0xFF
self.code[start+2] = (target >> 8) & 0xFF self.code[start+2] = (target >> 8) & 0xFF
start += self.op_size(PJIF) start += self.op_size(PJIF)
# del DELETE_NAME x # del DELETE_NAME x
start = end
while end < len(self.code): while end < len(self.code):
end = self.first_instr(end, len(self.code), (DELETE_NAME,DELETE_FAST)) end = self.first_instr(end, len(self.code), (DELETE_NAME,DELETE_FAST))
if nameDel == self.get_argument(end): if nameDel == self.get_argument(end):
@@ -312,6 +314,13 @@ class Scanner:
else: else:
end += self.op_size(DELETE_FAST) end += self.op_size(DELETE_FAST)
return toDel return toDel
# change join(for..) struct
if opcode == SETUP_LOOP:
if self.code[i+3] == LOAD_FAST and self.code[i+6] == FOR_ITER:
end = self.first_instr(i, len(self.code), RETURN_VALUE)
end = self.first_instr(i, end, YIELD_VALUE)
if end and self.code[end+1] == POP_TOP and self.code[end+2] == JA and self.code[end+5] == POP_BLOCK:
return [i,end+5]
return None return None
def restructRelativeJump(self): def restructRelativeJump(self):
@@ -693,9 +702,10 @@ class Scanner:
jump_back = self.last_instr(start, end, JA, jump_back = self.last_instr(start, end, JA,
next_line_byte, False) next_line_byte, False)
if not jump_back: # loop suite ends in return. wtf right? if not jump_back: # loop suite ends in return. wtf right?
jump_back = self.last_instr(start, end, RETURN_VALUE) + 1 jump_back = self.last_instr(start, end, RETURN_VALUE)
if not jump_back: if not jump_back:
return return
jump_back += 1
if code[self.prev[next_line_byte]] not in (PJIF, PJIT): if code[self.prev[next_line_byte]] not in (PJIF, PJIT):
loop_type = 'for' loop_type = 'for'
else: else:

42
uncompyle2/Scanner26.py
View File

@@ -258,15 +258,23 @@ class Scanner:
""" """
opcode = self.code[i] opcode = self.code[i]
opsize = self.op_size(opcode) opsize = self.op_size(opcode)
if i+opsize >= len(self.code):
return None
if opcode == EXTENDED_ARG: if opcode == EXTENDED_ARG:
raise 'A faire' raise 'TODO'
if opcode in (PJIF,PJIT,JA,JF): # del POP_TOP
if opcode in (PJIF,PJIT,JA,JF,RETURN_VALUE):
if self.code[i+opsize] == POP_TOP: if self.code[i+opsize] == POP_TOP:
if self.code[i+opsize] == self.code[i+opsize+1] and self.code[i+opsize] == self.code[i+opsize+2] \ if self.code[i+opsize] == self.code[i+opsize+1] and self.code[i+opsize] == self.code[i+opsize+2] \
and opcode in (JF,JA) and self.code[i+opsize] != self.code[i+opsize+3]: and opcode in (JF,JA) and self.code[i+opsize] != self.code[i+opsize+3]:
pass pass
else: else:
return [i+opsize] return [i+opsize]
if opcode == RAISE_VARARGS:
if self.code[i+opsize] == POP_TOP:
return [i+opsize]
if opcode == BUILD_LIST: if opcode == BUILD_LIST:
if self.code[i+opsize] == DUP_TOP and self.code[i+opsize+1] in (STORE_NAME,STORE_FAST): if self.code[i+opsize] == DUP_TOP and self.code[i+opsize+1] in (STORE_NAME,STORE_FAST):
# del DUP/STORE_NAME x # del DUP/STORE_NAME x
@@ -286,7 +294,7 @@ class Scanner:
end += self.op_size(LOAD_FAST) end += self.op_size(LOAD_FAST)
# log JA/POP_TOP to del and update PJIF # log JA/POP_TOP to del and update PJIF
while start < end: while start < end:
start = self.first_instr(start, len(self.code), (PJIF)) start = self.first_instr(start, len(self.code), (PJIF,PJIT))
if start == None: break if start == None: break
target = self.get_target(start) target = self.get_target(start)
if self.code[target] == POP_TOP and self.code[target-3] == JA: if self.code[target] == POP_TOP and self.code[target-3] == JA:
@@ -294,11 +302,12 @@ class Scanner:
# update PJIF # update PJIF
target = self.get_target(target-3) target = self.get_target(target-3)
if target > 0xFFFF: if target > 0xFFFF:
raise 'A gerer' raise 'TODO'
self.code[start+1] = target & 0xFF self.code[start+1] = target & 0xFF
self.code[start+2] = (target >> 8) & 0xFF self.code[start+2] = (target >> 8) & 0xFF
start += self.op_size(PJIF) start += self.op_size(PJIF)
# del DELETE_NAME x # del DELETE_NAME x
start = end
while end < len(self.code): while end < len(self.code):
end = self.first_instr(end, len(self.code), (DELETE_NAME,DELETE_FAST)) end = self.first_instr(end, len(self.code), (DELETE_NAME,DELETE_FAST))
if nameDel == self.get_argument(end): if nameDel == self.get_argument(end):
@@ -309,11 +318,19 @@ class Scanner:
else: else:
end += self.op_size(DELETE_FAST) end += self.op_size(DELETE_FAST)
return toDel return toDel
# change join(for..) struct
if opcode == SETUP_LOOP:
if self.code[i+3] == LOAD_FAST and self.code[i+6] == FOR_ITER:
end = self.first_instr(i, len(self.code), RETURN_VALUE)
end = self.first_instr(i, end, YIELD_VALUE)
if end and self.code[end+1] == POP_TOP and self.code[end+2] == JA and self.code[end+5] == POP_BLOCK:
return [i,end+5]
return None return None
def restructRelativeJump(self): def restructRelativeJump(self):
""" """
change relative JUMP_IF_FALSE/TRUE to absolut jump change relative JUMP_IF_FALSE/TRUE to absolut jump
and remap the target of PJIF/PJIT
""" """
for i in self.op_range(0, len(self.code)): for i in self.op_range(0, len(self.code)):
if(self.code[i] in (PJIF,PJIT)): if(self.code[i] in (PJIF,PJIT)):
@@ -340,7 +357,7 @@ class Scanner:
""" """
result = list() result = list()
for item in self.linestarts: for item in self.linestarts:
if i < item[0]: if i < item[0]:
result.append((item[0]-1, item[1])) result.append((item[0]-1, item[1]))
else: else:
result.append((item[0], item[1])) result.append((item[0], item[1]))
@@ -535,7 +552,7 @@ class Scanner:
stmt_list = list(stmts) stmt_list = list(stmts)
stmt_list.sort() stmt_list.sort()
else: else:
stmt_list = prelim stmt_list = prelim
last_stmt = -1 last_stmt = -1
self.next_stmt = [] self.next_stmt = []
slist = self.next_stmt = [] slist = self.next_stmt = []
@@ -566,7 +583,6 @@ class Scanner:
slist += [s] * (s-i) slist += [s] * (s-i)
i = s i = s
slist += [len(code)] * (len(code)-len(slist)) slist += [len(code)] * (len(code)-len(slist))
def remove_mid_line_ifs(self, ifs): def remove_mid_line_ifs(self, ifs):
filtered = [] filtered = []
@@ -690,9 +706,10 @@ class Scanner:
jump_back = self.last_instr(start, end, JA, jump_back = self.last_instr(start, end, JA,
next_line_byte, False) next_line_byte, False)
if not jump_back: # loop suite ends in return. wtf right? if not jump_back: # loop suite ends in return. wtf right?
jump_back = self.last_instr(start, end, RETURN_VALUE) + 1 jump_back = self.last_instr(start, end, RETURN_VALUE)
if not jump_back: if not jump_back:
return return
jump_back += 1
if code[self.prev[next_line_byte]] not in (PJIF, PJIT): if code[self.prev[next_line_byte]] not in (PJIF, PJIT):
loop_type = 'for' loop_type = 'for'
else: else:
@@ -851,7 +868,6 @@ class Scanner:
and self.get_target(target) == self.get_target(next): and self.get_target(target) == self.get_target(next):
self.fixed_jumps[pos] = pre[next] self.fixed_jumps[pos] = pre[next]
return return
#don't add a struct for a while test, it's already taken care of #don't add a struct for a while test, it's already taken care of
if pos in self.ignore_if: if pos in self.ignore_if:
return return
@@ -885,7 +901,13 @@ class Scanner:
'start': start, 'start': start,
'end': rtarget}) 'end': rtarget})
self.return_end_ifs.add(pre[rtarget]) self.return_end_ifs.add(pre[rtarget])
# if it's an old JUMP_IF_FALSE_OR_POP, JUMP_IF_TRUE_OR_POP
#if target > pos:
# unop_target = self.last_instr(pos, target, JF, target)
# if unop_target and code[unop_target+3] != ROT_TWO:
# self.fixed_jumps[pos] = unop_target
# else:
# self.fixed_jumps[pos] = self.restrict_to_parent(target, parent)
def find_jump_targets(self, code): def find_jump_targets(self, code):
""" """