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

[arigo at codespeak.net]

Author: arigo
Date: Wed May  6 18:06:18 2009
New Revision: 65113

Modified:
   pypy/branch/pyjitpl5/pypy/rpython/llinterp.py
   pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/opimpl.py
Log:
Kill from llinterp operations that no longer exist.
Move op_cast_adr_to_int to llinterp.  This makes
test_lloperation happy again.


Modified: pypy/branch/pyjitpl5/pypy/rpython/llinterp.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/llinterp.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/llinterp.py	Wed May  6 18:06:18 2009
@@ -800,6 +800,10 @@
         checkptr(ptr)
         return llmemory.cast_ptr_to_adr(ptr)
 
+    def op_cast_adr_to_int(self, adr):
+        checkadr(addr) 
+        return llmemory.cast_adr_to_int(adr)
+
     def op_weakref_create(self, v_obj):
         def objgetter():    # special support for gcwrapper.py
             return self.getval(v_obj)
@@ -1010,14 +1014,6 @@
         except OverflowError:
             self.make_llexception()
 
-    def op_int_lshift_ovf_val(self, x, y):
-        assert isinstance(x, int)
-        assert isinstance(y, int)
-        try:
-            return ovfcheck_lshift(x, y)
-        except (OverflowError, ValueError):
-            self.make_llexception()
-
     def _makefunc2(fn, operator, xtype, ytype=None):
         import sys
         d = sys._getframe(1).f_locals
@@ -1062,23 +1058,15 @@
     _makefunc2('op_int_mod_ovf',          '%',  'int')
     _makefunc2('op_int_mod_zer',          '%',  'int')
     _makefunc2('op_int_mod_ovf_zer',      '%',  'int')
-    _makefunc2('op_int_lshift_val',       '<<', 'int')
-    _makefunc2('op_int_rshift_val',       '>>', 'int')
 
     _makefunc2('op_uint_floordiv_zer',    '//', 'r_uint')
     _makefunc2('op_uint_mod_zer',         '%',  'r_uint')
-    _makefunc2('op_uint_lshift_val',      '<<', 'r_uint')
-    _makefunc2('op_uint_rshift_val',      '>>', 'r_uint')
 
     _makefunc2('op_llong_floordiv_zer',   '//', 'r_longlong')
     _makefunc2('op_llong_mod_zer',        '%',  'r_longlong')
-    _makefunc2('op_llong_lshift_val',     '<<', 'r_longlong')
-    _makefunc2('op_llong_rshift_val',     '>>', 'r_longlong')
 
     _makefunc2('op_ullong_floordiv_zer',  '//', 'r_ulonglong')
     _makefunc2('op_ullong_mod_zer',       '%',  'r_ulonglong')
-    _makefunc2('op_ullong_lshift_val',    '<<', 'r_ulonglong')
-    _makefunc2('op_ullong_rshift_val',    '>>', 'r_ulonglong')
 
     def op_int_add_nonneg_ovf(self, x, y):
         if isinstance(y, int):

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	Wed May  6 18:06:18 2009
@@ -301,10 +301,6 @@
     return llmemory.cast_adr_to_ptr(adr, TYPE)
 op_cast_adr_to_ptr.need_result_type = True
 
-def op_cast_adr_to_int(adr):
-    checkadr(adr)
-    return llmemory.cast_adr_to_int(adr)
-
 def op_cast_int_to_adr(int):
     return llmemory.cast_int_to_adr(int)