[pypy-svn] r45555 - in pypy/dist/pypy/translator/cli: . test

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Aug  8 16:24:28 2007
New Revision: 45555

Removed:
   pypy/dist/pypy/translator/cli/stackopt.py
   pypy/dist/pypy/translator/cli/test/test_stackopt.py
Modified:
   pypy/dist/pypy/translator/cli/conftest.py
   pypy/dist/pypy/translator/cli/gencli.py
   pypy/dist/pypy/translator/cli/option.py
Log:
kill stackopt: treebuilder does a much better job



Modified: pypy/dist/pypy/translator/cli/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/cli/conftest.py	(original)
+++ pypy/dist/pypy/translator/cli/conftest.py	Wed Aug  8 16:24:28 2007
@@ -26,9 +26,6 @@
           Option('--norun', action='store_true', dest="norun", default=False,
                  help="don't run the compiled executable"),
 
-          Option('--nostackopt', action='store_true', dest='nostackopt', default=False,
-                 help="don't optimize stack load/store operations"),
-
           Option('--trace', action='store_true', dest='trace', default=False,
                  help='Trace execution of generated code'),
           )

Modified: pypy/dist/pypy/translator/cli/gencli.py
==============================================================================
--- pypy/dist/pypy/translator/cli/gencli.py	(original)
+++ pypy/dist/pypy/translator/cli/gencli.py	Wed Aug  8 16:24:28 2007
@@ -19,7 +19,6 @@
 from pypy.translator.cli.rte import get_pypy_dll
 from pypy.translator.cli.support import Tee
 from pypy.translator.cli.prebuiltnodes import get_prebuilt_nodes
-from pypy.translator.cli.stackopt import StackOptGenerator
 from pypy.translator.cli import query
 from pypy.translator.cli import constant
 
@@ -28,10 +27,6 @@
 except NameError:
     from sets import Set as set
 
-#USE_STACKOPT = True and not getoption('nostackopt')
-USE_STACKOPT = False
-
-
 class GenCli(GenOO):
     TypeSystem = CTS
     Function = Function
@@ -81,12 +76,8 @@
         out = self.tmpfile.open('w')
         if getoption('stdout'):
             out = Tee(sys.stdout, out)
-
-        if USE_STACKOPT:
-            return StackOptGenerator(out, self.assembly_name, self.config)
-        else:
-            isnetmodule = self.entrypoint.isnetmodule
-            return IlasmGenerator(out, self.assembly_name, self.config, isnetmodule)
+        isnetmodule = self.entrypoint.isnetmodule
+        return IlasmGenerator(out, self.assembly_name, self.config, isnetmodule)
 
     def build_exe(self):        
         if getoption('source'):

Modified: pypy/dist/pypy/translator/cli/option.py
==============================================================================
--- pypy/dist/pypy/translator/cli/option.py	(original)
+++ pypy/dist/pypy/translator/cli/option.py	Wed Aug  8 16:24:28 2007
@@ -1,6 +1,6 @@
 from pypy.translator.cli.conftest import option
 
-_defaultopt = dict(wd = False, source = False, nostop = False, stdout = False, nostackopt = False)
+_defaultopt = dict(wd = False, source = False, nostop = False, stdout = False)
 
 def getoption(name):
     return getattr(option, name, _defaultopt.get(name))