[pypy-svn] r68712 - in pypy/branch/msvc-asmgcroot/pypy/translator/c: . src

[afa at codespeak.net]

Author: afa
Date: Thu Oct 22 14:29:53 2009
New Revision: 68712

Modified:
   pypy/branch/msvc-asmgcroot/pypy/translator/c/genc.py
   pypy/branch/msvc-asmgcroot/pypy/translator/c/src/mem.h
Log:
Tweak compiler options. Now all tests but one pass!
test_callback_simple loops forever.


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 Oct 22 14:29:53 2009
@@ -503,15 +503,18 @@
                 lblofiles = ['%s.lbl.obj' % (cfile[:-2],) for cfile in mk.cfiles]
                 mk.definition('ASMLBLOBJFILES', lblofiles)
                 mk.definition('OBJECTS', 'gcmaptable.obj $(ASMLBLOBJFILES)')
+                # almost all optimizations implied by /O2, except /Og
+                mk.definition('ASM_CFLAGS', '$(CFLAGS) /Od /Oi /Ot /Oy /Ob2 /GF /Gy')
                 mk.rule('.SUFFIXES', '.s', [])
                 mk.rule('.s.obj', '',
                         'cmd /c $(MASM) /nologo /Cx /Cp /Zm /coff /Fo$@ /c $< $(INCLUDEDIRS)')
                 mk.rule('.c.gcmap', '',
-                        ['$(CC) /nologo $(CFLAGS) /c /FAs /Fa$*.s $< $(INCLUDEDIRS)',
+                        ['$(CC) /nologo $(ASM_CFLAGS) /c /FAs /Fa$*.s $< $(INCLUDEDIRS)',
                          'cmd /c ' + python + '$(PYPYDIR)/translator/c/gcc/trackgcroot.py -fmsvc -t $*.s > $@']
                         )
                 mk.rule('gcmaptable.s', '$(GCMAPFILES)',
                         'cmd /c ' + python + '$(PYPYDIR)/translator/c/gcc/trackgcroot.py -fmsvc $(GCMAPFILES) > $@')
+
             else:
                 mk.definition('OBJECTS', '$(ASMLBLFILES) gcmaptable.s')
                 mk.rule('%.s', '%.c', '$(CC) $(CFLAGS) -frandom-seed=$< -o $@ -S $< $(INCLUDEDIRS)')

Modified: pypy/branch/msvc-asmgcroot/pypy/translator/c/src/mem.h
==============================================================================
--- pypy/branch/msvc-asmgcroot/pypy/translator/c/src/mem.h	(original)
+++ pypy/branch/msvc-asmgcroot/pypy/translator/c/src/mem.h	Thu Oct 22 14:29:53 2009
@@ -47,7 +47,7 @@
     return _r1;
 }
 #define pypy_asm_keepalive(v)    __asm { }
-static __declspec(noinline) void* pypy_asm_stack_bottom() { }
+static __declspec(noinline) void pypy_asm_stack_bottom() { }
 
 #endif