Author: Richard Plangger <planri...@gmail.com>
Branch:
Changeset: r85858:ad3052f353ad
Date: 2016-07-25 17:40 +0200
http://bitbucket.org/pypy/pypy/changeset/ad3052f353ad/
Log: undo trace_id increment & align to MARK_START_TRACE
diff --git a/rpython/rlib/rjitlog/rjitlog.py b/rpython/rlib/rjitlog/rjitlog.py
--- a/rpython/rlib/rjitlog/rjitlog.py
+++ b/rpython/rlib/rjitlog/rjitlog.py
@@ -340,7 +340,7 @@
def trace_aborted(self):
if not jitlog_enabled():
return
- self._write_marked(MARK_ABORT_TRACE, encode_le_64bit(self.trace_id))
+ self._write_marked(MARK_ABORT_TRACE, encode_le_addr(self.trace_id))
def _write_marked(self, mark, line):
if not we_are_translated():
diff --git a/rpython/rlib/rjitlog/test/test_jitlog.py
b/rpython/rlib/rjitlog/test/test_jitlog.py
--- a/rpython/rlib/rjitlog/test/test_jitlog.py
+++ b/rpython/rlib/rjitlog/test/test_jitlog.py
@@ -55,9 +55,9 @@
fd.close()
logger.finish()
binary = file.read()
- assert binary == (jl.MARK_START_TRACE) + jl.encode_le_addr(1) + \
+ assert binary == (jl.MARK_START_TRACE) + jl.encode_le_addr(0) + \
jl.encode_str('loop') + jl.encode_le_addr(0) + \
- (jl.MARK_TRACE) + jl.encode_le_64bit(1) + \
+ (jl.MARK_TRACE) + jl.encode_le_addr(0) + \
(jl.MARK_INPUT_ARGS) + jl.encode_str('') + \
(jl.MARK_INIT_MERGE_POINT) +
b'\x05\x00\x01s\x00i\x08s\x00i\x10s' + \
(jl.MARK_MERGE_POINT) + \
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
