[pypy-svn] r74874 - in pypy/branch/blackhole-improvement/pypy/jit: backend/llsupport backend/test metainterp/test

[arigo at codespeak.net]

Author: arigo
Date: Fri May 28 21:29:42 2010
New Revision: 74874

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/backend/llsupport/llmodel.py
   pypy/branch/blackhole-improvement/pypy/jit/backend/test/runner_test.py
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_blackhole.py
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_resume.py
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_warmspot.py
Log:
Test fixes.


Modified: pypy/branch/blackhole-improvement/pypy/jit/backend/llsupport/llmodel.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/backend/llsupport/llmodel.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/backend/llsupport/llmodel.py	Fri May 28 21:29:42 2010
@@ -461,5 +461,5 @@
             calldescr.verify_types(args_i, args_r, args_f, 'void')
         return calldescr.call_stub(func, args_i, args_r, args_f)
 
-    def do_cast_ptr_to_int(self, ptrbox):
-        return BoxInt(self.cast_gcref_to_int(ptrbox.getref_base()))
+    def bh_cast_ptr_to_int(self, ptr):
+        return self.cast_gcref_to_int(ptr)

Modified: pypy/branch/blackhole-improvement/pypy/jit/backend/test/runner_test.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/backend/test/runner_test.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/backend/test/runner_test.py	Fri May 28 21:29:42 2010
@@ -1662,7 +1662,8 @@
         #
         x = cpu.bh_newstr(5)
         y = cpu.bh_cast_ptr_to_int(x)
-        assert y == llmemory.cast_adr_to_int(llmemory.cast_ptr_to_adr(x))
+        z = cpu.bh_cast_ptr_to_int(x)
+        assert type(y) == type(z) == int and y == z
 
     def test_sorting_of_fields(self):
         S = self.S

Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_blackhole.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_blackhole.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_blackhole.py	Fri May 28 21:29:42 2010
@@ -130,6 +130,7 @@
                 def end_blackhole(): pass
             class DoneWithThisFrameInt(Exception):
                 pass
+        last_exc_value_box = None
         framestack = [MyMIFrame()]
     MyMetaInterp.staticdata.blackholeinterpbuilder = getblackholeinterp(
         {'int_add/ii>i': 0, 'int_return/i': 1}).builder

Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_resume.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_resume.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_resume.py	Fri May 28 21:29:42 2010
@@ -103,7 +103,8 @@
 
     def get_current_position_info(self):
         class MyInfo:
-            def enumerate_vars(_, callback_i, callback_r, callback_f):
+            @staticmethod
+            def enumerate_vars(callback_i, callback_r, callback_f, _):
                 count_i = count_r = count_f = 0
                 for index, ARG in enumerate(self.ARGS):
                     if ARG == lltype.Signed:
@@ -210,7 +211,7 @@
         _already_allocated_resume_virtuals = None
         cpu = None
     reader = ResumeDataDirectReader(None, FakeStorage())
-    assert reader.virtuals == ["allocated", None]
+    assert reader.virtuals == ["allocated", reader.virtual_default]
 
 # ____________________________________________________________
 
@@ -835,7 +836,8 @@
             def __eq__(self, other):
                 return True
         class MyInfo:
-            def enumerate_vars(_, callback_i, callback_r, callback_f):
+            @staticmethod
+            def enumerate_vars(callback_i, callback_r, callback_f, _):
                 for index, tagged in enumerate(self.cur_numb.nums):
                     box = self.decode_box(tagged, Whatever())
                     if box.type == INT:

Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_warmspot.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_warmspot.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_warmspot.py	Fri May 28 21:29:42 2010
@@ -313,6 +313,9 @@
                         lltype.cast_opaque_ptr(llmemory.GCREF, exc))
                 return self.no
 
+        class FakeDescr:
+            pass
+
         class FakeCPU(object):
             supports_floats = False
             ts = llhelper
@@ -326,7 +329,7 @@
                 pass
 
             def nodescr(self, *args, **kwds):
-                return "this is a descr"
+                return FakeDescr()
             fielddescrof = nodescr
             calldescrof  = nodescr
             sizeof       = nodescr