Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r60481:4a98ccf02e16
Date: 2013-01-25 21:25 +0200
http://bitbucket.org/pypy/pypy/changeset/4a98ccf02e16/
Log: small fixes
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
@@ -365,7 +365,7 @@
m = re.search('has address ([-\da-f]+)', entry)
addr = int(m.group(1), 16)
entry = entry.lower()
- m = re.search('guard \d+', entry)
+ m = re.search('guard [\da-f]+', entry)
name = m.group(0)
else:
name = entry[:entry.find('(') - 1].lower()
@@ -388,8 +388,8 @@
comm = loop.comment
comm = comm.lower()
if comm.startswith('# bridge'):
- m = re.search('guard \d+', comm)
- name = m.group(0)
+ m = re.search('guard (\d+)', comm)
+ name = 'guard ' + hex(int(m.group(1)))[2:]
elif "(" in comm:
name = comm[2:comm.find('(')-1]
else:
@@ -437,3 +437,7 @@
if line:
num, count = line.split(':', 2)
mapping[num].count = int(count)
+
+if __name__ == '__main__':
+ import_log(sys.argv[1])
+
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -527,7 +527,6 @@
rgc._make_sure_does_not_move(lltype.cast_opaque_ptr(llmemory.GCREF,
clt.frame_info))
looppos = self.mc.get_relative_pos()
- looptoken._x86_loop_code = looppos
frame_depth = self._assemble(regalloc, inputargs, operations)
self.update_frame_depth(frame_depth + JITFRAME_FIXED_SIZE)
#
@@ -536,6 +535,7 @@
full_size = self.mc.get_relative_pos()
#
rawstart = self.materialize_loop(looptoken)
+ looptoken._x86_loop_code = looppos + rawstart
debug_start("jit-backend-addr")
debug_print("Loop %d (%s) has address %x to %x (bootstrap %x)" % (
looptoken.number, loopname,
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
