commit 971bf3f9184010d68b9a3ad30b396fa401af91a3
author Logan Chien <loganchien@google.com> Tue May 01 15:47:55 2012 +0800
committer Shih-wei Liao <sliao@google.com> Wed Jun 27 03:47:58 2012 -0700
tree 493e80309ce41fd21359da8093fbebfd21b7936c
parent 468a7b1fcb2114ec973e31b5276daea0be62c198

Compile method one-by-one.

Change-Id: Ic56fb397f3bd6dee32372eb875261a3383eaf30c

src/oat_file.h

diff --git a/src/oat_file.h b/src/oat_file.h
index a4ca2de..856a033 100644
--- a/src/oat_file.h
+++ b/src/oat_file.h
@@ -25,14 +25,6 @@
 #include "oat.h"
 #include "object.h"
 
-#if defined(ART_USE_LLVM_COMPILER)
-namespace art {
-  namespace compiler_llvm {
-    class ElfLoader;
-  }
-}
-#endif
-
 namespace art {
 
 class OatFile {
@@ -103,37 +95,6 @@
       return invoke_stub_offset_;
     }
 
-#if defined(ART_USE_LLVM_COMPILER)
-    uint16_t GetCodeElfIndex() const {
-      return code_elf_idx_;
-    }
-    uint16_t GetCodeElfFuncIndex() const {
-      return code_elf_func_idx_;
-    }
-    uint16_t GetInvokeStubElfIndex() const {
-      return invoke_stub_elf_idx_;
-    }
-    uint16_t GetInvokeStubElfFuncIndex() const {
-      return invoke_stub_elf_func_idx_;
-    }
-#endif
-
-    bool IsCodeInElf() const {
-#if defined(ART_USE_LLVM_COMPILER)
-      return (code_elf_idx_ != static_cast<uint16_t>(-1));
-#else
-      return false;
-#endif
-    }
-
-    bool IsInvokeStubInElf() const {
-#if defined(ART_USE_LLVM_COMPILER)
-      return (invoke_stub_elf_idx_ != static_cast<uint16_t>(-1));
-#else
-      return false;
-#endif
-    }
-
     const void* GetCode() const;
     uint32_t GetCodeSize() const;
 
@@ -167,13 +128,7 @@
               const uint32_t gc_map_offset,
               const uint32_t invoke_stub_offset
 #if defined(ART_USE_LLVM_COMPILER)
-            , const compiler_llvm::ElfLoader* elf_loader,
-              const uint16_t code_elf_idx,
-              const uint16_t code_elf_func_idx,
-              const uint16_t invoke_stub_elf_idx,
-              const uint16_t invoke_stub_elf_func_idx,
-              const uint16_t proxy_stub_elf_idx,
-              const uint16_t proxy_stub_elf_func_idx
+            , const uint32_t proxy_stub_offset
 #endif
               );
 
@@ -198,14 +153,7 @@
     uint32_t invoke_stub_offset_;
 
 #if defined(ART_USE_LLVM_COMPILER)
-    const compiler_llvm::ElfLoader* elf_loader_;
-
-    uint16_t code_elf_idx_;
-    uint16_t code_elf_func_idx_;
-    uint16_t invoke_stub_elf_idx_;
-    uint16_t invoke_stub_elf_func_idx_;
-    uint16_t proxy_stub_elf_idx_;
-    uint16_t proxy_stub_elf_func_idx_;
+    uint32_t proxy_stub_offset_;
 #endif
 
     friend class OatClass;
@@ -266,43 +214,10 @@
     DISALLOW_COPY_AND_ASSIGN(OatDexFile);
   };
 
-#if defined(ART_USE_LLVM_COMPILER)
-  class OatElfImage {
-   public:
-    const byte* begin() const {
-      return elf_addr_;
-    }
-
-    const byte* end() const {
-      return (elf_addr_ + elf_size_);
-    }
-
-    size_t size() const {
-      return elf_size_;
-    }
-
-   private:
-    OatElfImage(const OatFile* oat_file, const byte* addr, uint32_t size);
-
-    const OatFile* oat_file_;
-    const byte* elf_addr_;
-    uint32_t elf_size_;
-
-    friend class OatFile;
-    DISALLOW_COPY_AND_ASSIGN(OatElfImage);
-  };
-#endif
-
   const OatDexFile* GetOatDexFile(const std::string& dex_file_location,
                                   bool warn_if_not_found = true) const;
   std::vector<const OatDexFile*> GetOatDexFiles() const;
 
-#if defined(ART_USE_LLVM_COMPILER)
-  const OatElfImage* GetOatElfImage(size_t i) const {
-    return oat_elf_images_[i];
-  }
-#endif
-
   size_t Size() const {
     return End() - Begin();
   }
@@ -327,11 +242,6 @@
   typedef SafeMap<std::string, const OatDexFile*> Table;
   Table oat_dex_files_;
 
-#if defined(ART_USE_LLVM_COMPILER)
-  std::vector<OatElfImage*> oat_elf_images_;
-  UniquePtr<compiler_llvm::ElfLoader> elf_loader_;
-#endif
-
   friend class OatClass;
   friend class OatDexFile;
   friend class OatDumper;  // For GetBase and GetLimit