[pypy-svn] r67764 - pypy/trunk/pypy/rpython

[arigo at codespeak.net]

Author: arigo
Date: Fri Sep 18 15:05:27 2009
New Revision: 67764

Added:
   pypy/trunk/pypy/rpython/llinterp.py.merge.tmp
      - copied, changed from r67762, pypy/trunk/pypy/rpython/llinterp.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/asmgcroot-callback/pypy/rpython/llinterp.py
revisions 67691 to 67762:

    ------------------------------------------------------------------------
    r67709 | arigo | 2009-09-16 11:21:10 +0200 (Wed, 16 Sep 2009) | 2 lines
    
    Small changes that seem to make threads work on top of asmgcc.
    
    ------------------------------------------------------------------------
    r67698 | arigo | 2009-09-15 17:29:01 +0200 (Tue, 15 Sep 2009) | 4 lines
    
    Improve debugging by crashing with a "clear" error message
    if the number of stack pieces seen during collection differs
    from the number of live stack pieces.
    
    ------------------------------------------------------------------------
    r67697 | arigo | 2009-09-15 17:15:00 +0200 (Tue, 15 Sep 2009) | 3 lines
    
    In-progress.  Add an operation that turns into a marker in the assembler
    source, used to know which functions are callbacks from C.
    
    ------------------------------------------------------------------------
    r67693 | arigo | 2009-09-15 15:41:17 +0200 (Tue, 15 Sep 2009) | 2 lines
    
    Change the operations "gc_llvm_*" into a single better-named operation.
    
    ------------------------------------------------------------------------
    r67692 | arigo | 2009-09-15 15:38:22 +0200 (Tue, 15 Sep 2009) | 3 lines
    
    A branch in which to try to implement callback support
    in --gcrootfinder=asmgcc.
    
    ------------------------------------------------------------------------


Copied: pypy/trunk/pypy/rpython/llinterp.py.merge.tmp (from r67762, pypy/trunk/pypy/rpython/llinterp.py)
==============================================================================
--- pypy/trunk/pypy/rpython/llinterp.py	(original)
+++ pypy/trunk/pypy/rpython/llinterp.py.merge.tmp	Fri Sep 18 15:05:27 2009
@@ -878,6 +878,12 @@
     def op_gc_set_max_heap_size(self, maxsize):
         raise NotImplementedError("gc_set_max_heap_size")
 
+    def op_gc_asmgcroot_static(self, index):
+        raise NotImplementedError("gc_asmgcroot_static")
+
+    def op_gc_stack_bottom(self):
+        pass       # marker for trackgcroot.py
+
     def op_do_malloc_fixedsize_clear(self):
         raise NotImplementedError("do_malloc_fixedsize_clear")