[pypy-svn] r17601 - in pypy/dist/pypy/translator: goal llvm/module

ericvrp at codespeak.net ericvrp at codespeak.net
Fri Sep 16 20:26:34 CEST 2005


Author: ericvrp
Date: Fri Sep 16 20:26:32 2005
New Revision: 17601

Modified:
   pypy/dist/pypy/translator/goal/targetpypystandalone.py
   pypy/dist/pypy/translator/goal/translate_pypy.py
   pypy/dist/pypy/translator/llvm/module/support.py
Log:
Fix because LLVM backend was not using backendoptz.
(which was really hurting it)


Modified: pypy/dist/pypy/translator/goal/targetpypystandalone.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetpypystandalone.py	(original)
+++ pypy/dist/pypy/translator/goal/targetpypystandalone.py	Fri Sep 16 20:26:32 2005
@@ -60,7 +60,7 @@
     if __main__.options.get('-boehm'):
         #print "disabling thread with boehm for stabilitiy (combination not tested)"
         print "trying threads and boehm"
-        usemodules = ['thread']
+        usemodules = []
     else:
         usemodules = ['thread']
     space = StdObjSpace(nofaking=True,

Modified: pypy/dist/pypy/translator/goal/translate_pypy.py
==============================================================================
--- pypy/dist/pypy/translator/goal/translate_pypy.py	(original)
+++ pypy/dist/pypy/translator/goal/translate_pypy.py	Fri Sep 16 20:26:32 2005
@@ -148,9 +148,9 @@
         print 'Specializing...'
         t.specialize(dont_simplify_again=True,
                      crash_on_first_typeerror=not options['-t-insist'])
-    if not options['-no-o'] and not options['-llvm']:
+    if not options['-no-o']:
         print 'Back-end optimizations...'
-        t.backend_optimizations()
+        t.backend_optimizations(ssa_form=not options['-llvm'])
     if a and options['-fork2']:
         from pypy.translator.goal import unixcheckpoint
         unixcheckpoint.restartable_point(auto='run')

Modified: pypy/dist/pypy/translator/llvm/module/support.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/module/support.py	(original)
+++ pypy/dist/pypy/translator/llvm/module/support.py	Fri Sep 16 20:26:32 2005
@@ -264,7 +264,6 @@
 extfunctions["%main"] = [(), """
 int %main(int %argc, sbyte** %argv) {
 entry:
-    ;%pypy_argv = call fastcc %RPyListOfString* %pypy_ll_newlist__Ptr_GcStruct_listLlT_Signed(int 0)
     %pypy_argv = call fastcc %structtype.list* %pypy_ll_newlist__Ptr_GcStruct_listLlT_Signed(int 0)
     br label %no_exit
 
@@ -274,7 +273,6 @@
     %tmp.8 = getelementptr sbyte** %argv, uint %indvar
     %tmp.9 = load sbyte** %tmp.8
     %rpy = call fastcc %RPyString* %RPyString_FromString(sbyte* %tmp.9)
-    ;call fastcc void %pypy_ll_append__listPtr_rpy_stringPtr(%RPyListOfString* %pypy_argv, %RPyString* %rpy)
     call fastcc void %pypy_ll_append__listPtr_rpy_stringPtr(%structtype.list* %pypy_argv, %RPyString* %rpy)
     %inc = add int %i.0.0, 1
     %tmp.2 = setlt int %inc, %argc



More information about the Pypy-commit mailing list