[pypy-svn] r66099 - pypy/branch/pyjitpl5/pypy/translator/jvm

[cfbolz at codespeak.net]

Author: cfbolz
Date: Fri Jul  3 14:15:10 2009
New Revision: 66099

Modified:
   pypy/branch/pyjitpl5/pypy/translator/jvm/database.py
   pypy/branch/pyjitpl5/pypy/translator/jvm/opcodes.py
Log:
(pedronis, cfbolz): fix the JVM backend


Modified: pypy/branch/pyjitpl5/pypy/translator/jvm/database.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/translator/jvm/database.py	(original)
+++ pypy/branch/pyjitpl5/pypy/translator/jvm/database.py	Fri Jul  3 14:15:10 2009
@@ -464,6 +464,8 @@
             return self._translate_record(OOT)
         if isinstance(OOT, ootype.StaticMethod):
             return self.record_delegate(OOT)
+        if OOT is ootype.Object:
+            return jvm.jObject
 
         assert False, "Untranslatable type %s!" % OOT
 

Modified: pypy/branch/pyjitpl5/pypy/translator/jvm/opcodes.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/translator/jvm/opcodes.py	(original)
+++ pypy/branch/pyjitpl5/pypy/translator/jvm/opcodes.py	Fri Jul  3 14:15:10 2009
@@ -77,6 +77,8 @@
     'oosend':                   [JvmCallMethod, StoreResult],
     'ooupcast':                 DoNothing,
     'oodowncast':               [DownCast, StoreResult],
+    'cast_to_object':           DoNothing,
+    'cast_from_object':         [DownCast, StoreResult],
     'instanceof':               [CastTo, StoreResult],
     'subclassof':               [PushAllArgs, jvm.SWAP, jvm.CLASSISASSIGNABLEFROM, StoreResult],
     'classof':                  [PushAllArgs, jvm.OBJECTGETCLASS, StoreResult],