[pypy-svn] r67394 - pypy/branch/pyjitpl5-llmodel-merge/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Tue Sep  1 16:13:28 2009
New Revision: 67394

Added:
   pypy/branch/pyjitpl5-llmodel-merge/pypy/jit/metainterp/warmspot.py.merge.tmp
      - copied, changed from r67389, pypy/branch/pyjitpl5-llmodel-merge/pypy/jit/metainterp/warmspot.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/pyjitpl5-llmodel/pypy/jit/metainterp/warmspot.py
revisions 67298 to 67389:

    ------------------------------------------------------------------------
    r67331 | arigo | 2009-08-29 23:00:29 +0200 (Sat, 29 Aug 2009) | 2 lines
    
    In-progress.  We can now at least test directly the code in gc.py.
    
    ------------------------------------------------------------------------
    r67299 | arigo | 2009-08-29 11:56:39 +0200 (Sat, 29 Aug 2009) | 3 lines
    
    A branch to try to extract as much of the x86 backend as possible
    into generic code for LL backends.
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5-llmodel-merge/pypy/jit/metainterp/warmspot.py.merge.tmp (from r67389, pypy/branch/pyjitpl5-llmodel-merge/pypy/jit/metainterp/warmspot.py)
==============================================================================
--- pypy/branch/pyjitpl5-llmodel-merge/pypy/jit/metainterp/warmspot.py	(original)
+++ pypy/branch/pyjitpl5-llmodel-merge/pypy/jit/metainterp/warmspot.py.merge.tmp	Tue Sep  1 16:13:28 2009
@@ -217,7 +217,7 @@
         else:
             annhelper = None
         cpu = CPUClass(self.translator.rtyper, self.stats,
-                       translate_support_code, annhelper, self.gcdescr)
+                       translate_support_code, gcdescr=self.gcdescr)
         self.cpu = cpu
         self.metainterp_sd = MetaInterpStaticData(self.portal_graph,
                                                   self.translator.graphs, cpu,