[pypy-commit] pypy optresult: fix test_w*

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult
Changeset: r77851:dfd8a770d2a0
Date: 2015-06-04 12:05 +0200
http://bitbucket.org/pypy/pypy/changeset/dfd8a770d2a0/

Log:	fix test_w*

diff --git a/rpython/jit/metainterp/test/test_warmstate.py b/rpython/jit/metainterp/test/test_warmstate.py
--- a/rpython/jit/metainterp/test/test_warmstate.py
+++ b/rpython/jit/metainterp/test/test_warmstate.py
@@ -4,14 +4,15 @@
 from rpython.jit.metainterp.warmstate import wrap, unwrap, specialize_value
 from rpython.jit.metainterp.warmstate import equal_whatever, hash_whatever
 from rpython.jit.metainterp.warmstate import WarmEnterState
-from rpython.jit.metainterp.history import BoxInt, BoxFloat, BoxPtr
+from rpython.jit.metainterp.resoperation import InputArgInt, InputArgRef,\
+     InputArgFloat
 from rpython.jit.metainterp.history import ConstInt, ConstFloat, ConstPtr
 from rpython.jit.metainterp.counter import DeterministicJitCounter
 from rpython.jit.codewriter import longlong
 from rpython.rlib.rarithmetic import r_singlefloat
 
 def boxfloat(x):
-    return BoxFloat(longlong.getfloatstorage(x))
+    return InputArgFloat(longlong.getfloatstorage(x))
 
 def constfloat(x):
     return ConstFloat(longlong.getfloatstorage(x))
@@ -22,22 +23,22 @@
     RS = lltype.Struct('S')
     p = lltype.malloc(S)
     po = lltype.cast_opaque_ptr(llmemory.GCREF, p)
-    assert unwrap(lltype.Void, BoxInt(42)) is None
-    assert unwrap(lltype.Signed, BoxInt(42)) == 42
-    assert unwrap(lltype.Char, BoxInt(42)) == chr(42)
+    assert unwrap(lltype.Void, InputArgInt(42)) is None
+    assert unwrap(lltype.Signed, InputArgInt(42)) == 42
+    assert unwrap(lltype.Char, InputArgInt(42)) == chr(42)
     assert unwrap(lltype.Float, boxfloat(42.5)) == 42.5
-    assert unwrap(lltype.Ptr(S), BoxPtr(po)) == p
-    assert unwrap(lltype.Ptr(RS), BoxInt(0)) == lltype.nullptr(RS)
+    assert unwrap(lltype.Ptr(S), InputArgRef(po)) == p
+    assert unwrap(lltype.Ptr(RS), InputArgInt(0)) == lltype.nullptr(RS)
 
 def test_wrap():
     def _is(box1, box2):
         return (box1.__class__ == box2.__class__ and
-                box1.value == box2.value)
+                box1.getvalue() == box2.getvalue())
     p = lltype.malloc(lltype.GcStruct('S'))
     po = lltype.cast_opaque_ptr(llmemory.GCREF, p)
-    assert _is(wrap(None, 42), BoxInt(42))
+    assert _is(wrap(None, 42), InputArgInt(42))
     assert _is(wrap(None, 42.5), boxfloat(42.5))
-    assert _is(wrap(None, p), BoxPtr(po))
+    assert _is(wrap(None, p), InputArgRef(po))
     assert _is(wrap(None, 42, in_const_box=True), ConstInt(42))
     assert _is(wrap(None, 42.5, in_const_box=True), constfloat(42.5))
     assert _is(wrap(None, p, in_const_box=True), ConstPtr(po))
@@ -45,13 +46,13 @@
         import sys
         from rpython.rlib.rarithmetic import r_longlong, r_ulonglong
         value = r_longlong(-sys.maxint*17)
-        assert _is(wrap(None, value), BoxFloat(value))
+        assert _is(wrap(None, value), InputArgFloat(value))
         assert _is(wrap(None, value, in_const_box=True), ConstFloat(value))
         value_unsigned = r_ulonglong(-sys.maxint*17)
-        assert _is(wrap(None, value_unsigned), BoxFloat(value))
+        assert _is(wrap(None, value_unsigned), InputArgFloat(value))
     sfval = r_singlefloat(42.5)
     ival = longlong.singlefloat2int(sfval)
-    assert _is(wrap(None, sfval), BoxInt(ival))
+    assert _is(wrap(None, sfval), InputArgInt(ival))
     assert _is(wrap(None, sfval, in_const_box=True), ConstInt(ival))
 
 def test_specialize_value():
diff --git a/rpython/jit/metainterp/warmstate.py b/rpython/jit/metainterp/warmstate.py
--- a/rpython/jit/metainterp/warmstate.py
+++ b/rpython/jit/metainterp/warmstate.py
@@ -59,7 +59,8 @@
         if TYPE.TO._gckind == "gc":
             return box.getref(TYPE)
         else:
-            return llmemory.cast_adr_to_ptr(box.getaddr(), TYPE)
+            adr = heaptracker.int2adr(box.getint())
+            return llmemory.cast_adr_to_ptr(adr, TYPE)
     if TYPE == lltype.Float:
         return box.getfloat()
     else: