Author: Maciej Fijalkowski <fij...@gmail.com> Branch: Changeset: r74041:d329a23cdfc6 Date: 2014-10-21 16:24 +0200 http://bitbucket.org/pypy/pypy/changeset/d329a23cdfc6/
Log: merge diff --git a/pypy/doc/cppyy.rst b/pypy/doc/cppyy.rst --- a/pypy/doc/cppyy.rst +++ b/pypy/doc/cppyy.rst @@ -83,7 +83,7 @@ the selection of scientific software) will also work for a build with the builtin backend. -.. _`download`: http://cern.ch/wlav/reflex-2013-08-14.tar.bz2 +.. _`download`: http://cern.ch/wlav/reflex-2014-10-20.tar.bz2 .. _`ROOT`: http://root.cern.ch/ Besides Reflex, you probably need a version of `gccxml`_ installed, which is @@ -98,8 +98,8 @@ To install the standalone version of Reflex, after download:: - $ tar jxf reflex-2013-08-14.tar.bz2 - $ cd reflex-2013-08-14 + $ tar jxf reflex-2014-10-20.tar.bz2 + $ cd reflex-2014-10-20 $ ./build/autogen $ ./configure <usual set of options such as --prefix> $ make && make install @@ -804,7 +804,7 @@ also means that you can't actually find out whether it is in use, other than by running a micro-benchmark or a JIT test). -.. _`provided`: http://cern.ch/wlav/reflex-2013-04-23.tar.bz2 +.. _`provided`: http://cern.ch/wlav/reflex-2014-10-20.tar.bz2 .. _`genreflex-methptrgetter.patch`: https://bitbucket.org/pypy/pypy/src/default/pypy/module/cppyy/genreflex-methptrgetter.patch CPython diff --git a/pypy/module/pypyjit/policy.py b/pypy/module/pypyjit/policy.py --- a/pypy/module/pypyjit/policy.py +++ b/pypy/module/pypyjit/policy.py @@ -120,7 +120,7 @@ def look_inside_function(self, func): mod = func.__module__ or '?' - if mod == 'rpython.rlib.rbigint' or mod == 'rpython.rlib.rlocale' or mod == 'rpython.rlib.rsocket': + if mod == 'rpython.rlib.rlocale' or mod == 'rpython.rlib.rsocket': return False if mod.startswith('pypy.interpreter.astcompiler.'): return False diff --git a/rpython/rlib/rbigint.py b/rpython/rlib/rbigint.py --- a/rpython/rlib/rbigint.py +++ b/rpython/rlib/rbigint.py @@ -427,7 +427,6 @@ def tolonglong(self): return _AsLongLong(self) - @jit.look_inside def tobool(self): return self.sign != 0 @@ -517,11 +516,9 @@ return (self.sign * self.digit(0)) == other - @jit.look_inside def ne(self, other): return not self.eq(other) - @jit.look_inside def int_ne(self, other): return not self.int_eq(other) @@ -592,11 +589,9 @@ return True return False - @jit.look_inside def le(self, other): return not other.lt(self) - @jit.look_inside def int_le(self, other): # Alternative that might be faster, reimplant this. as a check with other + 1. But we got to check for overflow # or reduce valid range. @@ -605,19 +600,15 @@ return True return self.int_lt(other) - @jit.look_inside def gt(self, other): return other.lt(self) - @jit.look_inside def int_gt(self, other): return not self.int_le(other) - @jit.look_inside def ge(self, other): return not self.lt(other) - @jit.look_inside def int_ge(self, other): return not self.int_lt(other) @@ -784,7 +775,6 @@ return div - @jit.look_inside def div(self, other): return self.floordiv(other) diff --git a/rpython/rlib/test/test_rbigint.py b/rpython/rlib/test/test_rbigint.py --- a/rpython/rlib/test/test_rbigint.py +++ b/rpython/rlib/test/test_rbigint.py @@ -582,6 +582,8 @@ def test_int_bitwise(self): for x in gen_signs([0, 1, 5, 11, 42, 43, 2 ** 30]): for y in gen_signs([0, 1, 5, 11, 42, 43, 3 ** 30, 2 ** 31]): + if y != intmask(y): + continue # skip 'y' too large for 32-bit lx = rbigint.fromlong(x) for mod in "xor and_ or_".split(): res1 = getattr(lx, 'int_' + mod)(y).tolong() @@ -666,9 +668,9 @@ for base in [0, 2, 4, 8, 16, 10, math.e]: l = rbigint.fromlong(op).log(base) if base: - assert ulps_check(l, math.log(op, base), 1) is None + assert ulps_check(l, math.log(op, base)) is None else: - assert ulps_check(l, math.log(op), 1) is None + assert ulps_check(l, math.log(op)) is None class TestInternalFunctions(object): def test__inplace_divrem1(self): _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
