Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r45585:ab1c0e7ecfa5
Date: 2011-07-14 10:53 +0200
http://bitbucket.org/pypy/pypy/changeset/ab1c0e7ecfa5/
Log: consistent capitalization
diff --git a/pypy/jit/backend/x86/assembler.py
b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -482,7 +482,7 @@
#
rawstart = self.materialize_loop(original_loop_token)
debug_start("jit-backend-addr")
- debug_print("Bridge out of Guard %d has address %x to %x" %
+ debug_print("bridge out of Guard %d has address %x to %x" %
(descr_number, rawstart, rawstart + codeendpos))
debug_stop("jit-backend-addr")
self._patch_stackadjust(rawstart + stackadjustpos,
diff --git a/pypy/tool/jitlogparser/parser.py b/pypy/tool/jitlogparser/parser.py
--- a/pypy/tool/jitlogparser/parser.py
+++ b/pypy/tool/jitlogparser/parser.py
@@ -337,8 +337,13 @@
addrs = {}
for entry in extract_category(log, 'jit-backend-addr'):
m = re.search('bootstrap ([\da-f]+)', entry)
- name = entry[:entry.find('(') - 1]
- addrs[int(m.group(1), 16)] = name
+ if not m:
+ # a bridge
+ m = re.search('has address ([\da-f]+)', entry)
+ addr = int(m.group(1), 16)
+ else:
+ name = entry[:entry.find('(') - 1]
+ addrs[int(m.group(1), 16)] = name
dumps = {}
for entry in extract_category(log, 'jit-backend-dump'):
backend, _, dump, _ = entry.split("\n")
@@ -358,5 +363,7 @@
bname, start_ofs, dump = dumps[name]
parser.postprocess(loop, backend_tp=bname, backend_dump=dump,
dump_start=start_ofs)
+ else:
+ xxx
loops.append(loop)
return log, loops
diff --git a/pypy/tool/jitlogparser/test/test_parser.py
b/pypy/tool/jitlogparser/test/test_parser.py
--- a/pypy/tool/jitlogparser/test/test_parser.py
+++ b/pypy/tool/jitlogparser/test/test_parser.py
@@ -214,3 +214,8 @@
_, loops = import_log(str(py.path.local(__file__).join('..',
'logtest.log')))
assert 'jge' in loops[0].operations[3].asm
+
+def test_import_log_2():
+ _, loops = import_log(str(py.path.local(__file__).join('..',
+ 'logtest2.log')))
+ xxx
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
