commit 95dfa6a8c522ad84a492d88666ea69fe7a3852c5
author Logan Chien <loganchien@google.com> Fri Jun 01 16:08:02 2012 +0800
committer Shih-wei Liao <sliao@google.com> Wed Jun 06 21:15:07 2012 -0700
tree 8e0d56021463754f2ea55ef53bf03aca49f79a68
parent a1beb1f8d37e5a02af12d80e59012f68112b3113

Refine compiler runtime function list.

This CL includes several changes:

1. Define 3 different compiler runtime function list
   for different architecture:

   - COMPILER_RUNTIME_FUNC_LIST_ARM
   - COMPILER_RUNTIME_FUNC_LIST_MIPS
   - COMPILER_RUNTIME_FUNC_LIST_X86

2. Split MIPS compiler runtime function list from the
   X86 version.

3. Replace COMPILER_RUNTIME_FUNC_LIST with
   COMPILER_RUNTIME_FUNC_LIST_NATIVE.  "Native" means
   the host of the runtime.

Change-Id: Ic18b793dd8c153cac4f7bc82dcd07e44576b7f58

src/compiler_llvm/runtime_support_llvm.cc

diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc
index dcd4d96..bf74e06 100644
--- a/src/compiler_llvm/runtime_support_llvm.cc
+++ b/src/compiler_llvm/runtime_support_llvm.cc
@@ -15,6 +15,7 @@
  */
 
 #include "class_linker.h"
+#include "compiler_runtime_func_list.h"
 #include "dex_file.h"
 #include "dex_instruction.h"
 #include "nth_caller_visitor.h"
@@ -22,6 +23,7 @@
 #include "object_utils.h"
 #include "reflection.h"
 #include "runtime_support.h"
+#include "runtime_support_func_list.h"
 #include "runtime_support_llvm.h"
 #include "ScopedLocalRef.h"
 #include "shadow_frame.h"
@@ -587,27 +589,20 @@
 
 #define EXTERNAL_LINKAGE(NAME) \
 extern "C" void NAME(...);
-
-#include "compiler_runtime_func_list.h"
-COMPILER_RUNTIME_FUNC_LIST(EXTERNAL_LINKAGE)
-#undef COMPILER_RUNTIME_FUNC_LIST
+COMPILER_RUNTIME_FUNC_LIST_NATIVE(EXTERNAL_LINKAGE)
 #undef EXTERNAL_LINKAGE
 
 static void* art_find_compiler_runtime_func(char const* name) {
 // TODO: If target support some math func, use the target's version. (e.g. art_d2i -> __aeabi_d2iz)
   static const char* const names[] = {
 #define DEFINE_ENTRY(NAME) #NAME ,
-#include "compiler_runtime_func_list.h"
-    COMPILER_RUNTIME_FUNC_LIST(DEFINE_ENTRY)
-#undef COMPILER_RUNTIME_FUNC_LIST
+    COMPILER_RUNTIME_FUNC_LIST_NATIVE(DEFINE_ENTRY)
 #undef DEFINE_ENTRY
   };
 
   static void* const funcs[] = {
 #define DEFINE_ENTRY(NAME) reinterpret_cast<void*>(NAME) ,
-#include "compiler_runtime_func_list.h"
-    COMPILER_RUNTIME_FUNC_LIST(DEFINE_ENTRY)
-#undef COMPILER_RUNTIME_FUNC_LIST
+    COMPILER_RUNTIME_FUNC_LIST_NATIVE(DEFINE_ENTRY)
 #undef DEFINE_ENTRY
   };
 
@@ -797,10 +792,7 @@
   static struct func_entry_t const tab[] = {
 #define DEFINE_ENTRY(ID, NAME) \
     { #NAME, sizeof(#NAME) - 1, reinterpret_cast<void*>(NAME) },
-
-#include "runtime_support_func_list.h"
     RUNTIME_SUPPORT_FUNC_LIST(DEFINE_ENTRY)
-#undef RUNTIME_SUPPORT_FUNC_LIST
 #undef DEFINE_ENTRY
   };