You've already forked python-uncompyle6
mirror of
https://github.com/rocky/python-uncompyle6.git
synced 2025-08-04 01:09:52 +08:00
Optimisation for bytecode 2.5/2.6 restructuration
This commit is contained in:
Mysterie
@@ -85,21 +85,18 @@ class Scanner:
|
|||||||
ret = self.getOpcodeToDel(i)
|
ret = self.getOpcodeToDel(i)
|
||||||
if ret != None:
|
if ret != None:
|
||||||
toDel += ret
|
toDel += ret
|
||||||
if toDel: # degeu a revoir / repenser (tout faire d'un coup? chaud)
|
if toDel:
|
||||||
toDel = sorted(list(set(toDel)))
|
toDel = sorted(list(set(toDel)))
|
||||||
delta = 0
|
delta = 0
|
||||||
|
self.restructCode(toDel)
|
||||||
for x in toDel:
|
for x in toDel:
|
||||||
if self.code[x-delta] >= dis.HAVE_ARGUMENT:
|
if self.code[x-delta] >= dis.HAVE_ARGUMENT:
|
||||||
self.code.pop(x-delta)
|
self.code.pop(x-delta)
|
||||||
self.restructCode(x-delta)
|
|
||||||
self.code.pop(x-delta)
|
self.code.pop(x-delta)
|
||||||
self.restructCode(x-delta)
|
|
||||||
self.code.pop(x-delta)
|
self.code.pop(x-delta)
|
||||||
self.restructCode(x-delta)
|
|
||||||
delta += 3
|
delta += 3
|
||||||
else:
|
else:
|
||||||
self.code.pop(x-delta)
|
self.code.pop(x-delta)
|
||||||
self.restructCode(x-delta)
|
|
||||||
delta += 1
|
delta += 1
|
||||||
|
|
||||||
# mapping adresses of prev instru
|
# mapping adresses of prev instru
|
||||||
@@ -110,7 +107,6 @@ class Scanner:
|
|||||||
if op >= HAVE_ARGUMENT:
|
if op >= HAVE_ARGUMENT:
|
||||||
self.prev.append(i)
|
self.prev.append(i)
|
||||||
self.prev.append(i)
|
self.prev.append(i)
|
||||||
|
|
||||||
j = 0
|
j = 0
|
||||||
linestarts = self.linestarts
|
linestarts = self.linestarts
|
||||||
self.lines = []
|
self.lines = []
|
||||||
@@ -390,38 +386,50 @@ class Scanner:
|
|||||||
self.code[i+1] = target & 0xFF
|
self.code[i+1] = target & 0xFF
|
||||||
self.code[i+2] = (target >> 8) & 0xFF
|
self.code[i+2] = (target >> 8) & 0xFF
|
||||||
|
|
||||||
def restructCode(self, i):
|
def restructCode(self, listDel):
|
||||||
"""
|
"""
|
||||||
restruct linestarts and jump destination after removing a POP_TOP
|
restruct linestarts and jump destination after removing bad opcode
|
||||||
"""
|
"""
|
||||||
|
|
||||||
result = list()
|
result = list()
|
||||||
for item in self.linestarts:
|
for block in self.linestarts:
|
||||||
if i < item[0]:
|
startBlock = 0
|
||||||
result.append((item[0]-1, item[1]))
|
for toDel in listDel:
|
||||||
|
if toDel < block[0]:
|
||||||
|
startBlock -= self.op_size(self.code[toDel])
|
||||||
else:
|
else:
|
||||||
result.append((item[0], item[1]))
|
break
|
||||||
|
result.append((block[0]+startBlock, block[1]))
|
||||||
self.linestarts = result
|
self.linestarts = result
|
||||||
|
|
||||||
for change in self.toChange:
|
for change in self.toChange:
|
||||||
if change > i:
|
for toDel in listDel:
|
||||||
self.toChange[self.toChange.index(change)] -= 1
|
if change > toDel:
|
||||||
for x in self.op_range(0, len(self.code)):
|
self.toChange[self.toChange.index(change)] -= self.op_size(self.code[toDel])
|
||||||
op = self.code[x]
|
|
||||||
if op >= HAVE_ARGUMENT:
|
|
||||||
if op in dis.hasjrel:
|
|
||||||
if x < i and self.get_target(x) > i:
|
|
||||||
if self.code[x+1]-1 < 0:
|
|
||||||
self.code[x+2] -= 1
|
|
||||||
self.code[x+1] = self.code[x+1]+255
|
|
||||||
else:
|
else:
|
||||||
self.code[x+1] -= 1
|
break
|
||||||
elif op in dis.hasjabs:
|
|
||||||
if i < self.get_target(x):
|
for jmp in self.op_range(0, len(self.code)):
|
||||||
if self.code[x+1]-1 < 0:
|
op = self.code[jmp]
|
||||||
self.code[x+2] -= 1
|
if op in dis.hasjrel+dis.hasjabs: # jmp
|
||||||
self.code[x+1] = self.code[x+1]+255
|
offset = 0
|
||||||
|
jmpTarget = self.get_target(jmp)
|
||||||
|
for toDel in listDel:
|
||||||
|
if toDel < jmpTarget:
|
||||||
|
if op in dis.hasjabs:
|
||||||
|
offset-=self.op_size(self.code[toDel])
|
||||||
|
elif jmp < toDel:
|
||||||
|
offset-=self.op_size(self.code[toDel])
|
||||||
else:
|
else:
|
||||||
self.code[x+1] -= 1
|
break
|
||||||
|
self.restructJump(jmp, offset)
|
||||||
|
|
||||||
|
def restructJump(self, pos, offset):
|
||||||
|
target = self.get_argument(pos) + offset
|
||||||
|
if target > 0xFFFF:
|
||||||
|
raise 'A gerer'
|
||||||
|
self.code[pos+2] = (target >> 8) & 0xFF
|
||||||
|
self.code[pos+1] = target & 0xFF
|
||||||
|
|
||||||
def get_target(self, pos, op=None):
|
def get_target(self, pos, op=None):
|
||||||
if op is None:
|
if op is None:
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ class Scanner:
|
|||||||
names = co.co_names
|
names = co.co_names
|
||||||
varnames = co.co_varnames
|
varnames = co.co_varnames
|
||||||
self.names = names
|
self.names = names
|
||||||
|
print self.linestarts
|
||||||
# add instruction to remonde in "toDel" list
|
# add instruction to remonde in "toDel" list
|
||||||
toDel = []
|
toDel = []
|
||||||
# add instruction to change in "toChange" list
|
# add instruction to change in "toChange" list
|
||||||
@@ -85,21 +86,18 @@ class Scanner:
|
|||||||
ret = self.getOpcodeToDel(i)
|
ret = self.getOpcodeToDel(i)
|
||||||
if ret != None:
|
if ret != None:
|
||||||
toDel += ret
|
toDel += ret
|
||||||
if toDel: # degeu a revoir / repenser (tout faire d'un coup? chaud)
|
if toDel:
|
||||||
toDel = sorted(list(set(toDel)))
|
toDel = sorted(list(set(toDel)))
|
||||||
delta = 0
|
delta = 0
|
||||||
|
self.restructCode(toDel)
|
||||||
for x in toDel:
|
for x in toDel:
|
||||||
if self.code[x-delta] >= dis.HAVE_ARGUMENT:
|
if self.code[x-delta] >= dis.HAVE_ARGUMENT:
|
||||||
self.code.pop(x-delta)
|
self.code.pop(x-delta)
|
||||||
self.restructCode(x-delta)
|
|
||||||
self.code.pop(x-delta)
|
self.code.pop(x-delta)
|
||||||
self.restructCode(x-delta)
|
|
||||||
self.code.pop(x-delta)
|
self.code.pop(x-delta)
|
||||||
self.restructCode(x-delta)
|
|
||||||
delta += 3
|
delta += 3
|
||||||
else:
|
else:
|
||||||
self.code.pop(x-delta)
|
self.code.pop(x-delta)
|
||||||
self.restructCode(x-delta)
|
|
||||||
delta += 1
|
delta += 1
|
||||||
|
|
||||||
# mapping adresses of prev instru
|
# mapping adresses of prev instru
|
||||||
@@ -113,6 +111,7 @@ class Scanner:
|
|||||||
|
|
||||||
j = 0
|
j = 0
|
||||||
linestarts = self.linestarts
|
linestarts = self.linestarts
|
||||||
|
print self.linestarts
|
||||||
self.lines = []
|
self.lines = []
|
||||||
linetuple = namedtuple('linetuple', ['l_no', 'next'])
|
linetuple = namedtuple('linetuple', ['l_no', 'next'])
|
||||||
linestartoffsets = {a for (a, _) in linestarts}
|
linestartoffsets = {a for (a, _) in linestarts}
|
||||||
@@ -384,38 +383,49 @@ class Scanner:
|
|||||||
self.code[i+1] = target & 0xFF
|
self.code[i+1] = target & 0xFF
|
||||||
self.code[i+2] = (target >> 8) & 0xFF
|
self.code[i+2] = (target >> 8) & 0xFF
|
||||||
|
|
||||||
def restructCode(self, i):
|
def restructCode(self, listDel):
|
||||||
"""
|
"""
|
||||||
restruct linestarts and jump destination after removing a POP_TOP
|
restruct linestarts and jump destination after removing a POP_TOP
|
||||||
"""
|
"""
|
||||||
result = list()
|
result = list()
|
||||||
for item in self.linestarts:
|
for block in self.linestarts:
|
||||||
if i < item[0]:
|
startBlock = 0
|
||||||
result.append((item[0]-1, item[1]))
|
for toDel in listDel:
|
||||||
|
if toDel < block[0]:
|
||||||
|
startBlock -= self.op_size(self.code[toDel])
|
||||||
else:
|
else:
|
||||||
result.append((item[0], item[1]))
|
break
|
||||||
|
result.append((block[0]+startBlock, block[1]))
|
||||||
self.linestarts = result
|
self.linestarts = result
|
||||||
|
|
||||||
for change in self.toChange:
|
for change in self.toChange:
|
||||||
if change > i:
|
for toDel in listDel:
|
||||||
self.toChange[self.toChange.index(change)] -= 1
|
if change > toDel:
|
||||||
for x in self.op_range(0, len(self.code)):
|
self.toChange[self.toChange.index(change)] -= self.op_size(self.code[toDel])
|
||||||
op = self.code[x]
|
|
||||||
if op >= HAVE_ARGUMENT:
|
|
||||||
if op in dis.hasjrel:
|
|
||||||
if x < i and self.get_target(x) > i:
|
|
||||||
if self.code[x+1]-1 < 0:
|
|
||||||
self.code[x+2] -= 1
|
|
||||||
self.code[x+1] = self.code[x+1]+255
|
|
||||||
else:
|
else:
|
||||||
self.code[x+1] -= 1
|
break
|
||||||
elif op in dis.hasjabs:
|
|
||||||
if i < self.get_target(x):
|
for jmp in self.op_range(0, len(self.code)):
|
||||||
if self.code[x+1]-1 < 0:
|
op = self.code[jmp]
|
||||||
self.code[x+2] -= 1
|
if op in dis.hasjrel+dis.hasjabs: # jmp
|
||||||
self.code[x+1] = self.code[x+1]+255
|
offset = 0
|
||||||
|
jmpTarget = self.get_target(jmp)
|
||||||
|
for toDel in listDel:
|
||||||
|
if toDel < jmpTarget:
|
||||||
|
if op in dis.hasjabs:
|
||||||
|
offset-=self.op_size(self.code[toDel])
|
||||||
|
elif jmp < toDel:
|
||||||
|
offset-=self.op_size(self.code[toDel])
|
||||||
else:
|
else:
|
||||||
self.code[x+1] -= 1
|
break
|
||||||
|
self.restructJump(jmp, offset)
|
||||||
|
|
||||||
|
def restructJump(self, pos, offset):
|
||||||
|
target = self.get_argument(pos) + offset
|
||||||
|
if target > 0xFFFF:
|
||||||
|
raise 'A gerer'
|
||||||
|
self.code[pos+2] = (target >> 8) & 0xFF
|
||||||
|
self.code[pos+1] = target & 0xFF
|
||||||
|
|
||||||
def get_target(self, pos, op=None):
|
def get_target(self, pos, op=None):
|
||||||
if op is None:
|
if op is None:
|
||||||
|
|||||||
Reference in New Issue
Block a user