[pypy-commit] pypy remove-set-smm: hg merge default

Manuel Jacob noreply at buildbot.pypy.org
Wed May 15 14:21:38 CEST 2013 

Author: Manuel Jacob
Branch: remove-set-smm
Changeset: r64148:80e595ef01f2
Date: 2013-05-15 14:16 +0200
http://bitbucket.org/pypy/pypy/changeset/80e595ef01f2/

Log:	hg merge default

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -666,7 +666,8 @@
     def id(self, w_obj):
         w_result = w_obj.immutable_unique_id(self)
         if w_result is None:
-            w_result = self.wrap(compute_unique_id(w_obj))
+            # in the common case, returns an unsigned value
+            w_result = self.wrap(r_uint(compute_unique_id(w_obj)))
         return w_result
 
     def hash_w(self, w_obj):
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -55,6 +55,7 @@
         'validate_fd'               : 'interp_magic.validate_fd',
         'resizelist_hint'           : 'interp_magic.resizelist_hint',
         'newlist_hint'              : 'interp_magic.newlist_hint',
+        'add_memory_pressure'       : 'interp_magic.add_memory_pressure',
         'newdict'                   : 'interp_dict.newdict',
         'dictstrategy'              : 'interp_dict.dictstrategy',
     }
diff --git a/pypy/module/__pypy__/interp_magic.py b/pypy/module/__pypy__/interp_magic.py
--- a/pypy/module/__pypy__/interp_magic.py
+++ b/pypy/module/__pypy__/interp_magic.py
@@ -4,7 +4,7 @@
 from pypy.objspace.std.listobject import W_ListObject
 from pypy.objspace.std.typeobject import MethodCache
 from pypy.objspace.std.mapdict import IndexCache
-from rpython.rlib import rposix
+from rpython.rlib import rposix, rgc
 
 
 def internal_repr(space, w_object):
@@ -100,3 +100,7 @@
 @unwrap_spec(sizehint=int)
 def newlist_hint(space, sizehint):
     return space.newlist_hint(sizehint)
+
+ at unwrap_spec(estimate=int)
+def add_memory_pressure(estimate):
+    rgc.add_memory_pressure(estimate)
diff --git a/rpython/jit/backend/x86/test/test_del.py b/rpython/jit/backend/arm/test/test_del.py
copy from rpython/jit/backend/x86/test/test_del.py
copy to rpython/jit/backend/arm/test/test_del.py
--- a/rpython/jit/backend/x86/test/test_del.py
+++ b/rpython/jit/backend/arm/test/test_del.py
@@ -1,8 +1,8 @@
 
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 from rpython.jit.metainterp.test.test_del import DelTests
 
