Author: Matti Picus <[email protected]>
Branch: win32-fixes4
Changeset: r70201:dec6e4c4c504
Date: 2014-03-23 16:19 +0200
http://bitbucket.org/pypy/pypy/changeset/dec6e4c4c504/
Log: merge default into branch
diff --git a/rpython/jit/backend/llsupport/test/test_rewrite.py
b/rpython/jit/backend/llsupport/test/test_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_rewrite.py
@@ -528,11 +528,6 @@
""")
def test_rewrite_assembler_newstr_newunicode(self):
- import sys
- if sys.platform == 'win32':
- unicode_size = 2
- else:
- unicode_size = 4
self.check_rewrite("""
[i2]
p0 = newstr(14)
@@ -543,21 +538,21 @@
""", """
[i2]
p0 = call_malloc_nursery( \
- %%(strdescr.basesize + 16 * strdescr.itemsize + \
+ %(strdescr.basesize + 16 * strdescr.itemsize + \
unicodedescr.basesize + 10 * unicodedescr.itemsize)d)
- setfield_gc(p0, %%(strdescr.tid)d, descr=tiddescr)
+ setfield_gc(p0, %(strdescr.tid)d, descr=tiddescr)
setfield_gc(p0, 14, descr=strlendescr)
- p1 = int_add(p0, %%(strdescr.basesize + 16 * strdescr.itemsize)d)
- setfield_gc(p1, %%(unicodedescr.tid)d, descr=tiddescr)
+ p1 = int_add(p0, %(strdescr.basesize + 16 * strdescr.itemsize)d)
+ setfield_gc(p1, %(unicodedescr.tid)d, descr=tiddescr)
setfield_gc(p1, 10, descr=unicodelendescr)
- p2 = call_malloc_nursery_varsize(2, %d, i2, \
+ p2 = call_malloc_nursery_varsize(2, %(unicodedescr.itemsize)d, i2,\
descr=unicodedescr)
setfield_gc(p2, i2, descr=unicodelendescr)
p3 = call_malloc_nursery_varsize(1, 1, i2, \
descr=strdescr)
setfield_gc(p3, i2, descr=strlendescr)
jump()
- """ % unicode_size)
+ """)
def test_write_barrier_before_setfield_gc(self):
self.check_rewrite("""
diff --git a/rpython/jit/metainterp/history.py
b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -108,6 +108,7 @@
raise NotImplementedError
def getaddr(self):
+ "Only for raw addresses (BoxInt & ConstInt), not for GC addresses"
raise NotImplementedError
def sort_key(self):
@@ -321,9 +322,6 @@
else:
return 0
- def getaddr(self):
- return llmemory.cast_ptr_to_adr(self.value)
-
def same_constant(self, other):
if isinstance(other, ConstPtr):
return self.value == other.value
@@ -494,9 +492,6 @@
return lltype.cast_opaque_ptr(PTR, self.getref_base())
getref._annspecialcase_ = 'specialize:arg(1)'
- def getaddr(self):
- return llmemory.cast_ptr_to_adr(self.value)
-
def _get_hash_(self):
if self.value:
return lltype.identityhash(self.value)
diff --git a/rpython/jit/metainterp/optimizeopt/util.py
b/rpython/jit/metainterp/optimizeopt/util.py
--- a/rpython/jit/metainterp/optimizeopt/util.py
+++ b/rpython/jit/metainterp/optimizeopt/util.py
@@ -139,7 +139,13 @@
txt1 = str(op1)
txt2 = str(op2)
while txt1 or txt2:
- print '%s| %s' % (txt1[:width].ljust(width), txt2[:width])
+ part1 = txt1[:width]
+ part2 = txt2[:width]
+ if part1 == part2:
+ sep = '| '
+ else:
+ sep = '<>'
+ print '%s%s%s' % (part1.ljust(width), sep, part2)
txt1 = txt1[width:]
txt2 = txt2[width:]
print '-' * totwidth
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
