[pypy-svn] r35611 - in pypy/dist/pypy: config jit/goal

arigo at codespeak.net arigo at codespeak.net
Tue Dec 12 03:06:09 CET 2006


Author: arigo
Date: Tue Dec 12 03:06:07 2006
New Revision: 35611

Modified:
   pypy/dist/pypy/config/translationoption.py
   pypy/dist/pypy/jit/goal/targetjit.py
Log:
Port targetjit to the latest config refactoring.


Modified: pypy/dist/pypy/config/translationoption.py
==============================================================================
--- pypy/dist/pypy/config/translationoption.py	(original)
+++ pypy/dist/pypy/config/translationoption.py	Tue Dec 12 03:06:07 2006
@@ -77,7 +77,8 @@
                cmdline=None),
     ChoiceOption("fork_before",
                  "(UNIX) Create restartable checkpoint before step",
-                 ["annotate", "rtype", "backendopt", "database", "source"],
+                 ["annotate", "rtype", "backendopt", "database", "source",
+                  "hintannotate", "timeshift"],
                  default=None, cmdline="--fork-before"),
 
     OptionDescription("backendopt", "Backend Optimization Options", [

Modified: pypy/dist/pypy/jit/goal/targetjit.py
==============================================================================
--- pypy/dist/pypy/jit/goal/targetjit.py	(original)
+++ pypy/dist/pypy/jit/goal/targetjit.py	Tue Dec 12 03:06:07 2006
@@ -29,12 +29,12 @@
 
     usage = "target PyPy with JIT"
 
-    #def target(self, driver, args):
-    #    from pypy.jit.goal.x import main
-    #    return main, None
+    def target(self, driver, args):
+        config = driver.config
+        config.objspace.usemodules.pypyjit = True
+        return super(PyPyJITTarget, self).target(driver, args)
 
     def handle_config(self, config):
-        config.objspace.usemodules.pypyjit = True
         config.translation.backendopt.inline_threshold = 0
         config.translation.backendopt.merge_if_blocks = False
         config.translation.fork_before = 'hintannotate'



More information about the Pypy-commit mailing list