Author: Justin Peel <notmuchtot...@gmail.com>
Branch: unsigned-dtypes
Changeset: r47600:7b5c3d57022c
Date: 2011-09-25 19:05 +0000
http://bitbucket.org/pypy/pypy/changeset/7b5c3d57022c/
Log: fix ullong mod and floordiv, also fix a jit test
diff --git a/pypy/jit/codewriter/support.py b/pypy/jit/codewriter/support.py
--- a/pypy/jit/codewriter/support.py
+++ b/pypy/jit/codewriter/support.py
@@ -363,20 +363,20 @@
return llop.llong_mod(lltype.SignedLongLong, xll, yll)
def _ll_2_ullong_floordiv(xll, yll):
- return llop.ullong_floordiv(lltype.SignedLongLong, xll, yll)
+ return llop.ullong_floordiv(lltype.UnsignedLongLong, xll, yll)
def _ll_2_ullong_floordiv_zer(xll, yll):
if yll == 0:
raise ZeroDivisionError
- return llop.ullong_floordiv(lltype.SignedLongLong, xll, yll)
+ return llop.ullong_floordiv(lltype.UnsignedLongLong, xll, yll)
def _ll_2_ullong_mod(xll, yll):
- return llop.ullong_mod(lltype.SignedLongLong, xll, yll)
+ return llop.ullong_mod(lltype.UnsignedLongLong, xll, yll)
def _ll_2_ullong_mod_zer(xll, yll):
if yll == 0:
raise ZeroDivisionError
- return llop.ullong_mod(lltype.SignedLongLong, xll, yll)
+ return llop.ullong_mod(lltype.UnsignedLongLong, xll, yll)
def _ll_2_uint_mod(xll, yll):
return llop.uint_mod(lltype.Unsigned, xll, yll)
diff --git a/pypy/jit/metainterp/test/test_ajit.py
b/pypy/jit/metainterp/test/test_ajit.py
--- a/pypy/jit/metainterp/test/test_ajit.py
+++ b/pypy/jit/metainterp/test/test_ajit.py
@@ -2957,7 +2957,7 @@
self.check_loops(arraylen_gc=2)
def test_ulonglong_mod(self):
- myjitdriver = JitDriver(greens = [], reds = ['sa', 'n', 'i'])
+ myjitdriver = JitDriver(greens = [], reds = ['n', 'sa', 'i'])
def f(n):
sa = i = rffi.cast(rffi.ULONGLONG, 1)
while i < rffi.cast(rffi.ULONGLONG, n):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
