834b394ee759ed31c5371d8093d7cd8cd90014a8 - SHIFTPHONES/android_art

commit	834b394ee759ed31c5371d8093d7cd8cd90014a8	[log] [tgz]
author	Brian Carlstrom <bdc@google.com>	Wed Jul 31 11:26:53 2013 -0700
committer	The Android Automerger <android-build@android.com>	Wed Jul 31 17:36:29 2013 -0700
tree	f6aa5056f824f7ad81c8eac11d59b54a2e3b8d46
parent	025218c7e4330a4942b14f9a8f1f68bd3390261c [diff]

Merge remote-tracking branch 'goog/dalvik-dev' into merge-art-to-dalvik-dev

Change-Id: I323e9e8c29c3e39d50d9aba93121b26266c52a46

build/Android.common.mk[diff]
build/Android.gtest.mk[diff]
compiler/Android.mk[diff]
compiler/dex/dex_to_dex_compiler.cc[diff]
compiler/dex/quick/arm/call_arm.cc[diff]
compiler/dex/quick/arm/fp_arm.cc[diff]
compiler/dex/quick/arm/int_arm.cc[diff]
compiler/dex/quick/gen_common.cc[diff]
compiler/dex/quick/gen_invoke.cc[diff]
compiler/dex/quick/mips/call_mips.cc[diff]
compiler/dex/quick/mips/fp_mips.cc[diff]
compiler/dex/quick/mips/int_mips.cc[diff]
compiler/dex/quick/x86/call_x86.cc[diff]
compiler/dex/quick/x86/fp_x86.cc[diff]
compiler/dex/quick/x86/int_x86.cc[diff]
compiler/driver/compiler_driver.cc[diff]
compiler/driver/compiler_driver.h[diff]
compiler/driver/compiler_driver_test.cc[diff]
compiler/jni/quick/arm/calling_convention_arm.cc[diff]
compiler/jni/quick/calling_convention.h[diff]
compiler/jni/quick/jni_compiler.cc[diff]
compiler/jni/quick/mips/calling_convention_mips.cc[diff]
compiler/jni/quick/x86/calling_convention_x86.cc[diff]
compiler/llvm/runtime_support_builder.cc[diff]
compiler/llvm/runtime_support_llvm_func.h[diff]
compiler/llvm/runtime_support_llvm_func_list.h[Renamed from runtime/runtime_support_llvm_func_list.h - diff]
compiler/sea_ir/code_gen.cc[diff]
compiler/sea_ir/frontend.cc[diff]
compiler/sea_ir/instruction_nodes.h[diff]
compiler/sea_ir/sea.cc[diff]
compiler/sea_ir/sea.h[diff]
compiler/sea_ir/sea_node.h[diff]
compiler/stubs/portable/stubs.cc[diff]
compiler/stubs/quick/stubs.cc[diff]
compiler/utils/arm/assembler_arm.cc[Renamed from runtime/oat/utils/arm/assembler_arm.cc - diff]
compiler/utils/arm/assembler_arm.h[Renamed from runtime/oat/utils/arm/assembler_arm.h - diff]
compiler/utils/arm/constants_arm.h[Renamed from runtime/constants_arm.h - diff]
compiler/utils/arm/managed_register_arm.cc[Renamed from runtime/oat/utils/arm/managed_register_arm.cc - diff]
compiler/utils/arm/managed_register_arm.h[Renamed from runtime/oat/utils/arm/managed_register_arm.h - diff]
compiler/utils/arm/managed_register_arm_test.cc[Renamed from runtime/oat/utils/arm/managed_register_arm_test.cc - diff]
compiler/utils/assembler.cc[Renamed from runtime/oat/utils/assembler.cc - diff]
compiler/utils/assembler.h[Renamed from runtime/oat/utils/assembler.h - diff]
compiler/utils/managed_register.h[Renamed from runtime/oat/utils/managed_register.h - diff]
compiler/utils/mips/assembler_mips.cc[Renamed from runtime/oat/utils/mips/assembler_mips.cc - diff]
compiler/utils/mips/assembler_mips.h[Renamed from runtime/oat/utils/mips/assembler_mips.h - diff]
compiler/utils/mips/constants_mips.h[Renamed from runtime/constants_mips.h - diff]
compiler/utils/mips/managed_register_mips.cc[Renamed from runtime/oat/utils/mips/managed_register_mips.cc - diff]
compiler/utils/mips/managed_register_mips.h[Renamed from runtime/oat/utils/mips/managed_register_mips.h - diff]
compiler/utils/x86/assembler_x86.cc[Renamed from runtime/oat/utils/x86/assembler_x86.cc - diff]
compiler/utils/x86/assembler_x86.h[Renamed from runtime/oat/utils/x86/assembler_x86.h - diff]
compiler/utils/x86/assembler_x86_test.cc[Renamed from runtime/oat/utils/x86/assembler_x86_test.cc - diff]
compiler/utils/x86/constants_x86.h[Renamed from runtime/constants_x86.h - diff]
compiler/utils/x86/managed_register_x86.cc[Renamed from runtime/oat/utils/x86/managed_register_x86.cc - diff]
compiler/utils/x86/managed_register_x86.h[Renamed from runtime/oat/utils/x86/managed_register_x86.h - diff]
compiler/utils/x86/managed_register_x86_test.cc[Renamed from runtime/oat/utils/x86/managed_register_x86_test.cc - diff]
compiler/vector_output_stream.cc[Renamed from runtime/vector_output_stream.cc - diff]
compiler/vector_output_stream.h[Renamed from runtime/vector_output_stream.h - diff]
dex2oat/dex2oat.cc[diff]
runtime/Android.mk[diff]
runtime/arch/arm/asm_support_arm.S[Added - diff]
runtime/arch/arm/asm_support_arm.h[Added - diff]
runtime/arch/arm/context_arm.cc[Renamed from runtime/oat/runtime/arm/context_arm.cc - diff]
runtime/arch/arm/context_arm.h[Renamed from runtime/oat/runtime/arm/context_arm.h - diff]
runtime/arch/arm/entrypoints_init_arm.cc[Added - diff]
runtime/arch/arm/jni_entrypoints_arm.S[Added - diff]
runtime/arch/arm/portable_entrypoints_arm.S[Added - diff]
runtime/arch/arm/quick_entrypoints_arm.S[Renamed from runtime/oat/runtime/arm/runtime_support_arm.S - diff]
runtime/arch/arm/registers_arm.cc[Added - diff]
runtime/arch/arm/registers_arm.h[Added - diff]
runtime/arch/arm/thread_arm.cc[Copied from runtime/thread_arm.cc - diff]
runtime/arch/context.cc[Renamed from runtime/oat/runtime/context.cc - diff]
runtime/arch/context.h[Renamed from runtime/oat/runtime/context.h - diff]
runtime/arch/mips/asm_support_mips.S[Added - diff]
runtime/arch/mips/asm_support_mips.h[Added - diff]
runtime/arch/mips/context_mips.cc[Renamed from runtime/oat/runtime/mips/context_mips.cc - diff]
runtime/arch/mips/context_mips.h[Renamed from runtime/oat/runtime/mips/context_mips.h - diff]
runtime/arch/mips/entrypoints_init_mips.cc[Added - diff]
runtime/arch/mips/jni_entrypoints_mips.S[Added - diff]
runtime/arch/mips/portable_entrypoints_mips.S[Added - diff]
runtime/arch/mips/quick_entrypoints_mips.S[Renamed from runtime/oat/runtime/mips/runtime_support_mips.S - diff]
runtime/arch/mips/registers_mips.cc[Added - diff]
runtime/arch/mips/registers_mips.h[Added - diff]
runtime/arch/mips/thread_mips.cc[Renamed from runtime/thread_arm.cc - diff]
runtime/arch/x86/asm_support_x86.S[Added - diff]
runtime/arch/x86/asm_support_x86.h[Copied from runtime/thread_arm.cc - diff]
runtime/arch/x86/context_x86.cc[Renamed from runtime/oat/runtime/x86/context_x86.cc - diff]
runtime/arch/x86/context_x86.h[Renamed from runtime/oat/runtime/x86/context_x86.h - diff]
runtime/arch/x86/entrypoints_init_x86.cc[Added - diff]
runtime/arch/x86/jni_entrypoints_x86.S[Added - diff]
runtime/arch/x86/portable_entrypoints_x86.S[Added - diff]
runtime/arch/x86/quick_entrypoints_x86.S[Renamed from runtime/oat/runtime/x86/runtime_support_x86.S - diff]
runtime/arch/x86/registers_x86.cc[Copied from runtime/thread_arm.cc - diff]
runtime/arch/x86/registers_x86.h[Added - diff]
runtime/arch/x86/thread_x86.cc[Renamed from runtime/thread_x86.cc - diff]
runtime/asm_support.h[diff]
runtime/base/mutex.h[diff]
runtime/base/timing_logger.cc[diff]
runtime/base/timing_logger.h[diff]
runtime/class_linker.cc[diff]
runtime/class_linker_test.cc[diff]
runtime/common_test.h[diff]
runtime/debugger.cc[diff]
runtime/dex_instruction.h[diff]
runtime/entrypoints/entrypoint_utils.cc[Renamed from runtime/runtime_support.cc - diff]
runtime/entrypoints/entrypoint_utils.h[Renamed from runtime/runtime_support.h - diff]
runtime/entrypoints/jni/jni_entrypoints.cc[Added - diff]
runtime/entrypoints/math_entrypoints.cc[Added - diff]
runtime/entrypoints/math_entrypoints.h[Added - diff]
runtime/entrypoints/math_entrypoints_test.cc[Renamed from runtime/runtime_support_test.cc - diff]
runtime/entrypoints/portable/portable_alloc_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_argument_visitor.h[Added - diff]
runtime/entrypoints/portable/portable_cast_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_dexcache_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_entrypoints.h[Added - diff]
runtime/entrypoints/portable/portable_field_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_fillarray_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_invoke_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_jni_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_lock_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_proxy_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_stub_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_thread_entrypoints.cc[Added - diff]
runtime/entrypoints/portable/portable_throw_entrypoints.cc[Added - diff]
runtime/entrypoints/quick/callee_save_frame.h[Renamed from runtime/oat/runtime/callee_save_frame.h - diff]
runtime/entrypoints/quick/quick_alloc_entrypoints.cc[Renamed from runtime/oat/runtime/support_alloc.cc - diff]
runtime/entrypoints/quick/quick_argument_visitor.h[Added - diff]
runtime/entrypoints/quick/quick_cast_entrypoints.cc[Renamed from runtime/oat/runtime/support_cast.cc - diff]
runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc[Renamed from runtime/oat/runtime/support_deoptimize.cc - diff]
runtime/entrypoints/quick/quick_dexcache_entrypoints.cc[Renamed from runtime/oat/runtime/support_dexcache.cc - diff]
runtime/entrypoints/quick/quick_entrypoints.h[Renamed from runtime/oat/runtime/oat_support_entrypoints.h - diff]
runtime/entrypoints/quick/quick_field_entrypoints.cc[Renamed from runtime/oat/runtime/support_field.cc - diff]
runtime/entrypoints/quick/quick_fillarray_entrypoints.cc[Renamed from runtime/oat/runtime/support_fillarray.cc - diff]
runtime/entrypoints/quick/quick_instrumentation_entrypoints.cc[Renamed from runtime/oat/runtime/support_instrumentation.cc - diff]
runtime/entrypoints/quick/quick_interpreter_entrypoints.cc[Renamed from runtime/oat/runtime/support_interpreter.cc - diff]
runtime/entrypoints/quick/quick_invoke_entrypoints.cc[Renamed from runtime/oat/runtime/support_invoke.cc - diff]
runtime/entrypoints/quick/quick_jni_entrypoints.cc[Renamed from runtime/oat/runtime/support_jni.cc - diff]
runtime/entrypoints/quick/quick_lock_entrypoints.cc[Renamed from runtime/oat/runtime/support_locks.cc - diff]
runtime/entrypoints/quick/quick_math_entrypoints.cc[Renamed from runtime/oat/runtime/support_math.cc - diff]
runtime/entrypoints/quick/quick_proxy_entrypoints.cc[Added - diff]
runtime/entrypoints/quick/quick_stub_entrypoints.cc[Renamed from runtime/oat/runtime/support_stubs.cc - diff]
runtime/entrypoints/quick/quick_thread_entrypoints.cc[Renamed from runtime/oat/runtime/support_thread.cc - diff]
runtime/entrypoints/quick/quick_throw_entrypoints.cc[Renamed from runtime/oat/runtime/support_throw.cc - diff]
runtime/gc/accounting/atomic_stack.h[diff]
runtime/gc/collector/garbage_collector.h[diff]
runtime/gc/collector/mark_sweep.cc[diff]
runtime/gc/heap.cc[diff]
runtime/gc/heap.h[diff]
runtime/gc/space/dlmalloc_space.cc[diff]
runtime/gc/space/dlmalloc_space.h[diff]
runtime/gc/space/space_test.cc[diff]
runtime/image_test.cc[diff]
runtime/instrumentation.cc[diff]
runtime/interpreter/interpreter.cc[diff]
runtime/mirror/abstract_method-inl.h[diff]
runtime/mirror/abstract_method.cc[diff]
runtime/mirror/abstract_method.h[diff]
runtime/mirror/array.h[diff]
runtime/mirror/object_test.cc[diff]
runtime/native/dalvik_system_VMDebug.cc[diff]
runtime/oat/runtime/argument_visitor.h[Deleted - diff]
runtime/oat/runtime/arm/oat_support_entrypoints_arm.cc[Deleted - diff]
runtime/oat/runtime/mips/oat_support_entrypoints_mips.cc[Deleted - diff]
runtime/oat/runtime/support_proxy.cc[Deleted - diff]
runtime/oat/runtime/x86/oat_support_entrypoints_x86.cc[Deleted - diff]
runtime/oat_test.cc[diff]
runtime/runtime.cc[diff]
runtime/runtime_support_llvm.cc[Deleted - diff]
runtime/runtime_support_llvm.h[Deleted - diff]
runtime/stack.cc[diff]
runtime/stack.h[diff]
runtime/thread.cc[diff]
runtime/thread.h[diff]
runtime/thread_mips.cc[Deleted - diff]
runtime/trace.cc[diff]
runtime/verifier/instruction_flags.cc[diff]
runtime/verifier/instruction_flags.h[diff]
runtime/verifier/method_verifier.cc[diff]
runtime/verifier/method_verifier.h[diff]
runtime/verifier/register_line.cc[diff]
runtime/verifier/register_line.h[diff]
test/ReferenceMap/stack_walk_refmap_jni.cc[diff]

181 files changed

tree: f6aa5056f824f7ad81c8eac11d59b54a2e3b8d46