commit f7015fd55a8dc969ac2440ffc829a6b4d942fb5a
author Logan Chien <loganchien@google.com> Sun Mar 18 01:19:37 2012 +0800
committer Shih-wei Liao <sliao@google.com> Mon Mar 26 21:01:20 2012 -0700
tree 735c4ba7aed0089c073effd5e530e6f53fcdf720
parent 106b2a03be66748a25b9019e4c222cee498d559f

Add ELF loader to load the executables.

(cherry picked from commit 8c9ca414a7ed05c3530973c63496e477e9ca5eb7)

Conflicts:

	src/compiler.cc

Change-Id: I950749625d5b266990c617e2d8cea688fbdc11fb

src/compiler.h

diff --git a/src/compiler.h b/src/compiler.h
index 4adb447..9834d78 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -137,6 +137,26 @@
 #if defined(ART_USE_LLVM_COMPILER)
   void SetElfFileName(std::string const& filename);
   void SetBitcodeFileName(std::string const& filename);
+
+  void EnableAutoElfLoading();
+
+  const void* GetMethodCodeAddr(const CompiledMethod* cm,
+                                const Method* method) const;
+
+  const Method::InvokeStub* GetMethodInvokeStubAddr(const CompiledInvokeStub* cm,
+                                                    const Method* method) const;
+#else
+  void EnableAutoElfLoader() { }
+
+  const void* GetMethodCodeAddr(const CompiledMethod*,
+                                const Method*) const {
+    return NULL;
+  }
+
+  const Method::InvokeStub* GetMethodInvokeStubAddr(const CompiledInvokeStub*,
+                                                    const Method*) const {
+    return NULL;
+  }
 #endif
 
   void SetCompilerContext(void* compiler_context) {
@@ -285,6 +305,7 @@
   typedef void (*CompilerCallbackFn)(Compiler& compiler);
   typedef MutexLock* (*CompilerMutexLockFn)(Compiler& compiler);
 #endif
+
   void* compiler_library_;
 
   typedef CompiledMethod* (*CompilerFn)(Compiler& compiler,
@@ -305,6 +326,20 @@
                                                     const char* shorty, uint32_t shorty_len);
   CreateInvokeStubFn create_invoke_stub_;
 
+#if defined(ART_USE_LLVM_COMPILER)
+  typedef void (*CompilerEnableAutoElfLoadingFn)(Compiler& compiler);
+  CompilerEnableAutoElfLoadingFn compiler_enable_auto_elf_loading_;
+
+  typedef const void* (*CompilerGetMethodCodeAddrFn)
+      (const Compiler& compiler, const CompiledMethod* cm, const Method* method);
+  CompilerGetMethodCodeAddrFn compiler_get_method_code_addr_;
+
+  typedef const Method::InvokeStub* (*CompilerGetMethodInvokeStubAddrFn)
+      (const Compiler& compiler, const CompiledInvokeStub* cm, const Method* method);
+  CompilerGetMethodInvokeStubAddrFn compiler_get_method_invoke_stub_addr_;
+#endif
+
+
   DISALLOW_COPY_AND_ASSIGN(Compiler);
 };