[pypy-svn] r57563 - in pypy/branch/oo-jit/pypy: annotation jit/codegen/cli jit/timeshifter

[antocuni at codespeak.net]

Author: antocuni
Date: Thu Aug 21 18:16:43 2008
New Revision: 57563

Modified:
   pypy/branch/oo-jit/pypy/annotation/builtin.py
   pypy/branch/oo-jit/pypy/annotation/model.py
   pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/rcontainer.py
Log:
various rpython fixes, trying to translate targettiny2 -b cli --jit



Modified: pypy/branch/oo-jit/pypy/annotation/builtin.py
==============================================================================
--- pypy/branch/oo-jit/pypy/annotation/builtin.py	(original)
+++ pypy/branch/oo-jit/pypy/annotation/builtin.py	Thu Aug 21 18:16:43 2008
@@ -577,7 +577,7 @@
     if TYPE is ootype.Object:
         return SomeOOObject()
     elif TYPE is ootype.Class:
-        return SomeOOClass(TYPE)
+        return SomeOOClass(ootype.ROOT) # ???
     elif isinstance(TYPE, ootype.StaticMethod):
         return SomeOOStaticMeth(TYPE)
     elif isinstance(TYPE, ootype.OOType):

Modified: pypy/branch/oo-jit/pypy/annotation/model.py
==============================================================================
--- pypy/branch/oo-jit/pypy/annotation/model.py	(original)
+++ pypy/branch/oo-jit/pypy/annotation/model.py	Thu Aug 21 18:16:43 2008
@@ -596,6 +596,8 @@
     if isinstance(s_val, SomeOOStaticMeth):
         return s_val.ootype
     if isinstance(s_val, SomeOOClass):
+        return ootype.Class
+    if isinstance(s_val, SomeOOObject):
         return s_val.ootype
     if isinstance(s_val, SomeInteriorPtr):
         p = s_val.ll_ptrtype

Modified: pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py
==============================================================================
--- pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py	(original)
+++ pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py	Thu Aug 21 18:16:43 2008
@@ -169,7 +169,7 @@
         return cliobj.GetType()
 
     def getobj(self):
-        return self.obj
+        return dotnet.cast_to_native_object(self.obj)
 
     def load(self, meth):
         assert False, 'XXX'
@@ -343,6 +343,9 @@
         builder = graph.branches[0]
         return builder, graph.gv_entrypoint, graph.inputargs_gv[:]
 
+    def replay(self, label):
+        raise NotImplementedError
+
 
 class GraphInfo:
     def __init__(self):
@@ -621,6 +624,18 @@
         op = ops.SetField(self.meth, gv_obj, gv_value, fieldtoken)
         self.appendop(op)
 
+    def genop_oosend(self, methtoken, gv_self, args_gv):
+        raise NotImplementedError
+
+    def genop_oononnull(self, gv_obj):
+        raise NotImplementedError
+
+    def genop_ooisnull(self, gv_obj):
+        raise NotImplementedError
+
+    def genop_new(self, gv_obj):
+        raise NotImplementedError
+
     def enter_next_block(self, args_gv):
         seen = {}
         for i in range(len(args_gv)):

Modified: pypy/branch/oo-jit/pypy/jit/timeshifter/rcontainer.py
==============================================================================
--- pypy/branch/oo-jit/pypy/jit/timeshifter/rcontainer.py	(original)
+++ pypy/branch/oo-jit/pypy/jit/timeshifter/rcontainer.py	Thu Aug 21 18:16:43 2008
@@ -59,7 +59,7 @@
 class AbstractStructTypeDesc(object):
     __metaclass__ = cachedtype
 
-    VirtualStructCls = None # patched later with VirtualStruct
+    #VirtualStructCls = None # patched later with VirtualStruct
 
     _attrs_ =  """TYPE PTRTYPE name
                     firstsubstructdesc arrayfielddesc
@@ -79,7 +79,7 @@
     firstsubstructdesc = None
     materialize = None
     StructFieldDesc = None
-    PtrRedBox = None
+    #PtrRedBox = None
     firstfielddesc = 0
 
     def __init__(self, RGenOp, TYPE):
@@ -328,7 +328,7 @@
 
 class VirtualizableStructTypeDesc(StructTypeDesc):
 
-    VirtualStructCls = None # patched later with VirtualizableStruct
+    #VirtualStructCls = None # patched later with VirtualizableStruct
 
     _attrs_  =  """redirected_fielddescs
                    redirected
@@ -648,7 +648,7 @@
     __metaclass__ = cachedtype
     _attrs_ = 'structdesc'
 
-    PtrRedBox = None
+    #PtrRedBox = None
     allow_void = False
     virtualizable = False
     gv_default = None