Merge "Change suspend entrypoint to save all registers."

diff --cc compiler/image_writer.cc
Simple merge

diff --cc compiler/optimizing/code_generator.cc
Simple merge

diff --cc compiler/optimizing/code_generator_arm.cc
Simple merge

diff --cc compiler/optimizing/code_generator_arm64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_mips.cc
Simple merge

diff --cc compiler/optimizing/code_generator_mips64.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86.cc
Simple merge

diff --cc compiler/optimizing/code_generator_x86_64.cc
Simple merge

diff --cc oatdump/oatdump.cc
Simple merge

diff --cc runtime/arch/arm/quick_entrypoints_arm.S
Simple merge

diff --cc runtime/arch/arm/quick_method_frame_info_arm.h
Simple merge

diff --cc runtime/arch/arm64/quick_entrypoints_arm64.S
Simple merge

diff --cc runtime/arch/arm64/quick_method_frame_info_arm64.h
Simple merge

diff --cc runtime/arch/mips/quick_method_frame_info_mips.h
Simple merge

diff --cc runtime/arch/mips64/quick_method_frame_info_mips64.h
Simple merge

diff --cc runtime/arch/x86/quick_entrypoints_x86.S
Simple merge

diff --cc runtime/arch/x86/quick_method_frame_info_x86.h
Simple merge

diff --cc runtime/arch/x86_64/quick_entrypoints_x86_64.S
Simple merge

diff --cc runtime/arch/x86_64/quick_method_frame_info_x86_64.h
Simple merge

diff --cc runtime/gc/space/image_space.cc
Simple merge

diff --cc runtime/generated/asm_support_gen.h
index f5d5181,ff70cbe..c66029d
--- 1/runtime/generated/asm_support_gen.h
--- 2/runtime/generated/asm_support_gen.h
+++ b/runtime/generated/asm_support_gen.h
@@@ -32,14 -33,16 +32,16 @@@ DEFINE_CHECK_EQ(static_cast<size_t>(RUN
  DEFINE_CHECK_EQ(static_cast<size_t>(RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET), (static_cast<size_t>(art::Runtime::GetCalleeSaveMethodOffset(art::Runtime:: kRefsOnly))))
  #define RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET 0x10
  DEFINE_CHECK_EQ(static_cast<size_t>(RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET), (static_cast<size_t>(art::Runtime::GetCalleeSaveMethodOffset(art::Runtime:: kRefsAndArgs))))
+ #define RUNTIME_SAVE_EVERYTHING_CALLEE_SAVE_FRAME_OFFSET 0x18
+ DEFINE_CHECK_EQ(static_cast<size_t>(RUNTIME_SAVE_EVERYTHING_CALLEE_SAVE_FRAME_OFFSET), (static_cast<size_t>(art::Runtime::GetCalleeSaveMethodOffset(art::Runtime:: kSaveEverything))))
  #define THREAD_FLAGS_OFFSET 0
 -DEFINE_CHECK_EQ(static_cast<int32_t>(THREAD_FLAGS_OFFSET), (static_cast<int32_t>(art::Thread:: ThreadFlagsOffset<sizeof(void*)>().Int32Value())))
 +DEFINE_CHECK_EQ(static_cast<int32_t>(THREAD_FLAGS_OFFSET), (static_cast<int32_t>(art::Thread:: ThreadFlagsOffset<art::kRuntimePointerSize>().Int32Value())))
  #define THREAD_ID_OFFSET 12
 -DEFINE_CHECK_EQ(static_cast<int32_t>(THREAD_ID_OFFSET), (static_cast<int32_t>(art::Thread:: ThinLockIdOffset<sizeof(void*)>().Int32Value())))
 +DEFINE_CHECK_EQ(static_cast<int32_t>(THREAD_ID_OFFSET), (static_cast<int32_t>(art::Thread:: ThinLockIdOffset<art::kRuntimePointerSize>().Int32Value())))
  #define THREAD_IS_GC_MARKING_OFFSET 52
 -DEFINE_CHECK_EQ(static_cast<int32_t>(THREAD_IS_GC_MARKING_OFFSET), (static_cast<int32_t>(art::Thread:: IsGcMarkingOffset<sizeof(void*)>().Int32Value())))
 +DEFINE_CHECK_EQ(static_cast<int32_t>(THREAD_IS_GC_MARKING_OFFSET), (static_cast<int32_t>(art::Thread:: IsGcMarkingOffset<art::kRuntimePointerSize>().Int32Value())))
  #define THREAD_CARD_TABLE_OFFSET 128
 -DEFINE_CHECK_EQ(static_cast<int32_t>(THREAD_CARD_TABLE_OFFSET), (static_cast<int32_t>(art::Thread:: CardTableOffset<sizeof(void*)>().Int32Value())))
 +DEFINE_CHECK_EQ(static_cast<int32_t>(THREAD_CARD_TABLE_OFFSET), (static_cast<int32_t>(art::Thread:: CardTableOffset<art::kRuntimePointerSize>().Int32Value())))
  #define CODEITEM_INSNS_OFFSET 16
  DEFINE_CHECK_EQ(static_cast<int32_t>(CODEITEM_INSNS_OFFSET), (static_cast<int32_t>(__builtin_offsetof(art::DexFile::CodeItem, insns_))))
  #define MIRROR_OBJECT_CLASS_OFFSET 0

diff --cc runtime/image.h
Simple merge