[pypy-svn] r54217 - in pypy/branch/oo-jit: demo/jit pypy/annotation pypy/annotation/test pypy/config pypy/interpreter pypy/jit pypy/jit/codegen pypy/jit/codegen/demo pypy/jit/codegen/dump pypy/jit/codegen/dump/test pypy/jit/codegen/i386 pypy/jit/codegen/i386/test pypy/jit/codegen/ia32 pypy/jit/codegen/llgraph pypy/jit/codegen/llgraph/test pypy/jit/codegen/llvm pypy/jit/codegen/ppc pypy/jit/codegen/test pypy/jit/hintannotator pypy/jit/hintannotator/test pypy/jit/rainbow pypy/jit/timeshifter pypy/jit/timeshifter/test pypy/jit/tl pypy/lang/prolog pypy/module/pypyjit pypy/objspace/flow pypy/objspace/flow/test pypy/objspace/std pypy/rlib pypy/rlib/test pypy/rpython pypy/rpython/lltypesystem pypy/rpython/lltypesystem/test pypy/rpython/ootypesystem pypy/rpython/ootypesystem/test pypy/rpython/test pypy/tool pypy/translator pypy/translator/backendopt pypy/translator/backendopt/test pypy/translator/c pypy/translator/cli pypy/translator/goal pypy/translator/js pypy/translator/jvm

[arigo at codespeak.net]

Author: arigo
Date: Mon Apr 28 19:34:48 2008
New Revision: 54217

