[pypy-svn] r17327 - pypy/dist/pypy/translator/goal

[ericvrp at codespeak.net]

Author: ericvrp
Date: Wed Sep  7 16:03:29 2005
New Revision: 17327

Modified:
   pypy/dist/pypy/translator/goal/run_pypy-llvm.sh
   pypy/dist/pypy/translator/goal/runtranslate.sh   (contents, props changed)
   pypy/dist/pypy/translator/goal/translate_pypy_new.py
Log:
fixes to make more llvm compatible


Modified: pypy/dist/pypy/translator/goal/run_pypy-llvm.sh
==============================================================================
--- pypy/dist/pypy/translator/goal/run_pypy-llvm.sh	(original)
+++ pypy/dist/pypy/translator/goal/run_pypy-llvm.sh	Wed Sep  7 16:03:29 2005
@@ -4,6 +4,7 @@
 #python translate_pypy.py -no-c -no-o -text -fork2
 # running it all 
 python translate_pypy.py target_pypy-llvm -text -llvm $*
+#python translate_pypy_new.py targetpypystandalone --backend=llvm --gc=boehm --pygame $*
 
 
 # How to work in parallel:

Modified: pypy/dist/pypy/translator/goal/runtranslate.sh
==============================================================================
--- pypy/dist/pypy/translator/goal/runtranslate.sh	(original)
+++ pypy/dist/pypy/translator/goal/runtranslate.sh	Wed Sep  7 16:03:29 2005
@@ -1,3 +1,4 @@
+#!/bin/sh
 export RTYPERORDER=order,module-list.pedronis 
 # stopping on the first error
 #python translate_pypy.py -no-c -no-o -text -fork

Modified: pypy/dist/pypy/translator/goal/translate_pypy_new.py
==============================================================================
--- pypy/dist/pypy/translator/goal/translate_pypy_new.py	(original)
+++ pypy/dist/pypy/translator/goal/translate_pypy_new.py	Wed Sep  7 16:03:29 2005
@@ -417,13 +417,16 @@
                  )
         if err:
             raise err[0], err[1], err[2]
-        gcpolicy = None
-        if options1.gc =='boehm':
-            from pypy.translator.c import gc
-            gcpolicy = gc.BoehmGcPolicy
-        if options1.gc == 'none':
-            from pypy.translator.c import gc
-            gcpolicy = gc.NoneGcPolicy
+        if options1.backend == 'c': #XXX probably better to supply gcpolicy as string to the backends
+            gcpolicy = None
+            if options1.gc =='boehm':
+                from pypy.translator.c import gc
+                gcpolicy = gc.BoehmGcPolicy
+            if options1.gc == 'none':
+                from pypy.translator.c import gc
+                gcpolicy = gc.NoneGcPolicy
+        elif options1.backend == 'llvm':
+            gcpolicy = options1.gc
 
         if options1.backend == 'llinterpret':
             def interpret():
@@ -434,14 +437,14 @@
                 interp.eval_function(entry_point,
                                      targetspec_dic['get_llinterp_args']())
             interpret()
-        elif options1.gencode:
-            print 'Not generating C code.'
+        #elif options1.gencode:
+        #    print 'Not generating C code.'
         else:
-            print 'Generating %s %s code...' %("and compiling " and options1.really_compile or "",options1.backend)
+            print 'Generating %s %s code...' %(options1.really_compile and "and compiling " or "",options1.backend)
             keywords = {'really_compile' : options1.really_compile, 
                         'standalone' : standalone, 
                         'gcpolicy' : gcpolicy}
-            c_entry_point = t.compile(options1.backend,keywords)
+            c_entry_point = t.compile(options1.backend,**keywords)
                              
             if standalone and options1.backend == 'c': # xxx fragile and messy
                 import shutil