Author: Anton Gulenko <anton.gule...@googlemail.com>
Branch: storage
Changeset: r781:8c5600acd5a3
Date: 2014-04-07 16:09 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/8c5600acd5a3/
Log: Better output for debug_merge_point
diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -19,7 +19,7 @@
def get_printable_location(pc, self, method):
bc = ord(method.bytes[pc])
name = method.safe_identifier_string()
- return '%d: [%s]%s (%s)' % (pc, hex(bc), BYTECODE_NAMES[bc], name)
+ return '(%s) [%d]: <%s>%s' % (name, pc, hex(bc), BYTECODE_NAMES[bc])
class Interpreter(object):
@@ -825,11 +825,10 @@
result = [None] * 256
for entry in BYTECODE_RANGES:
if len(entry) == 2:
- positions = [entry[0]]
+ result[entry[0]] = entry[1]
else:
- positions = range(entry[0], entry[1]+1)
- for pos in positions:
- result[pos] = entry[-1]
+ for arg, pos in enumerate(range(entry[0], entry[1]+1)):
+ result[pos] = "%s(%s)" % (entry[2], arg)
assert None not in result
return result
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
