commit 874a47ec6b188d523e1198e62a457df86f9cd8cd
author Elliott Hughes <enh@google.com> Tue Apr 17 10:23:57 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 17 10:23:57 2012 -0700
tree b813ee02d1704e16e7c357239d5a546558148c65
parent cc2293ce2f9fa88a65818e6b20e1ba1ba50a07ab
parent 40b8857fbd8e1b9067af95b35746f823fea146b0

am 40b8857f: Merge "Implement the x86 initialize-type...from-code entry points." into ics-mr1-plus-art

* commit '40b8857fbd8e1b9067af95b35746f823fea146b0':
  Implement the x86 initialize-type...from-code entry points.

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index 155e8be..ccedf5d 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -316,13 +316,14 @@
       compiler_(NULL),
       compiler_context_(NULL),
       jni_compiler_(NULL),
-      create_invoke_stub_(NULL)
-#if defined(ART_USE_LLVM_COMPILER)
-    , compiler_enable_auto_elf_loading_(NULL),
+#if !defined(ART_USE_LLVM_COMPILER)
+      create_invoke_stub_(NULL) {
+#else
+      create_invoke_stub_(NULL),
+      compiler_enable_auto_elf_loading_(NULL),
       compiler_get_method_code_addr_(NULL),
-      compiler_get_method_invoke_stub_addr_(NULL)
+      compiler_get_method_invoke_stub_addr_(NULL) {
 #endif
-{
   std::string compiler_so_name(MakeCompilerSoName(instruction_set_));
   compiler_library_ = dlopen(compiler_so_name.c_str(), RTLD_LAZY);
   if (compiler_library_ == NULL) {

src/compiler_llvm/compilation_unit.cc

diff --git a/src/compiler_llvm/compilation_unit.cc b/src/compiler_llvm/compilation_unit.cc
index 32f1786..975f961 100644
--- a/src/compiler_llvm/compilation_unit.cc
+++ b/src/compiler_llvm/compilation_unit.cc
@@ -198,7 +198,6 @@
   target_options.NoFramePointerElim = true;
   target_options.NoFramePointerElimNonLeaf = true;
   target_options.UseSoftFloat = false;
-  target_options.EnableFastISel = true;
 
   // Create the llvm::TargetMachine
   llvm::TargetMachine* target_machine =

src/native/java_lang_Runtime.cc

diff --git a/src/native/java_lang_Runtime.cc b/src/native/java_lang_Runtime.cc
index 1b5520b..4789f4e 100644
--- a/src/native/java_lang_Runtime.cc
+++ b/src/native/java_lang_Runtime.cc
@@ -32,11 +32,8 @@
   Runtime::Current()->GetHeap()->CollectGarbage(false);
 }
 
-static void Runtime_nativeExit(JNIEnv*, jclass, jint status, jboolean isExit) {
-  // isExit is true for System.exit and false for System.halt.
-  if (isExit) {
-    Runtime::Current()->CallExitHook(status);
-  }
+static void Runtime_nativeExit(JNIEnv*, jclass, jint status) {
+  Runtime::Current()->CallExitHook(status);
   exit(status);
 }
 
@@ -80,7 +77,7 @@
     NATIVE_METHOD(Runtime, freeMemory, "()J"),
     NATIVE_METHOD(Runtime, gc, "()V"),
     NATIVE_METHOD(Runtime, maxMemory, "()J"),
-    NATIVE_METHOD(Runtime, nativeExit, "(IZ)V"),
+    NATIVE_METHOD(Runtime, nativeExit, "(I)V"),
     NATIVE_METHOD(Runtime, nativeLoad, "(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/String;"),
     NATIVE_METHOD(Runtime, totalMemory, "()J"),
 };

src/stack.cc

diff --git a/src/stack.cc b/src/stack.cc
index 5dda584..d724a72 100644
--- a/src/stack.cc
+++ b/src/stack.cc
@@ -102,13 +102,8 @@
  */
 int Frame::GetVRegOffset(const DexFile::CodeItem* code_item,
                          uint32_t core_spills, uint32_t fp_spills,
-                         size_t frame_size, int reg)
-{
-#if defined(ART_USE_LLVM_COMPILER)
-  LOG(FATAL) << "LLVM compiler don't support this function";
-  return 0;
-#else
-  DCHECK_EQ( frame_size & (kStackAlignment - 1), 0U);
+                         size_t frame_size, int reg) {
+  DCHECK_EQ(frame_size & (kStackAlignment - 1), 0U);
   int num_spills = __builtin_popcount(core_spills) + __builtin_popcount(fp_spills) + 1 /* filler */;
   int num_ins = code_item->ins_size_;
   int num_regs = code_item->registers_size_ - num_ins;
@@ -122,7 +117,6 @@
   } else {
     return frame_size + ((reg - num_regs) * sizeof(uint32_t)) + sizeof(uint32_t); // Dalvik in
   }
-#endif
 }
 
 uint32_t Frame::GetVReg(const DexFile::CodeItem* code_item, uint32_t core_spills,