Author: Richard Plangger <[email protected]>
Branch: jitlog-32bit
Changeset: r85860:793961128c70
Date: 2016-07-25 17:49 +0200
http://bitbucket.org/pypy/pypy/changeset/793961128c70/
Log: include information in the log if a 32bit machine wrote the log
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
@@ -1,6 +1,5 @@
import py
import sys
-import sys
import weakref
import struct
import os
@@ -281,8 +280,11 @@
def assemble_header():
version = JITLOG_VERSION_16BIT_LE
count = len(resoperations.opname)
+ is_32bit = chr(0x1)
+ if not IS_32_BIT:
+ is_32bit = chr(0x0)
content = [version, MARK_RESOP_META,
- encode_le_16bit(count)]
+ is_32bit, 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
@@ -55,6 +55,7 @@
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(0) + \
jl.encode_str('loop') + jl.encode_le_addr(0) + \
(jl.MARK_TRACE) + jl.encode_le_addr(0) + \
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
