[pypy-svn] r40696 - in pypy/dist/pypy: annotation interpreter jit jit/codegen jit/codegen/demo jit/codegen/dump jit/codegen/i386 jit/codegen/llgraph jit/codegen/llvm jit/codegen/ppc jit/codegen/test jit/goal jit/hintannotator jit/timeshifter jit/timeshifter/test module/_stackless module/pypyjit objspace/flow objspace/std rlib rlib/test rpython rpython/lltypesystem rpython/lltypesystem/test rpython/ootypesystem rpython/test translator translator/backendopt translator/backendopt/test translator/c translator/c/test translator/cli translator/goal translator/js translator/llvm translator/llvm/test translator/oosupport translator/oosupport/test_template translator/tool translator/tool/pygame translator/tool/test

arigo at codespeak.net arigo at codespeak.net
Sun Mar 18 14:35:40 CET 2007


Author: arigo
Date: Sun Mar 18 14:35:37 2007
New Revision: 40696

Added:
   pypy/dist/pypy/annotation/binaryop.py
      - copied unchanged from r40695, pypy/dist/pypy/annotation/binaryop.py.merge.tmp
   pypy/dist/pypy/interpreter/function.py
      - copied unchanged from r40695, pypy/dist/pypy/interpreter/function.py.merge.tmp
   pypy/dist/pypy/interpreter/gateway.py
      - copied unchanged from r40695, pypy/dist/pypy/interpreter/gateway.py.merge.tmp
   pypy/dist/pypy/interpreter/pyframe.py
      - copied unchanged from r40695, pypy/dist/pypy/interpreter/pyframe.py.merge.tmp
   pypy/dist/pypy/interpreter/pyopcode.py
      - copied unchanged from r40695, pypy/dist/pypy/interpreter/pyopcode.py.merge.tmp
   pypy/dist/pypy/jit/TODO.txt
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/TODO.txt
   pypy/dist/pypy/jit/codegen/demo/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/jit/codegen/demo/
   pypy/dist/pypy/jit/codegen/dump/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/jit/codegen/dump/
   pypy/dist/pypy/jit/codegen/i386/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/jit/codegen/i386/
   pypy/dist/pypy/jit/codegen/llgraph/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/jit/codegen/llgraph/
   pypy/dist/pypy/jit/codegen/llvm/rgenop.py
      - copied unchanged from r40695, pypy/dist/pypy/jit/codegen/llvm/rgenop.py.merge.tmp
   pypy/dist/pypy/jit/codegen/model.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/codegen/model.py
   pypy/dist/pypy/jit/codegen/ppc/rgenop.py
      - copied unchanged from r40695, pypy/dist/pypy/jit/codegen/ppc/rgenop.py.merge.tmp
   pypy/dist/pypy/jit/codegen/test/operation_tests.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/codegen/test/operation_tests.py
   pypy/dist/pypy/jit/codegen/test/rgenop_tests.py
      - copied unchanged from r40695, pypy/dist/pypy/jit/codegen/test/rgenop_tests.py.merge.tmp
   pypy/dist/pypy/jit/goal/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/jit/goal/
   pypy/dist/pypy/jit/hintannotator/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/jit/hintannotator/
   pypy/dist/pypy/jit/timeshifter/exception.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/exception.py
   pypy/dist/pypy/jit/timeshifter/hrtyper.py
      - copied unchanged from r40695, pypy/dist/pypy/jit/timeshifter/hrtyper.py.merge.tmp
   pypy/dist/pypy/jit/timeshifter/oop.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/oop.py
   pypy/dist/pypy/jit/timeshifter/rcontainer.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/rcontainer.py
   pypy/dist/pypy/jit/timeshifter/rtimeshift.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/rtimeshift.py
   pypy/dist/pypy/jit/timeshifter/rvalue.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/rvalue.py
   pypy/dist/pypy/jit/timeshifter/test/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/test/
   pypy/dist/pypy/jit/timeshifter/transform.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/transform.py
   pypy/dist/pypy/jit/timeshifter/vdict.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/vdict.py
   pypy/dist/pypy/jit/timeshifter/vlist.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/jit/timeshifter/vlist.py
   pypy/dist/pypy/module/_stackless/coroutine.py
      - copied unchanged from r40695, pypy/dist/pypy/module/_stackless/coroutine.py.merge.tmp
   pypy/dist/pypy/module/pypyjit/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/module/pypyjit/
   pypy/dist/pypy/objspace/flow/flowcontext.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/objspace/flow/flowcontext.py
   pypy/dist/pypy/objspace/flow/model.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/objspace/flow/model.py
   pypy/dist/pypy/objspace/std/multimethod.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/objspace/std/multimethod.py
   pypy/dist/pypy/objspace/std/objspace.py
      - copied unchanged from r40695, pypy/dist/pypy/objspace/std/objspace.py.merge.tmp
   pypy/dist/pypy/objspace/std/typeobject.py
      - copied unchanged from r40695, pypy/dist/pypy/objspace/std/typeobject.py.merge.tmp
   pypy/dist/pypy/rlib/objectmodel.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rlib/objectmodel.py
   pypy/dist/pypy/rlib/test/test_objectmodel.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rlib/test/test_objectmodel.py
   pypy/dist/pypy/rpython/llinterp.py
      - copied unchanged from r40695, pypy/dist/pypy/rpython/llinterp.py.merge.tmp
   pypy/dist/pypy/rpython/lltypesystem/lloperation.py
      - copied unchanged from r40695, pypy/dist/pypy/rpython/lltypesystem/lloperation.py.merge.tmp
   pypy/dist/pypy/rpython/lltypesystem/opimpl.py
      - copied unchanged from r40695, pypy/dist/pypy/rpython/lltypesystem/opimpl.py.merge.tmp
   pypy/dist/pypy/rpython/lltypesystem/rclass.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rpython/lltypesystem/rclass.py
   pypy/dist/pypy/rpython/lltypesystem/rdict.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rpython/lltypesystem/rdict.py
   pypy/dist/pypy/rpython/lltypesystem/rstr.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rpython/lltypesystem/rstr.py
   pypy/dist/pypy/rpython/lltypesystem/rvirtualizable.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rpython/lltypesystem/rvirtualizable.py
   pypy/dist/pypy/rpython/lltypesystem/test/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/rpython/lltypesystem/test/
   pypy/dist/pypy/rpython/ootypesystem/rpbc.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rpython/ootypesystem/rpbc.py
   pypy/dist/pypy/rpython/rlist.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rpython/rlist.py
   pypy/dist/pypy/rpython/rpbc.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rpython/rpbc.py
   pypy/dist/pypy/rpython/test/test_llinterp.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/rpython/test/test_llinterp.py
   pypy/dist/pypy/rpython/test/test_rpbc.py
      - copied unchanged from r40695, pypy/dist/pypy/rpython/test/test_rpbc.py.merge.tmp
   pypy/dist/pypy/translator/backendopt/all.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/backendopt/all.py.merge.tmp
   pypy/dist/pypy/translator/backendopt/removeassert.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/backendopt/removeassert.py.merge.tmp
   pypy/dist/pypy/translator/backendopt/support.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/backendopt/support.py.merge.tmp
   pypy/dist/pypy/translator/backendopt/test/test_removeassert.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/translator/backendopt/test/test_removeassert.py
   pypy/dist/pypy/translator/c/exceptiontransform.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/c/exceptiontransform.py.merge.tmp
   pypy/dist/pypy/translator/c/funcgen.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/c/funcgen.py.merge.tmp
   pypy/dist/pypy/translator/c/test/test_symbolic.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/translator/c/test/test_symbolic.py
   pypy/dist/pypy/translator/cli/opcodes.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/cli/opcodes.py.merge.tmp
   pypy/dist/pypy/translator/goal/ann_override.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/goal/ann_override.py.merge.tmp
   pypy/dist/pypy/translator/goal/richards.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/translator/goal/richards.py
   pypy/dist/pypy/translator/js/function.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/js/function.py.merge.tmp
   pypy/dist/pypy/translator/js/opcodes.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/js/opcodes.py.merge.tmp
   pypy/dist/pypy/translator/llvm/opwriter.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/llvm/opwriter.py.merge.tmp
   pypy/dist/pypy/translator/llvm/test/test_symbolic.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/translator/llvm/test/test_symbolic.py
   pypy/dist/pypy/translator/oosupport/metavm.py
      - copied unchanged from r40695, pypy/dist/pypy/translator/oosupport/metavm.py.merge.tmp
   pypy/dist/pypy/translator/oosupport/test_template/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/translator/oosupport/test_template/
   pypy/dist/pypy/translator/tool/pygame/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/translator/tool/pygame/
   pypy/dist/pypy/translator/tool/taskengine.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/translator/tool/taskengine.py
   pypy/dist/pypy/translator/tool/test/
      - copied from r40695, pypy/branch/jit-virtual-world/pypy/translator/tool/test/
   pypy/dist/pypy/translator/transform.py
      - copied unchanged from r40695, pypy/branch/jit-virtual-world/pypy/translator/transform.py
