[pypy-svn] r69208 - in pypy/branch/msvc-asmgcroot/pypy/translator/c: . gcc

[afa at codespeak.net]

Author: afa
Date: Thu Nov 12 02:30:05 2009
New Revision: 69208

Modified:
   pypy/branch/msvc-asmgcroot/pypy/translator/c/gcc/trackgcroot.py
   pypy/branch/msvc-asmgcroot/pypy/translator/c/genc.py
Log:
Finally fix test_callback_simple and test_callback_with_collect.


Modified: pypy/branch/msvc-asmgcroot/pypy/translator/c/gcc/trackgcroot.py
==============================================================================
--- pypy/branch/msvc-asmgcroot/pypy/translator/c/gcc/trackgcroot.py	(original)
+++ pypy/branch/msvc-asmgcroot/pypy/translator/c/gcc/trackgcroot.py	Thu Nov 12 02:30:05 2009
@@ -791,7 +791,7 @@
 
     r_gcroot_marker = re.compile(r"$1") # never matches
     r_gcroot_marker_var = re.compile(r"DWORD PTR .+_constant_always_one_.+pypy_asm_gcroot")
-    r_bottom_marker = re.compile(r"\tcall\t_pypy_asm_stack_bottom\s*")
+    r_bottom_marker = re.compile(r"; .+\tpypy_asm_stack_bottom\(\);")
 
     r_unaryinsn_star= re.compile(r"\t[a-z]\w*\s+DWORD PTR ("+OPERAND+")\s*$")
     r_jmptable_item = re.compile(r"\tDD\t"+LABEL+"(-\"[A-Za-z0-9$]+\")?\s*$")
@@ -1228,7 +1228,7 @@
 
         def _offset(name):
             if self.format == 'msvc':
-                return "DWORD PTR [%s]" % _globalname(name)
+                return "OFFSET %s" % _globalname(name)
             else:
                 return "$%s" % _globalname(name)
 

Modified: pypy/branch/msvc-asmgcroot/pypy/translator/c/genc.py
==============================================================================
--- pypy/branch/msvc-asmgcroot/pypy/translator/c/genc.py	(original)
+++ pypy/branch/msvc-asmgcroot/pypy/translator/c/genc.py	Thu Nov 12 02:30:05 2009
@@ -491,7 +491,8 @@
             trackgcfiles = [cfile[:-2] for cfile in mk.cfiles]
             if self.translator.platform.name == 'msvc':
                 trackgcfiles = [f for f in trackgcfiles
-                                if f.startswith(('implement', 'testing'))]
+                                if f.startswith(('implement', 'testing',
+                                                 '../module_cache/module'))]
             sfiles = ['%s.s' % (c,) for c in trackgcfiles]
             lblsfiles = ['%s.lbl.s' % (c,) for c in trackgcfiles]
             gcmapfiles = ['%s.gcmap' % (c,) for c in trackgcfiles]