Added:
   pypy/branch/oo-jit/demo/jit/
      - copied from r54216, pypy/branch/jit-hotpath/demo/jit/
   pypy/branch/oo-jit/pypy/annotation/binaryop.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/annotation/binaryop.py.merge.tmp
   pypy/branch/oo-jit/pypy/annotation/builtin.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/annotation/builtin.py.merge.tmp
   pypy/branch/oo-jit/pypy/annotation/description.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/annotation/description.py.merge.tmp
   pypy/branch/oo-jit/pypy/annotation/model.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/annotation/model.py.merge.tmp
   pypy/branch/oo-jit/pypy/annotation/test/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/annotation/test/
   pypy/branch/oo-jit/pypy/config/translationoption.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/config/translationoption.py.merge.tmp
   pypy/branch/oo-jit/pypy/interpreter/pyopcode.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/interpreter/pyopcode.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/demo/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/demo/
   pypy/branch/oo-jit/pypy/jit/codegen/detect_cpu.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/detect_cpu.py
   pypy/branch/oo-jit/pypy/jit/codegen/dump/rgenop.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/dump/rgenop.py
   pypy/branch/oo-jit/pypy/jit/codegen/dump/test/test_dump.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/dump/test/test_dump.py
   pypy/branch/oo-jit/pypy/jit/codegen/dump/test/test_rgenop.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/jit/codegen/dump/test/test_rgenop.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/emit_moves.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/emit_moves.py
   pypy/branch/oo-jit/pypy/jit/codegen/graph2rgenop.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/graph2rgenop.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/operation.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/operation.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/regalloc.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/regalloc.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/rgenop.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/rgenop.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/ri386.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/ri386setup.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/ri386setup.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_auto_encoding.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_auto_encoding.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_exception.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_exception.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_portal.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_portal.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_promotion.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_promotion.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_tl.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tl.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_tlc.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlc.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_tlr.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_tlr.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_ts.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_ts.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_virtualizable.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_virtualizable.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_vlist.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_genc_vlist.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_interp_ts.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_interp_ts.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_operation.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_operation.py
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_rgenop.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/i386/test/test_rgenop.py
   pypy/branch/oo-jit/pypy/jit/codegen/ia32/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/
   pypy/branch/oo-jit/pypy/jit/codegen/llgraph/llimpl.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/jit/codegen/llgraph/llimpl.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/llgraph/rgenop.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/rgenop.py
   pypy/branch/oo-jit/pypy/jit/codegen/llgraph/test/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/llgraph/test/
   pypy/branch/oo-jit/pypy/jit/codegen/llvm/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/llvm/
   pypy/branch/oo-jit/pypy/jit/codegen/model.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/model.py
   pypy/branch/oo-jit/pypy/jit/codegen/ppc/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/ppc/
   pypy/branch/oo-jit/pypy/jit/codegen/support.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/support.py
   pypy/branch/oo-jit/pypy/jit/codegen/test/operation_tests.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/test/operation_tests.py
   pypy/branch/oo-jit/pypy/jit/codegen/test/rgenop_tests.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/jit/codegen/test/rgenop_tests.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/test/test_emit_moves.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/codegen/test/test_emit_moves.py
   pypy/branch/oo-jit/pypy/jit/conftest.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/conftest.py
   pypy/branch/oo-jit/pypy/jit/hintannotator/bookkeeper.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/jit/hintannotator/bookkeeper.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/hintannotator/hotpath.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/hintannotator/hotpath.py
   pypy/branch/oo-jit/pypy/jit/hintannotator/model.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/hintannotator/model.py
   pypy/branch/oo-jit/pypy/jit/hintannotator/policy.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/hintannotator/policy.py
   pypy/branch/oo-jit/pypy/jit/hintannotator/test/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/jit/hintannotator/test/
   pypy/branch/oo-jit/pypy/jit/rainbow/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/jit/rainbow/
   pypy/branch/oo-jit/pypy/jit/timeshifter/booleffect.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/booleffect.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/exception.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/jit/timeshifter/exception.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/timeshifter/greenkey.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/greenkey.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/oop.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/oop.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/rcontainer.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/rcontainer.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/rdump.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/rdump.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/rtimeshift.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/rtimeshift.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/rvalue.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvalue.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/rvirtualizable.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/rvirtualizable.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/support.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/support.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_greenkey.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_greenkey.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_rcontainer.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rcontainer.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_rvalue.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/test/test_rvalue.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/vdict.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/vdict.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/vlist.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/jit/timeshifter/vlist.py
   pypy/branch/oo-jit/pypy/jit/tl/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/jit/tl/
   pypy/branch/oo-jit/pypy/lang/prolog/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/lang/prolog/
   pypy/branch/oo-jit/pypy/module/pypyjit/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/module/pypyjit/
   pypy/branch/oo-jit/pypy/objspace/flow/objspace.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/objspace/flow/objspace.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/flow/test/test_objspace.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/objspace/flow/test/test_objspace.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/std/boolobject.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/objspace/std/boolobject.py
   pypy/branch/oo-jit/pypy/objspace/std/complexobject.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/objspace/std/complexobject.py
   pypy/branch/oo-jit/pypy/objspace/std/floatobject.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/objspace/std/floatobject.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/std/intobject.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/objspace/std/intobject.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/std/longobject.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/objspace/std/longobject.py
   pypy/branch/oo-jit/pypy/objspace/std/sliceobject.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/objspace/std/sliceobject.py
   pypy/branch/oo-jit/pypy/objspace/std/stringobject.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/objspace/std/stringobject.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/std/tupleobject.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/objspace/std/tupleobject.py
   pypy/branch/oo-jit/pypy/objspace/std/unicodeobject.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/objspace/std/unicodeobject.py.merge.tmp
   pypy/branch/oo-jit/pypy/rlib/debug.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rlib/debug.py
   pypy/branch/oo-jit/pypy/rlib/jit.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rlib/jit.py
   pypy/branch/oo-jit/pypy/rlib/objectmodel.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rlib/objectmodel.py.merge.tmp
   pypy/branch/oo-jit/pypy/rlib/test/test_jit.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rlib/test/test_jit.py
   pypy/branch/oo-jit/pypy/rpython/annlowlevel.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/annlowlevel.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/error.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/error.py
   pypy/branch/oo-jit/pypy/rpython/llinterp.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/llinterp.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/llmemory.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/lltypesystem/llmemory.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/lloperation.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/lltypesystem/lloperation.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/lltype.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/lltypesystem/lltype.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/opimpl.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/opimpl.py
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/rpbc.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/lltypesystem/rpbc.py
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/test/test_lloperation.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/lltypesystem/test/test_lloperation.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/ooopimpl.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/ooopimpl.py
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/ootype.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/ootypesystem/ootype.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rbuiltin.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/ootypesystem/rbuiltin.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rclass.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/ootypesystem/rclass.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rootype.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/ootypesystem/rootype.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rpbc.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rpbc.py
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rtuple.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/ootypesystem/rtuple.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rtupletype.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/rtupletype.py
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/test/
      - copied from r54216, pypy/branch/jit-hotpath/pypy/rpython/ootypesystem/test/
   pypy/branch/oo-jit/pypy/rpython/rpbc.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/rpbc.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/rtyper.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/rtyper.py
   pypy/branch/oo-jit/pypy/rpython/test/test_llann.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/test/test_llann.py
   pypy/branch/oo-jit/pypy/rpython/test/test_rclass.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/rpython/test/test_rclass.py
   pypy/branch/oo-jit/pypy/rpython/test/test_rlist.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/rpython/test/test_rlist.py.merge.tmp
   pypy/branch/oo-jit/pypy/tool/ansi_print.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/tool/ansi_print.py
   pypy/branch/oo-jit/pypy/translator/backendopt/constfold.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/translator/backendopt/constfold.py
   pypy/branch/oo-jit/pypy/translator/backendopt/graphanalyze.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/translator/backendopt/graphanalyze.py
   pypy/branch/oo-jit/pypy/translator/backendopt/malloc.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/translator/backendopt/malloc.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/backendopt/test/test_constfold.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/translator/backendopt/test/test_constfold.py
   pypy/branch/oo-jit/pypy/translator/backendopt/test/test_graphanalyze.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/translator/backendopt/test/test_graphanalyze.py
   pypy/branch/oo-jit/pypy/translator/c/funcgen.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/translator/c/funcgen.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/cli/opcodes.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/translator/cli/opcodes.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/driver.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/translator/driver.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/exceptiontransform.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/translator/exceptiontransform.py
   pypy/branch/oo-jit/pypy/translator/goal/richards.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/translator/goal/richards.py
   pypy/branch/oo-jit/pypy/translator/goal/targetpypystandalone.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/translator/goal/targetpypystandalone.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/goal/translate.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/translator/goal/translate.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/js/opcodes.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/translator/js/opcodes.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/jvm/opcodes.py
      - copied unchanged from r54216, pypy/branch/oo-jit/pypy/translator/jvm/opcodes.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/translator.py
      - copied unchanged from r54216, pypy/branch/jit-hotpath/pypy/translator/translator.py