-class TestDel(Jit386Mixin, DelTests):
+class TestDel(JitARMMixin, DelTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_del.py
     pass
diff --git a/rpython/jit/backend/x86/test/test_dict.py b/rpython/jit/backend/arm/test/test_dict.py
copy from rpython/jit/backend/x86/test/test_dict.py
copy to rpython/jit/backend/arm/test/test_dict.py
--- a/rpython/jit/backend/x86/test/test_dict.py
+++ b/rpython/jit/backend/arm/test/test_dict.py
@@ -1,9 +1,9 @@
 
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 from rpython.jit.metainterp.test.test_dict import DictTests
 
 
-class TestDict(Jit386Mixin, DictTests):
+class TestDict(JitARMMixin, DictTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_dict.py
     pass
diff --git a/rpython/jit/backend/x86/test/test_quasiimmut.py b/rpython/jit/backend/arm/test/test_quasiimmut.py
copy from rpython/jit/backend/x86/test/test_quasiimmut.py
copy to rpython/jit/backend/arm/test/test_quasiimmut.py
--- a/rpython/jit/backend/x86/test/test_quasiimmut.py
+++ b/rpython/jit/backend/arm/test/test_quasiimmut.py
@@ -1,9 +1,9 @@
 
 import py
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 from rpython.jit.metainterp.test import test_quasiimmut
 
-class TestLoopSpec(Jit386Mixin, test_quasiimmut.QuasiImmutTests):
+class TestLoopSpec(JitARMMixin, test_quasiimmut.QuasiImmutTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_loop.py
     pass
diff --git a/rpython/jit/backend/x86/test/test_rawmem.py b/rpython/jit/backend/arm/test/test_rawmem.py
copy from rpython/jit/backend/x86/test/test_rawmem.py
copy to rpython/jit/backend/arm/test/test_rawmem.py
--- a/rpython/jit/backend/x86/test/test_rawmem.py
+++ b/rpython/jit/backend/arm/test/test_rawmem.py
@@ -1,9 +1,9 @@
 
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 from rpython.jit.metainterp.test.test_rawmem import RawMemTests
 
 
-class TestRawMem(Jit386Mixin, RawMemTests):
+class TestRawMem(JitARMMixin, RawMemTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_rawmem.py
     pass
diff --git a/rpython/jit/backend/x86/test/test_send.py b/rpython/jit/backend/arm/test/test_send.py
copy from rpython/jit/backend/x86/test/test_send.py
copy to rpython/jit/backend/arm/test/test_send.py
--- a/rpython/jit/backend/x86/test/test_send.py
+++ b/rpython/jit/backend/arm/test/test_send.py
@@ -1,10 +1,10 @@
 
 import py
 from rpython.jit.metainterp.test.test_send import SendTests
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 from rpython.rlib import jit
 
-class TestSend(Jit386Mixin, SendTests):
+class TestSend(JitARMMixin, SendTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_send.py
     def test_call_with_additional_args(self):
diff --git a/rpython/jit/backend/x86/test/test_slist.py b/rpython/jit/backend/arm/test/test_slist.py
copy from rpython/jit/backend/x86/test/test_slist.py
copy to rpython/jit/backend/arm/test/test_slist.py
--- a/rpython/jit/backend/x86/test/test_slist.py
+++ b/rpython/jit/backend/arm/test/test_slist.py
@@ -1,8 +1,8 @@
 import py
 from rpython.jit.metainterp.test import test_slist
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 
-class TestSList(Jit386Mixin, test_slist.ListTests):
+class TestSList(JitARMMixin, test_slist.ListTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_slist.py
     def test_list_of_voids(self):
diff --git a/rpython/jit/backend/x86/test/test_tl.py b/rpython/jit/backend/arm/test/test_tl.py
copy from rpython/jit/backend/x86/test/test_tl.py
copy to rpython/jit/backend/arm/test/test_tl.py
--- a/rpython/jit/backend/x86/test/test_tl.py
+++ b/rpython/jit/backend/arm/test/test_tl.py
@@ -1,9 +1,9 @@
 
 import py
 from rpython.jit.metainterp.test.test_tl import ToyLanguageTests
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 
-class TestTL(Jit386Mixin, ToyLanguageTests):
+class TestTL(JitARMMixin, ToyLanguageTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_tl.py
     pass
diff --git a/rpython/jit/backend/x86/test/test_tlc.py b/rpython/jit/backend/arm/test/test_tlc.py
copy from rpython/jit/backend/x86/test/test_tlc.py
copy to rpython/jit/backend/arm/test/test_tlc.py
--- a/rpython/jit/backend/x86/test/test_tlc.py
+++ b/rpython/jit/backend/arm/test/test_tlc.py
@@ -1,10 +1,10 @@
 
 import py
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 from rpython.jit.metainterp.test.test_tlc import TLCTests
 from rpython.jit.tl import tlc
 
-class TestTL(Jit386Mixin, TLCTests):
+class TestTL(JitARMMixin, TLCTests):
     # for the individual tests see
     # ====> ../../test/test_tlc.py
     
diff --git a/rpython/jit/backend/x86/test/test_virtual.py b/rpython/jit/backend/arm/test/test_virtual.py
copy from rpython/jit/backend/x86/test/test_virtual.py
copy to rpython/jit/backend/arm/test/test_virtual.py
--- a/rpython/jit/backend/x86/test/test_virtual.py
+++ b/rpython/jit/backend/arm/test/test_virtual.py
@@ -1,10 +1,10 @@
 from rpython.jit.metainterp.test.test_virtual import VirtualTests, VirtualMiscTests
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 
 class MyClass:
     pass
 
-class TestsVirtual(Jit386Mixin, VirtualTests):
+class TestsVirtual(JitARMMixin, VirtualTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_virtual.py
     _new_op = 'new_with_vtable'
@@ -14,7 +14,7 @@
     def _new():
         return MyClass()
 
-class TestsVirtualMisc(Jit386Mixin, VirtualMiscTests):
+class TestsVirtualMisc(JitARMMixin, VirtualMiscTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_virtual.py
     pass
diff --git a/rpython/jit/backend/x86/test/test_virtualizable.py b/rpython/jit/backend/arm/test/test_virtualizable.py
copy from rpython/jit/backend/x86/test/test_virtualizable.py
copy to rpython/jit/backend/arm/test/test_virtualizable.py
--- a/rpython/jit/backend/x86/test/test_virtualizable.py
+++ b/rpython/jit/backend/arm/test/test_virtualizable.py
@@ -1,8 +1,8 @@
 
 import py
 from rpython.jit.metainterp.test.test_virtualizable import ImplicitVirtualizableTests
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 
-class TestVirtualizable(Jit386Mixin, ImplicitVirtualizableTests):
+class TestVirtualizable(JitARMMixin, ImplicitVirtualizableTests):
     def test_blackhole_should_not_reenter(self):
         py.test.skip("Assertion error & llinterp mess")
diff --git a/rpython/jit/backend/x86/test/test_virtualref.py b/rpython/jit/backend/arm/test/test_virtualref.py
copy from rpython/jit/backend/x86/test/test_virtualref.py
copy to rpython/jit/backend/arm/test/test_virtualref.py
--- a/rpython/jit/backend/x86/test/test_virtualref.py
+++ b/rpython/jit/backend/arm/test/test_virtualref.py
@@ -1,8 +1,8 @@
 
 from rpython.jit.metainterp.test.test_virtualref import VRefTests
-from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
+from rpython.jit.backend.arm.test.support import JitARMMixin
 
-class TestVRef(Jit386Mixin, VRefTests):
+class TestVRef(JitARMMixin, VRefTests):
     # for the individual tests see
     # ====> ../../../metainterp/test/test_virtualref.py
     pass
diff --git a/rpython/jit/metainterp/test/test_rawmem.py b/rpython/jit/metainterp/test/test_rawmem.py
--- a/rpython/jit/metainterp/test/test_rawmem.py
+++ b/rpython/jit/metainterp/test/test_rawmem.py
@@ -48,8 +48,8 @@
     def test_raw_storage_float(self):
         def f():
             p = alloc_raw_storage(15)
-            raw_storage_setitem(p, 3, 2.4e15)
-            res = raw_storage_getitem(lltype.Float, p, 3)
+            raw_storage_setitem(p, 4, 2.4e15)
+            res = raw_storage_getitem(lltype.Float, p, 4)
             free_raw_storage(p)
             return res
         res = self.interp_operations(f, [])
diff --git a/rpython/rlib/rbigint.py b/rpython/rlib/rbigint.py
--- a/rpython/rlib/rbigint.py
+++ b/rpython/rlib/rbigint.py
@@ -458,10 +458,6 @@
         if (self.sign != other.sign or
             self.numdigits() != other.numdigits()):
             return False
-        
-        # Fast path.
-        if len(self._digits) == len(other._digits):
-            return self._digits == other._digits
 
         i = 0
         ld = self.numdigits()
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -259,7 +259,7 @@
             if self.config.translation.shared:
                 defines['PYPY_MAIN_FUNCTION'] = "pypy_main_startup"
                 self.eci = self.eci.merge(ExternalCompilationInfo(
-                    export_symbols=["pypy_main_startup"]))
+                    export_symbols=["pypy_main_startup", "pypy_debug_file"]))
         self.eci, cfile, extra = gen_source(db, modulename, targetdir,
                                             self.eci, defines=defines,
                                             split=self.split)

More information about the pypy-commit mailing list