[pypy-commit] lang-smalltalk bitblt: Backed out changeset 29557f677cae

[timfel]

Author: Tim Felgentreff <timfelgentreff at gmail.com>
Branch: bitblt
Changeset: r199:632038529d5c
Date: 2013-03-18 10:38 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/632038529d5c/

Log:	Backed out changeset 29557f677cae

diff --git a/spyvm/primitives.py b/spyvm/primitives.py
--- a/spyvm/primitives.py
+++ b/spyvm/primitives.py
@@ -10,7 +10,10 @@
 from spyvm import wrapper
 
 from rpython.rlib import rarithmetic, rfloat, unroll, jit
-from rpython.rlib.rarithmetic import r_uint
+
+
+# for 32bit unwrap spec
+uint = object()
 
 
 def assert_bounds(n0, minimum, maximum):
@@ -98,9 +101,9 @@
                     w_arg = s_frame.peek(index)
                     if spec is int:
                         args += (interp.space.unwrap_int(w_arg), )
-                    elif spec is r_uint:
+                    elif spec is uint:
                         if isinstance(w_arg, model.W_SmallInteger):
-                            args += (r_uint(interp.space.unwrap_int(w_arg)), )
+                            args += (interp.space.unwrap_int(w_arg), )
                         else:
                             args += (interp.space.unwrap_uint(w_arg), )
                     elif spec is index1_0:
@@ -181,7 +184,7 @@
     }
 for (code,op) in bitwise_binary_ops.items():
     def make_func(op):
-        @expose_primitive(code, unwrap_spec=[r_uint, r_uint])
+        @expose_primitive(code, unwrap_spec=[uint, uint])
         def func(interp, s_frame, receiver, argument):
             res = abs(op(receiver, argument))
             return interp.space.wrap_uint(res)