[pypy-svn] r68607 - pypy/trunk/pypy/config

cfbolz at codespeak.net cfbolz at codespeak.net
Sat Oct 17 20:06:06 CEST 2009


Author: cfbolz
Date: Sat Oct 17 20:06:05 2009
New Revision: 68607

Added:
   pypy/trunk/pypy/config/pypyoption.py.merge.tmp
      - copied, changed from r68605, pypy/trunk/pypy/config/pypyoption.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/tagged-pointers-framework2/pypy/config/pypyoption.py
revisions 68538 to 68605:

    ------------------------------------------------------------------------
    r68604 | cfbolz | 2009-10-17 19:29:29 +0200 (Sat, 17 Oct 2009) | 2 lines
    
    disable small ints again, now that the test run is finished
    
    ------------------------------------------------------------------------
    r68589 | cfbolz | 2009-10-17 17:20:38 +0200 (Sat, 17 Oct 2009) | 2 lines
    
    enable this for a bit, to get it when doing a lib-python run
    
    ------------------------------------------------------------------------
    r68545 | cfbolz | 2009-10-16 23:02:19 +0200 (Fri, 16 Oct 2009) | 230 lines
    
    merge in tagged-pointers-framework branch:
    
        -----------------------------------------------------------------------
        r65789 | arigo | 2009-06-16 10:06:57 +0200 (Tue, 16 Jun 2009) | 3 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/generation.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/framework.py
    
        Missing a gc.points_to_valid_gc_object() in the thread-specific code.
        The rest is just clean-ups.
    
        ------------------------------------------------------------------------
        r65784 | arigo | 2009-06-15 22:02:59 +0200 (Mon, 15 Jun 2009) | 4 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/asmgcroot.py
           M /pypy/branch/tagged-pointers-framework/pypy/translator/c/gcc/test/test_asmgcroot.py
    
        Revert r65770.  It turns out that asmgcc is not compatible with non-moving GCs.
        It could be fixed but it's not worthwhile (and definitely the "fix" of r65770
        was completely broken :-)
    
        ------------------------------------------------------------------------
        r65770 | cfbolz | 2009-06-14 12:21:20 +0200 (Sun, 14 Jun 2009) | 3 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/asmgcroot.py
           M /pypy/branch/tagged-pointers-framework/pypy/translator/c/gcc/test/test_asmgcroot.py
    
        Make asmgcc work at least somewhat with non-moving GCs. In the current form,
        some of the tests segfault, no clue whose fault that is yet.
    
        ------------------------------------------------------------------------
        r65751 | cfbolz | 2009-06-12 19:12:45 +0200 (Fri, 12 Jun 2009) | 3 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/base.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/hybrid.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_gc.py
    
        Fix id computation in the presence of tagged pointers: make sure that real
        objects have even ids, so that the tagged ints can have odd ones.
    
        ------------------------------------------------------------------------
        r65456 | cfbolz | 2009-05-27 15:59:42 +0200 (Wed, 27 May 2009) | 3 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/rtagged.py
    
        Be more precise about getting the type of tagged-or-normal-or-None. Gets rid of
        a lot of warnings when translating.
    
        ------------------------------------------------------------------------
        r65454 | cfbolz | 2009-05-27 15:04:33 +0200 (Wed, 27 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/asmgcroot.py
           M /pypy/branch/tagged-pointers-framework/pypy/translator/c/gcc/test/test_asmgcroot.py
    
        Fix asmgcroot stack walker in conjunction with tagged pointers.
    
        ------------------------------------------------------------------------
        r65453 | cfbolz | 2009-05-27 15:03:14 +0200 (Wed, 27 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/lang/smalltalk/model.py
    
        Adapt smalltalk vm to make the translation.taggedpointers option do something.
    
        ------------------------------------------------------------------------
        r65452 | cfbolz | 2009-05-27 15:02:21 +0200 (Wed, 27 May 2009) | 2 lines
        Changed paths:
           A /pypy/branch/tagged-pointers-framework/pypy/doc/config/translation.taggedpointers.txt
    
        add documentation
    
        ------------------------------------------------------------------------
        r65448 | cfbolz | 2009-05-27 14:18:39 +0200 (Wed, 27 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/translator/c/test/test_rtagged.py
    
        fix another test
    
        ------------------------------------------------------------------------
        r65447 | cfbolz | 2009-05-27 14:16:22 +0200 (Wed, 27 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rlib/test/test_objectmodel.py
    
        forgot to fix a test
    
        ------------------------------------------------------------------------
        r65422 | cfbolz | 2009-05-26 17:40:45 +0200 (Tue, 26 May 2009) | 3 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/rtagged.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/test/test_rtagged.py
    
        waaaaaa, how could this ever have worked? type(x) where x=None but x could also
        be a tagged pointer segfaulted so far.
    
        ------------------------------------------------------------------------
        r65420 | cfbolz | 2009-05-26 15:10:34 +0200 (Tue, 26 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/lang/prolog/interpreter/term.py
    
        make it possible to use tagged pointers in the prolog implementation.
    
        ------------------------------------------------------------------------
        r65415 | cfbolz | 2009-05-25 17:44:47 +0200 (Mon, 25 May 2009) | 3 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rlib/objectmodel.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/rtagged.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/test/test_rtagged.py
    
        Rename the very generic method name "getvalue" to get_untagged_value. So far
        it's not really used much anyway, only in tests.
    
        ------------------------------------------------------------------------
        r65414 | cfbolz | 2009-05-25 17:39:35 +0200 (Mon, 25 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rlib/objectmodel.py
    
        update comment
    
        ------------------------------------------------------------------------
        r65413 | cfbolz | 2009-05-25 17:26:28 +0200 (Mon, 25 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/translator/c/test/test_boehm.py
           M /pypy/branch/tagged-pointers-framework/pypy/translator/c/test/test_newgc.py
    
        Fix translating tagging tests to use the new option.
    
        ------------------------------------------------------------------------
        r65412 | cfbolz | 2009-05-25 17:22:29 +0200 (Mon, 25 May 2009) | 5 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/config/pypyoption.py
           M /pypy/branch/tagged-pointers-framework/pypy/config/translationoption.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/rclass.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/test/test_rtagged.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_gc.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_transformed_gc.py
    
        Add a translation config option to use pointer tagging. This should make it
        possible for e.g. the Smalltalk VM to make pointer tagging a translate.py (as it
        is not really natural there to have to different classes as in the Python
        interpreter).
    
        ------------------------------------------------------------------------
        r65409 | cfbolz | 2009-05-25 14:25:19 +0200 (Mon, 25 May 2009) | 5 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/llmemory.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/lltypesystem/lltype.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/base.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/hybrid.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_gc.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_transformed_gc.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/test/test_rptr.py
    
         - fix casting of opaque pointers to ints. Needed for correct GCREF handing
         - allowing casting of addresses of dead objects to int. Fixes some
           test_transformed_gc tests
         - proper id handling of tagged pointers in moving GCs
    
        ------------------------------------------------------------------------
        r65133 | cfbolz | 2009-05-07 14:00:26 +0200 (Thu, 07 May 2009) | 3 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/framework.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_gc.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_transformed_gc.py
    
        tests with prebuilt data structures. This finds a bug. The tests still fails on
        mark-n-sweep, no clue why yet.
    
        ------------------------------------------------------------------------
        r65083 | cfbolz | 2009-05-06 12:26:50 +0200 (Wed, 06 May 2009) | 3 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gcwrapper.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_gc.py
    
        Fix gcwrapper to support prebuilt tagged pointers. Doesn't find the bug I am
        hunting though.
    
        ------------------------------------------------------------------------
        r65079 | cfbolz | 2009-05-06 09:55:29 +0200 (Wed, 06 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/base.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/generation.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_gc.py
    
        fix write barrier
    
        ------------------------------------------------------------------------
        r65078 | cfbolz | 2009-05-06 09:39:43 +0200 (Wed, 06 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/markcompact.py
    
        missed a copy of trace
    
        ------------------------------------------------------------------------
        r65041 | cfbolz | 2009-05-04 23:35:44 +0200 (Mon, 04 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/config/pypyoption.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/base.py
    
        In theory, this should be enough. In practise, it obviously segfaults.
    
        ------------------------------------------------------------------------
        r65021 | cfbolz | 2009-05-04 13:59:29 +0200 (Mon, 04 May 2009) | 4 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/base.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/generation.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/markcompact.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/marksweep.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gc/semispace.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gctransform/framework.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/gcwrapper.py
    
        Refactor things so that there is only one place where it is checked whether a
        pointed-to object is NULL. This place can later be used for checking tagged
        pointers as well.
    
        ------------------------------------------------------------------------
        r65020 | cfbolz | 2009-05-04 13:58:19 +0200 (Mon, 04 May 2009) | 2 lines
        Changed paths:
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_gc.py
           M /pypy/branch/tagged-pointers-framework/pypy/rpython/memory/test/test_transformed_gc.py
    
        (failing) tests that I would like to pass
    
        ------------------------------------------------------------------------
        r65019 | cfbolz | 2009-05-04 13:54:06 +0200 (Mon, 04 May 2009) | 2 lines
        Changed paths:
           A /pypy/branch/tagged-pointers-framework (from /pypy/trunk:65018)
    
    A branch to play with supporting tagged pointers with the framework GCs
    
    
    ------------------------------------------------------------------------
    r68540 | cfbolz | 2009-10-16 15:59:17 +0200 (Fri, 16 Oct 2009) | 2 lines
    
    a new copy of trunk to merge in the tagged-pointers-framework branch
    
    ------------------------------------------------------------------------


Copied: pypy/trunk/pypy/config/pypyoption.py.merge.tmp (from r68605, pypy/trunk/pypy/config/pypyoption.py)
==============================================================================
--- pypy/trunk/pypy/config/pypyoption.py	(original)
+++ pypy/trunk/pypy/config/pypyoption.py.merge.tmp	Sat Oct 17 20:06:05 2009
@@ -183,8 +183,8 @@
 
         BoolOption("withsmallint", "use tagged integers",
                    default=False,
-                   requires=[("translation.gc", "boehm"),
-                             ("objspace.std.withprebuiltint", False)]),
+                   requires=[("objspace.std.withprebuiltint", False),
+                             ("translation.taggedpointers", True)]),
 
         BoolOption("withprebuiltint", "prebuild commonly used int objects",
                    default=False),



More information about the Pypy-commit mailing list