[pypy-svn] r61790 - in pypy/branch/pyjitpl5/pypy/rpython: . lltypesystem

[arigo at codespeak.net]

Author: arigo
Date: Thu Feb 12 16:26:36 2009
New Revision: 61790

Modified:
   pypy/branch/pyjitpl5/pypy/rpython/llinterp.py
   pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py
   pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/opimpl.py
Log:
Move promote_virtualizable from llinterp.py to opimpl.py,
to make it runnable.


Modified: pypy/branch/pyjitpl5/pypy/rpython/llinterp.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/llinterp.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/llinterp.py	Thu Feb 12 16:26:36 2009
@@ -532,9 +532,6 @@
     def op_jit_marker(self, *args):
         pass
 
-    def op_promote_virtualizable(self, object, fieldname):
-        pass # XXX should do something
-
     def op_instrument_count(self, ll_tag, ll_label):
         pass # xxx for now
 

Modified: pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py	Thu Feb 12 16:26:36 2009
@@ -129,7 +129,10 @@
     def specialize_call(self, hop):
         op = self.instance    # the LLOp object that was called
         args_v = [hop.inputarg(r, i+1) for i, r in enumerate(hop.args_r[1:])]
-        hop.exception_is_here()
+        if op.canraise:
+            hop.exception_is_here()
+        else:
+            hop.exception_cannot_occur()
         return hop.genop(op.opname, args_v, resulttype=hop.r_result.lowleveltype)
 
 

Modified: pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/opimpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/opimpl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/opimpl.py	Thu Feb 12 16:26:36 2009
@@ -386,6 +386,9 @@
         print arg,
     print
 
+def op_promote_virtualizable(object, fieldname):
+    pass # XXX should do something
+
 # ____________________________________________________________
 
 def get_op_impl(opname):