[pypy-svn] r36815 - in pypy/dist/pypy/jit/codegen: . i386 ppc

[mwh at codespeak.net]

Author: mwh
Date: Tue Jan 16 16:41:03 2007
New Revision: 36815

Added:
   pypy/dist/pypy/jit/codegen/conftest.py
Modified:
   pypy/dist/pypy/jit/codegen/i386/conftest.py
   pypy/dist/pypy/jit/codegen/i386/rgenop.py
   pypy/dist/pypy/jit/codegen/ppc/conftest.py
   pypy/dist/pypy/jit/codegen/ppc/rgenop.py
Log:
move --trap into a new codegen.conftest


Added: pypy/dist/pypy/jit/codegen/conftest.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/jit/codegen/conftest.py	Tue Jan 16 16:41:03 2007
@@ -0,0 +1,7 @@
+import py
+Option = py.test.Config.Option
+
+option = py.test.Config.addoptions("codegen options",
+        Option('--trap', action="store_true", default=False,
+               dest="trap",
+               help="generate a breakpoint instruction at the start"))

Modified: pypy/dist/pypy/jit/codegen/i386/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/conftest.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/conftest.py	Tue Jan 16 16:41:03 2007
@@ -18,9 +18,6 @@
 Option = py.test.Config.Option
 
 option = py.test.Config.addoptions("ppc options",
-        Option('--trap', action="store_true", default=False,
-               dest="trap",
-               help="generate a breakpoint instruction at the start"),
         Option('--interp', action="store_true", default=False,
                dest="interp",
                help="run the very slow genc_interp_* tests"),

Modified: pypy/dist/pypy/jit/codegen/i386/rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/rgenop.py	Tue Jan 16 16:41:03 2007
@@ -7,7 +7,7 @@
 from pypy.jit.codegen.i386.ri386 import *
 from pypy.jit.codegen.i386.ri386setup import Conditions
 from pypy.jit.codegen.i386.codebuf import CodeBlockOverflow
-from pypy.jit.codegen.i386 import conftest
+from pypy.jit.codegen import conftest
 from pypy.rpython.annlowlevel import llhelper
 
 

Modified: pypy/dist/pypy/jit/codegen/ppc/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/ppc/conftest.py	(original)
+++ pypy/dist/pypy/jit/codegen/ppc/conftest.py	Tue Jan 16 16:41:03 2007
@@ -18,9 +18,6 @@
 Option = py.test.Config.Option
 
 option = py.test.Config.addoptions("ppc options",
-        Option('--trap', action="store_true", default=False,
-               dest="trap",
-               help=""),
         Option('--run-interp-tests', action="store_true", default=False,
                dest="run_interp_tests",
                help=""),

Modified: pypy/dist/pypy/jit/codegen/ppc/rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/ppc/rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/ppc/rgenop.py	Tue Jan 16 16:41:03 2007
@@ -4,7 +4,7 @@
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython.lltypesystem import lloperation
 from pypy.rlib.objectmodel import specialize, we_are_translated
-from pypy.jit.codegen.ppc.conftest import option
+from pypy.jit.codegen.conftest import option
 from ctypes import POINTER, cast, c_void_p, c_int
 
 from pypy.jit.codegen.ppc import codebuf