Author: Tim Felgentreff <[email protected]>
Branch: bitblt
Changeset: r198:29557f677cae
Date: 2013-03-18 10:03 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/29557f677cae/
Log: use r_uint
diff --git a/spyvm/primitives.py b/spyvm/primitives.py
--- a/spyvm/primitives.py
+++ b/spyvm/primitives.py
@@ -10,10 +10,7 @@
from spyvm import wrapper
from rpython.rlib import rarithmetic, rfloat, unroll, jit
-
-
-# for 32bit unwrap spec
-uint = object()
+from rpython.rlib.rarithmetic import r_uint
def assert_bounds(n0, minimum, maximum):
@@ -101,9 +98,9 @@
w_arg = s_frame.peek(index)
if spec is int:
args += (interp.space.unwrap_int(w_arg), )
- elif spec is uint:
+ elif spec is r_uint:
if isinstance(w_arg, model.W_SmallInteger):
- args += (interp.space.unwrap_int(w_arg), )
+ args += (r_uint(interp.space.unwrap_int(w_arg)), )
else:
args += (interp.space.unwrap_uint(w_arg), )
elif spec is index1_0:
@@ -184,7 +181,7 @@
}
for (code,op) in bitwise_binary_ops.items():
def make_func(op):
- @expose_primitive(code, unwrap_spec=[uint, uint])
+ @expose_primitive(code, unwrap_spec=[r_uint, r_uint])
def func(interp, s_frame, receiver, argument):
res = abs(op(receiver, argument))
return interp.space.wrap_uint(res)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