Removed:
   pypy/branch/oo-jit/pypy/annotation/binaryop.py.merge.tmp
   pypy/branch/oo-jit/pypy/annotation/builtin.py.merge.tmp
   pypy/branch/oo-jit/pypy/annotation/description.py.merge.tmp
   pypy/branch/oo-jit/pypy/annotation/model.py.merge.tmp
   pypy/branch/oo-jit/pypy/config/translationoption.py.merge.tmp
   pypy/branch/oo-jit/pypy/interpreter/pyopcode.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/dump/test/test_rgenop.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/i386/test/test_genc_ts.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/llgraph/llimpl.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/codegen/test/rgenop_tests.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/hintannotator/bookkeeper.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/timeshifter/exception.py.merge.tmp
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_0tlc.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_1tl.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_exception.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_frontend.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_portal.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_promotion.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_tlr.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_vdict.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_virtualizable.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/test/test_vlist.py
   pypy/branch/oo-jit/pypy/jit/timeshifter/transform.py
   pypy/branch/oo-jit/pypy/objspace/flow/objspace.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/flow/test/test_objspace.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/std/floatobject.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/std/intobject.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/std/stringobject.py.merge.tmp
   pypy/branch/oo-jit/pypy/objspace/std/unicodeobject.py.merge.tmp
   pypy/branch/oo-jit/pypy/rlib/objectmodel.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/annlowlevel.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/llinterp.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/llmemory.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/lloperation.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/lltype.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/lltypesystem/test/test_lloperation.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/ootype.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rbuiltin.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rclass.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rootype.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/ootypesystem/rtuple.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/rpbc.py.merge.tmp
   pypy/branch/oo-jit/pypy/rpython/test/test_rlist.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/backendopt/malloc.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/c/funcgen.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/cli/opcodes.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/driver.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/goal/targetpypystandalone.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/goal/translate.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/js/opcodes.py.merge.tmp
   pypy/branch/oo-jit/pypy/translator/jvm/opcodes.py.merge.tmp
Log:
(antocuni, arigo)

Complete the merge of jit-hotpath into oo-jit, which is a fresh copy
of the trunk.