[pypy-commit] pypy result-in-resops: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: result-in-resops
Changeset: r58372:2ec90c4840d4
Date: 2012-10-22 19:12 +0200
http://bitbucket.org/pypy/pypy/changeset/2ec90c4840d4/

Log:	merge

diff --git a/pypy/jit/backend/test/runner_test.py b/pypy/jit/backend/test/runner_test.py
--- a/pypy/jit/backend/test/runner_test.py
+++ b/pypy/jit/backend/test/runner_test.py
@@ -7,7 +7,7 @@
      create_resop, ConstInt, ConstPtr, ConstFloat, create_resop_2,\
      create_resop_1, create_resop_0, INT, REF, FLOAT, example_for_opnum
 from pypy.jit.metainterp.test.support import boxint, boxfloat,\
-     boxlonglong_on_32bit, boxptr, constfloat, boxlonglong
+     boxlonglong_on_32bit, boxptr, constfloat
 from pypy.jit.metainterp.typesystem import deref
 from pypy.jit.codewriter.effectinfo import EffectInfo
 from pypy.rpython.lltypesystem import lltype, llmemory, rstr, rffi, rclass
@@ -1797,16 +1797,18 @@
     def test_convert_float_bytes(self):
         if not self.cpu.supports_floats:
             py.test.skip("requires floats")
-        #if not self.cpu.supports_longlong:
-        #    py.test.skip("longlong test")
         box = boxfloat(2.5)
         t = 'int' if longlong.is_64_bit else 'float'
         res = self.execute_operation(rop.CONVERT_FLOAT_BYTES_TO_LONGLONG,
                                      [box], t)
-        assert res == 2.5
+        assert longlong.longlong2floatstorage(res) == 2.5
 
+        if longlong.is_64_bit:
+            box = boxint(res)
+        else:
+            box = boxfloat(res)
         res = self.execute_operation(rop.CONVERT_LONGLONG_BYTES_TO_FLOAT,
-                                     [boxlonglong(res)], 'float')
+                                     [box], 'float')
         assert res == 2.5
 
     def test_ooops_non_gc(self):
diff --git a/pypy/jit/metainterp/test/support.py b/pypy/jit/metainterp/test/support.py
--- a/pypy/jit/metainterp/test/support.py
+++ b/pypy/jit/metainterp/test/support.py
@@ -29,12 +29,6 @@
 def constfloat(x):
     return ConstFloat(longlong.getfloatstorage(x))
 
-def boxlonglong(ll):
-    if longlong.is_64_bit:
-        return boxint(ll)
-    else:
-        return boxfloat(ll)
-
 def _get_jitcodes(testself, CPUClass, func, values, type_system,
                   supports_longlong=False, translationoptions={}, **kwds):
     from pypy.jit.codewriter import support