Author: Richard Plangger <planri...@gmail.com>
Branch: jitlog-32bit
Changeset: r85871:a15583f4da0f
Date: 2016-07-26 13:06 +0200
http://bitbucket.org/pypy/pypy/changeset/a15583f4da0f/
Log: catchup default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -97,3 +97,7 @@
.. branch: new-jit-log
The new logging facility that integrates with and adds features to vmprof.com.
+
+.. branch: jitlog-32bit
+
+Resolve issues to use the new logging facility on a 32bit system
diff --git a/pypy/module/_jitlog/test/test__jitlog.py
b/pypy/module/_jitlog/test/test__jitlog.py
--- a/pypy/module/_jitlog/test/test__jitlog.py
+++ b/pypy/module/_jitlog/test/test__jitlog.py
@@ -1,4 +1,5 @@
+import sys
from rpython.tool.udir import udir
from pypy.tool.pytest.objspace import gettestobjspace
from rpython.rlib.rjitlog import rjitlog as jl
@@ -10,6 +11,7 @@
cls.w_tmpfilename = cls.space.wrap(str(udir.join('test__jitlog.1')))
cls.w_mark_header = cls.space.wrap(jl.MARK_JITLOG_HEADER)
cls.w_version = cls.space.wrap(jl.JITLOG_VERSION_16BIT_LE)
+ cls.w_is_32bit = cls.space.wrap(sys.maxint == 2**31-1)
def test_enable(self):
import _jitlog, struct
@@ -22,6 +24,7 @@
with open(self.tmpfilename, 'rb') as fd:
assert fd.read(1) == self.mark_header
assert fd.read(2) == self.version
+ assert bool(ord(fd.read(1))) == self.is_32bit
count, = struct.unpack('<h', fd.read(2))
for i in range(count):
opnum = struct.unpack('<h', fd.read(2))
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
@@ -288,8 +288,8 @@
is_32bit = chr(0x1)
if not IS_32_BIT:
is_32bit = chr(0x0)
- content = [version, MARK_RESOP_META,
- is_32bit, encode_le_16bit(count)]
+ content = [version, is_32bit, MARK_RESOP_META,
+ encode_le_16bit(count)]
for opnum, opname in resoperations.opname.items():
content.append(encode_le_16bit(opnum))
content.append(encode_str(opname.lower()))
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
@@ -1,4 +1,5 @@
import py
+import sys
from rpython.jit.tool.oparser import pure_parse
from rpython.jit.metainterp.optimizeopt.util import equaloplists
from rpython.jit.metainterp.resoperation import ResOperation, rop
@@ -51,9 +52,8 @@
log_trace = logger.log_trace(jl.MARK_TRACE, None, None)
op = ResOperation(rop.DEBUG_MERGE_POINT, [ConstInt(0), ConstInt(0),
ConstInt(0)])
log_trace.write([], [op])
- #the next line will close 'fd'
+ #the next line will close 'fd', instead of logger.finish()
fd.close()
- logger.finish()
binary = file.read()
is_32bit = chr(sys.maxint == 2**31-1)
assert binary == (jl.MARK_START_TRACE) + jl.encode_le_addr(1) + \
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
