[pypy-svn] r65109 - in pypy/branch/pyjitpl5/pypy/jit: backend/llgraph metainterp/test

[antocuni at codespeak.net]

Author: antocuni
Date: Wed May  6 17:49:15 2009
New Revision: 65109

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/llimpl.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py
Log:
fix more tests


Modified: pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/llimpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/llimpl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/llimpl.py	Wed May  6 17:49:15 2009
@@ -93,6 +93,7 @@
     'ooisnull'        : (('ptr',), 'bool'),
     'oois'            : (('ptr', 'ptr'), 'bool'),
     'ooisnot'         : (('ptr', 'ptr'), 'bool'),
+    'instanceof'      : (('ptr',), 'bool'),
     'setfield_gc'     : (('ptr', 'intorptr'), None),
     'getfield_gc'     : (('ptr',), 'intorptr'),
     'getfield_gc_pure': (('ptr',), 'intorptr'),
@@ -768,6 +769,10 @@
         if ootype.classof(value) is not expected_class:
             raise GuardFailed
 
+    def op_instanceof(self, typedescr, obj):
+        inst = ootype.cast_from_object(ootype.ROOT, obj)
+        return ootype.instanceof(inst, typedescr.TYPE)
+
     def _cast_exception(self, exception):
         return ootype.cast_from_object(ootype.Class, exception)
 

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py	Wed May  6 17:49:15 2009
@@ -615,10 +615,7 @@
     def skip(self):
         py.test.skip('in-progress')
 
-    test_virtual_on_virtualizable = skip
-    test_no_virtual_on_virtualizable = skip
     test_virtualizable_hierarchy = skip
-    test_non_virtual_on_always_virtual = skip
     test_external_pass = skip
     test_pass_always_virtual_to_bridge = skip