[pypy-svn] r64709 - in pypy/branch/pyjitpl5/pypy/jit/backend/x86: . test

[arigo at codespeak.net]

Author: arigo
Date: Sun Apr 26 22:26:04 2009
New Revision: 64709

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/runner.py
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_regalloc.py
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_runner.py
Log:
Clean-ups.


Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/runner.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/runner.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/runner.py	Sun Apr 26 22:26:04 2009
@@ -11,7 +11,7 @@
 from pypy.jit.metainterp import history, codewriter
 from pypy.jit.metainterp.history import (ResOperation, Box, Const,
      ConstInt, ConstPtr, BoxInt, BoxPtr, ConstAddr, AbstractDescr)
-from pypy.jit.backend.x86.assembler import Assembler386, WORD
+from pypy.jit.backend.x86.assembler import Assembler386, WORD, MAX_FAIL_BOXES
 from pypy.jit.backend.x86 import symbolic
 from pypy.jit.metainterp.resoperation import rop, opname
 from pypy.jit.backend.x86.support import gc_malloc_fnaddr
@@ -177,8 +177,8 @@
 #                 self.caught_exception = e
 #             return self.assembler.generic_return_addr
 
-    def set_meta_interp(self, metainterp):
-        self.metainterp = metainterp
+#    def set_meta_interp(self, metainterp):
+#        self.metainterp = metainterp
 
     def get_exception(self):
         self.assembler.make_sure_mc_exists()
@@ -268,9 +268,11 @@
         return op
 
     def set_future_value_int(self, index, intvalue):
+        assert index < MAX_FAIL_BOXES, "overflow!"
         self.assembler.fail_boxes[index] = intvalue
 
     def set_future_value_ptr(self, index, ptrvalue):
+        assert index < MAX_FAIL_BOXES, "overflow!"
         self.keepalives.append(ptrvalue)
         intvalue = self.cast_gcref_to_int(ptrvalue)
         self.assembler.fail_boxes[index] = intvalue

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_regalloc.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_regalloc.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_regalloc.py	Sun Apr 26 22:26:04 2009
@@ -3,6 +3,7 @@
 """
 
 import py
+py.test.skip("Think about a nice way of doing stuff below")
 from pypy.jit.backend.x86.test.test_runner import FakeMetaInterp, FakeStats
 from pypy.jit.metainterp.history import ResOperation, BoxInt, ConstInt,\
      BoxPtr, ConstPtr
@@ -10,7 +11,6 @@
 from pypy.rpython.lltypesystem import lltype
 from pypy.jit.metainterp.resoperation import rop
 from pypy.rpython.lltypesystem import lltype, llmemory
-py.test.skip("Think about a nice way of doing stuff below")
 
 def test_simple_loop():
     meta_interp = FakeMetaInterp()

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_runner.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_runner.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/test/test_runner.py	Sun Apr 26 22:26:04 2009
@@ -15,9 +15,6 @@
 class FakeStats(object):
     pass
 
-class FakeMetaInterp(object):
-    pass
-
 # ____________________________________________________________
 
 class TestX86(BaseBackendTest):
@@ -27,7 +24,6 @@
     
     def setup_class(cls):
         cls.cpu = CPU(rtyper=None, stats=FakeStats())
-        cls.cpu.set_meta_interp(FakeMetaInterp())
 
     def test_int_binary_ops(self):
         for op, args, res in [
@@ -69,7 +65,6 @@
 
     def test_execute_operations_in_env(self):
         cpu = self.cpu
-        cpu.set_meta_interp(FakeMetaInterp())
         x = BoxInt(123)
         y = BoxInt(456)
         z = BoxInt(579)