[pypy-svn] r22614 - pypy/dist/pypy/rpython

arigo at codespeak.net arigo at codespeak.net
Tue Jan 24 18:19:00 CET 2006


Author: arigo
Date: Tue Jan 24 18:18:59 2006
New Revision: 22614

Modified:
   pypy/dist/pypy/rpython/llinterp.py
Log:
ImportError in the llinterp.


Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py	(original)
+++ pypy/dist/pypy/rpython/llinterp.py	Tue Jan 24 18:18:59 2006
@@ -665,11 +665,19 @@
     op_original_int_add = op_int_add
 
     def op_int_add(self, x, y):
-        if isinstance(x, llmemory.OffsetOf):
+        if isinstance(x, llmemory.AddressOffset):
             return x + y
         else:
             return self.op_original_int_add(x, y)
-    
+
+    op_original_int_mul = op_int_mul
+
+    def op_int_mul(self, x, y):
+        if isinstance(x, llmemory.AddressOffset):
+            return x * y
+        else:
+            return self.op_original_int_mul(x, y)
+
     def op_unichar_eq(self, x, y):
         assert isinstance(x, unicode) and len(x) == 1
         assert isinstance(y, unicode) and len(y) == 1



More information about the Pypy-commit mailing list