[pypy-svn] r65990 - pypy/branch/pyjitpl5/pypy/jit/metainterp

[fijal at codespeak.net]

Author: fijal
Date: Fri Jun 26 06:32:28 2009
New Revision: 65990

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/warmspot.py
Log:
use optimize4 by default


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	Fri Jun 26 06:32:28 2009
@@ -970,7 +970,7 @@
             self.optimize_bridge = optimizer.optimize_bridge
             self.get_optimizer_name = optimizer.get_optimizer_name
         else:
-            from pypy.jit.metainterp import optimize
+            from pypy.jit.metainterp import optimize4 as optimize
             self.optimize_loop = optimize.optimize_loop
             self.optimize_bridge = optimize.optimize_bridge
             self.get_optimizer_name = optimize.get_optimizer_name

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/warmspot.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/warmspot.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/warmspot.py	Fri Jun 26 06:32:28 2009
@@ -31,7 +31,6 @@
 PROFILE = False
 
 def apply_jit(translator, backend_name="auto", **kwds):
-    from pypy.jit.metainterp import optimize4 as Optimizer
     if 'CPUClass' not in kwds:
         from pypy.jit.backend.detect_cpu import getcpuclass
         kwds['CPUClass'] = getcpuclass(backend_name)
@@ -42,7 +41,6 @@
     warmrunnerdesc = WarmRunnerDesc(translator,
                                     translate_support_code=True,
                                     listops=True,
-                                    optimizer=Optimizer,
                                     profile=profile,
                                     **kwds)
     warmrunnerdesc.finish()