[pypy-svn] r67784 - in pypy/trunk/pypy/translator/c: . src

[afa at codespeak.net]

Author: afa
Date: Sat Sep 19 00:47:33 2009
New Revision: 67784

Modified:
   pypy/trunk/pypy/translator/c/gc.py
   pypy/trunk/pypy/translator/c/src/mem.h
Log:
Code specific to asmgcroot should be emitted only when using the corresponding gc policy.
This fixes various translation tests on Windows.


Modified: pypy/trunk/pypy/translator/c/gc.py
==============================================================================
--- pypy/trunk/pypy/translator/c/gc.py	(original)
+++ pypy/trunk/pypy/translator/c/gc.py	Sat Sep 19 00:47:33 2009
@@ -86,6 +86,9 @@
     def OP_GC_ASSUME_YOUNG_POINTERS(self, funcgen, op):
         return ''
 
+    def OP_GC_STACK_BOTTOM(self, funcgen, op):
+        return ''
+
 
 class RefcountingInfo:
     static_deallocator = None
@@ -325,6 +328,9 @@
     def GC_KEEPALIVE(self, funcgen, v):
         return 'pypy_asm_keepalive(%s);' % funcgen.expr(v)
 
+    def OP_GC_STACK_BOTTOM(self, funcgen, v):
+        return 'pypy_asm_stack_bottom(%s);'  % funcgen.expr(v)
+
 
 name_to_gcpolicy = {
     'boehm': BoehmGcPolicy,

Modified: pypy/trunk/pypy/translator/c/src/mem.h
==============================================================================
--- pypy/trunk/pypy/translator/c/src/mem.h	(original)
+++ pypy/trunk/pypy/translator/c/src/mem.h	Sat Sep 19 00:47:33 2009
@@ -49,7 +49,7 @@
                                              "g" (v))
 
 /* marker for trackgcroot.py */
-#define OP_GC_STACK_BOTTOM(r)  asm volatile ("/* GC_STACK_BOTTOM */" : : )
+#define pypy_asm_stack_bottom(r)  asm volatile ("/* asm_stack_bottom */" : : )
 
 #define OP_GC_ASMGCROOT_STATIC(i, r)   r =      \
                i == 0 ? (void*)&__gcmapstart :         \