jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates to llpython.opcode_util to better support loop and exception control flow.

Browse source 
* Inlcuded non-argument branching opcodes in the hasjump opcode list.
* Added all the SETUP_* opcodes to the hascbranch list.
* Modified itercode() to not output the EXTENDED_ARG bytecode.
* Cleaned up extendlabels(), and made it use the hasjump opcode list uniformly.
This commit is contained in:
Jon Riehl 2013-05-10 19:04:03 -05:00
commit d3b252531d
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
llpython/opcode_util.py
View file

@ -7,10 +7,21 @@ import opcode
# ______________________________________________________________________ # ______________________________________________________________________
# Module data # Module data
hasjump = opcode.hasjrel + opcode.hasjabs # Note that opcode.hasjrel and opcode.hasjabs applies only to opcodes
hascbranch = [op for op in hasjump # that calculate a jump point based on the argument. This ignores
if 'IF' in opcode.opname[op] # jumps that use the frame stack to calculate their targets.
or opcode.opname[op] in ('FOR_ITER', 'SETUP_LOOP')]
NON_ARG_JUMP_NAMES = 'BREAK_LOOP', 'RETURN_VALUE', 'END_FINALLY'
NON_ARG_JUMPS = [opcode.opmap[opname]
for opname in NON_ARG_JUMP_NAMES
if opname in opcode.opmap]
HAS_CBRANCH_NAMES = 'FOR_ITER',
hasjump = opcode.hasjrel + opcode.hasjabs + NON_ARG_JUMPS
hascbranch = [op for op, opname in ((op, opcode.opname[op])
for op in hasjump)
if 'IF' in opname
or 'SETUP' in opname
or opname in HAS_CBRANCH_NAMES]
# Since the actual opcode value may change, manage opcode abstraction # Since the actual opcode value may change, manage opcode abstraction
# data by opcode name. # data by opcode name.
@ -168,6 +179,7 @@ def itercode(code, start = 0):
i = i + 2 i = i + 2
if op == opcode.EXTENDED_ARG: if op == opcode.EXTENDED_ARG:
extended_arg = oparg * 65536 extended_arg = oparg * 65536
continue
delta = yield num, op, oparg delta = yield num, op, oparg
if delta is not None: if delta is not None:
@ -195,15 +207,8 @@ def extendlabels(code, labels = None):
i += 1 i += 1
if op >= dis.HAVE_ARGUMENT: if op >= dis.HAVE_ARGUMENT:
i += 2 i += 2
label = -1 if op in hasjump and i < n and i not in labels:
if op in hasjump: labels.append(i)
label = i
if label >= 0:
if label not in labels:
labels.append(label)
elif op == opcode.opmap['BREAK_LOOP']:
if i not in labels:
labels.append(i)
return labels return labels
# ______________________________________________________________________ # ______________________________________________________________________