Removed:
   pypy/dist/pypy/annotation/binaryop.py.merge.tmp
   pypy/dist/pypy/interpreter/function.py.merge.tmp
   pypy/dist/pypy/interpreter/gateway.py.merge.tmp
   pypy/dist/pypy/interpreter/pyframe.py.merge.tmp
   pypy/dist/pypy/interpreter/pyopcode.py.merge.tmp
   pypy/dist/pypy/jit/codegen/llvm/rgenop.py.merge.tmp
   pypy/dist/pypy/jit/codegen/ppc/rgenop.py.merge.tmp
   pypy/dist/pypy/jit/codegen/test/rgenop_tests.py.merge.tmp
   pypy/dist/pypy/jit/timeshifter/hrtyper.py.merge.tmp
   pypy/dist/pypy/module/_stackless/coroutine.py.merge.tmp
   pypy/dist/pypy/objspace/std/objspace.py.merge.tmp
   pypy/dist/pypy/objspace/std/typeobject.py.merge.tmp
   pypy/dist/pypy/rpython/llinterp.py.merge.tmp
   pypy/dist/pypy/rpython/lltypesystem/lloperation.py.merge.tmp
   pypy/dist/pypy/rpython/lltypesystem/opimpl.py.merge.tmp
   pypy/dist/pypy/rpython/test/test_rpbc.py.merge.tmp
   pypy/dist/pypy/translator/backendopt/all.py.merge.tmp
   pypy/dist/pypy/translator/backendopt/removeassert.py.merge.tmp
   pypy/dist/pypy/translator/backendopt/support.py.merge.tmp
   pypy/dist/pypy/translator/c/exceptiontransform.py.merge.tmp
   pypy/dist/pypy/translator/c/funcgen.py.merge.tmp
   pypy/dist/pypy/translator/cli/opcodes.py.merge.tmp
   pypy/dist/pypy/translator/goal/ann_override.py.merge.tmp
   pypy/dist/pypy/translator/js/function.py.merge.tmp
   pypy/dist/pypy/translator/js/opcodes.py.merge.tmp
   pypy/dist/pypy/translator/llvm/opwriter.py.merge.tmp
   pypy/dist/pypy/translator/oosupport/metavm.py.merge.tmp
Log:
(pedronis, arigo)

Complete the merge of the jit-virtual-world branch.




More information about the Pypy-commit mailing list