[pypy-svn] r31700 - in pypy/dist/pypy/jit: codegen/i386 codegen/i386/test codegen/llgraph timeshifter timeshifter/test

[ac at codespeak.net]

Author: ac
Date: Sat Aug 26 20:47:49 2006
New Revision: 31700

Modified:
   pypy/dist/pypy/jit/codegen/i386/ri386genop.py
   pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py
   pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py
   pypy/dist/pypy/jit/codegen/llgraph/rgenop.py
   pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py
   pypy/dist/pypy/jit/timeshifter/timeshift.py
Log:
(arre, pedronis)

kill get_rgenop_for_testing.



Modified: pypy/dist/pypy/jit/codegen/i386/ri386genop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/ri386genop.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/ri386genop.py	Sat Aug 26 20:47:49 2006
@@ -325,10 +325,6 @@
     def __init__(self):
         self.mcs = []   # machine code blocks where no-one is currently writing
 
-    def get_rgenop_for_testing():
-        return RI386GenOp()
-    get_rgenop_for_testing = staticmethod(get_rgenop_for_testing)
-
     def open_mc(self):
         if self.mcs:
             # XXX think about inserting NOPS for alignment

Modified: pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_genc_ts.py	Sat Aug 26 20:47:49 2006
@@ -59,7 +59,7 @@
                     if j == i:
                         os.write(1, '-->\n')
                     return 1
-            rgenop = RGenOp.get_rgenop_for_testing()
+            rgenop = RGenOp()
             generated = ml_generate_code(rgenop, *mainargs)
             os.write(1, SEPLINE)
             res = generated(*residualargs)

Modified: pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py	(original)
+++ pypy/dist/pypy/jit/codegen/i386/test/test_interp_ts.py	Sat Aug 26 20:47:49 2006
@@ -5,17 +5,10 @@
 
 import py; py.test.skip("in-progress")
 
-class LLTypeRI386GenOp(RI386GenOp):
-    from pypy.jit.codegen.i386.codebuf import LLTypeMachineCodeBlock as MachineCodeBlock
-    
-    def get_rgenop_for_testing():
-        return LLTypeRI386GenOp()
-    get_rgenop_for_testing = staticmethod(get_rgenop_for_testing)
-
 
 class TestTimeshiftI386LLInterp(test_timeshift.TestTimeshift):
-    RGenOp = LLTypeRI386GenOp
-
+    class RGenOp(RI386GenOp):
+        from pypy.jit.codegen.i386.codebuf import LLTypeMachineCodeBlock as MachineCodeBlock
     
     def timeshift(self, ll_function, values, opt_consts=[], *args, **kwds):
         self.timeshift_cached(ll_function, values, *args, **kwds)

Modified: pypy/dist/pypy/jit/codegen/llgraph/rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/llgraph/rgenop.py	(original)
+++ pypy/dist/pypy/jit/codegen/llgraph/rgenop.py	Sat Aug 26 20:47:49 2006
@@ -103,10 +103,6 @@
         return llimpl.buildgraph(b)
     buildgraph = staticmethod(buildgraph)
 
-    def get_rgenop_for_testing():
-        return rgenop
-    get_rgenop_for_testing = staticmethod(get_rgenop_for_testing)
-
     def _freeze_(self):
         return True    # no real point in using a full class in llgraph
 

Modified: pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/test/test_timeshift.py	Sat Aug 26 20:47:49 2006
@@ -211,7 +211,7 @@
 ##        ml_call_residual_graph = self.ml_call_residual_graph
 
         def ml_main(*args):
-            rgenop = RGenOp.get_rgenop_for_testing()
+            rgenop = RGenOp()
             return ml_generate_code(rgenop, *args)
 
         ml_main.args_s = ml_generate_code.args_s[1:]

Modified: pypy/dist/pypy/jit/timeshifter/timeshift.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/timeshift.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/timeshift.py	Sat Aug 26 20:47:49 2006
@@ -52,7 +52,7 @@
         self.r_box_accum.setup()
 
         def ll_make_builder():
-            rgenop = RGenOp.get_rgenop_for_testing()
+            rgenop = RGenOp()
             return rtimeshift.make_builder(rgenop)
 
         # XXX find a different way to enforce the interface types