[pypy-svn] pypy default: merge heads

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r42722:9879b1c1d824
Date: 2011-03-16 18:06 +0100
http://bitbucket.org/pypy/pypy/changeset/9879b1c1d824/

Log:	merge heads

diff --git a/pypy/jit/metainterp/simple_optimize.py b/pypy/jit/metainterp/simple_optimize.py
deleted file mode 100644
--- a/pypy/jit/metainterp/simple_optimize.py
+++ /dev/null
@@ -1,56 +0,0 @@
-
-""" Simplified optimize.py
-"""
-
-from pypy.jit.metainterp.resoperation import rop, ResOperation
-from pypy.jit.metainterp import resume, compile
-
-EMPTY_VALUES = {}
-
-def transform(op):
-    from pypy.jit.metainterp.history import AbstractDescr
-    # Rename CALL_PURE and CALL_LOOPINVARIANT to CALL.
-    # Simplify the VIRTUAL_REF_* so that they don't show up in the backend.
-    if op.getopnum() == rop.CALL_PURE:
-        op = ResOperation(rop.CALL, op.getarglist()[1:], op.result,
-                          op.getdescr())
-    elif op.getopnum() == rop.CALL_LOOPINVARIANT:
-        op = op.copy_and_change(rop.CALL)
-    elif op.getopnum() == rop.VIRTUAL_REF:
-        op = ResOperation(rop.SAME_AS, [op.getarg(0)], op.result)
-    elif op.getopnum() == rop.VIRTUAL_REF_FINISH:
-        return []
-    return [op]
-
-def optimize_loop(metainterp_sd, old_loops, loop):
-    if old_loops:
-        assert len(old_loops) == 1
-        return old_loops[0]
-    else:
-        # copy loop operations here
-        # we need it since the backend can modify those lists, which make
-        # get_guard_op in compile.py invalid
-        # in fact, x86 modifies this list for moving GCs
-        memo = resume.ResumeDataLoopMemo(metainterp_sd)
-        newoperations = []
-        for op in loop.operations:
-            if op.is_guard():
-                descr = op.getdescr()
-                assert isinstance(descr, compile.ResumeGuardDescr)
-                modifier = resume.ResumeDataVirtualAdder(descr, memo)
-                newboxes = modifier.finish(EMPTY_VALUES)
-                descr.store_final_boxes(op, newboxes)
-            newoperations.extend(transform(op))
-        loop.operations = newoperations
-        jumpop = newoperations[-1]
-        if jumpop.getopnum() == rop.JUMP:
-            jumpop.setdescr(loop.token)
-        return None
-
-def optimize_bridge(metainterp_sd, old_loops, loop, inline_short_preamble,
-                    retraced):
-    optimize_loop(metainterp_sd, [], loop)
-    jumpop = loop.operations[-1]
-    if jumpop.getopnum() == rop.JUMP:
-        jumpop.setdescr(old_loops[0])
-    return old_loops[0]

diff --git a/pypy/doc/config/translation.jit_ffi.txt b/pypy/doc/config/translation.jit_ffi.txt
deleted file mode 100644
--- a/pypy/doc/config/translation.jit_ffi.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-Internal option: enable OptFfiCall in the jit optimizations.