[pypy-svn] r64747 - in pypy/branch/pyjitpl5/pypy/jit/backend: . minimal minimal/test

[antocuni at codespeak.net]

Author: antocuni
Date: Mon Apr 27 21:05:16 2009
New Revision: 64747

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/minimal/runner.py
   pypy/branch/pyjitpl5/pypy/jit/backend/minimal/test/test_basic.py
   pypy/branch/pyjitpl5/pypy/jit/backend/model.py
Log:
implement oosend, by stealing the MethDescr from the llgraph backend



Modified: pypy/branch/pyjitpl5/pypy/jit/backend/minimal/runner.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/minimal/runner.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/minimal/runner.py	Mon Apr 27 21:05:16 2009
@@ -8,6 +8,7 @@
 from pypy.jit.metainterp import executor
 from pypy.jit.metainterp.resoperation import rop, opname
 from pypy.jit.backend import model
+from pypy.jit.backend.llgraph.runner import MethDescr
 
 DEBUG = False
 
@@ -500,6 +501,12 @@
         obj = sizedescr.alloc()
         return BoxObj(obj)
 
+    def do_oosend(self, args, descr=None):
+        assert isinstance(descr, MethDescr)
+        selfbox = args[0]
+        argboxes = args[1:]
+        return descr.callmeth(selfbox, argboxes)
+
 
 class SizeDescr(AbstractDescr):
     alloc = None
@@ -536,11 +543,8 @@
         self.call = call
         self.errbox = errbox
 
-class MethDescr(AbstractDescr):
 
-    def __init__(self, SELFTYPE, methname):
-        pass
-    
+
 # ____________________________________________________________
 
 

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/minimal/test/test_basic.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/minimal/test/test_basic.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/minimal/test/test_basic.py	Mon Apr 27 21:05:16 2009
@@ -23,12 +23,7 @@
 
 
 class TestOOtype(OOJitMixin, BasicTests):
-    def test_format(self):
-        py.test.skip('in-progress')
-
-    def test_bridge_from_interpreter_4(self):
-        py.test.skip('in-progress')
-
+    pass
 
 class TestLLtype(LLJitMixin, BasicTests):
     pass

Modified: pypy/branch/pyjitpl5/pypy/jit/backend/model.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/model.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/model.py	Mon Apr 27 21:05:16 2009
@@ -156,8 +156,8 @@
     # ootype specific operations
     # --------------------------
 
-    def do_runtimenew(cpu, args, descr=None):
+    def do_runtimenew(self, args, descr=None):
         raise NotImplementedError
 
-    def do_oosend(cpu, args, descr=None):
+    def do_oosend(self, args, descr=None):
         raise NotImplementedError