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.h

diff --git a/src/oat.h b/src/oat.h
index d1e177f..cd3330b 100644
--- a/src/oat.h
+++ b/src/oat.h
@@ -30,7 +30,6 @@
   OatHeader();
   OatHeader(InstructionSet instruction_set,
             const std::vector<const DexFile*>* dex_files,
-            uint32_t elf_image_count,
             uint32_t image_file_location_checksum,
             const std::string& image_file_location);
 
@@ -39,11 +38,8 @@
   uint32_t GetChecksum() const;
   void UpdateChecksum(const void* data, size_t length);
   uint32_t GetDexFileCount() const;
-  uint32_t GetElfImageCount() const;
-  uint32_t GetElfImageTableOffset() const;
   uint32_t GetExecutableOffset() const;
   InstructionSet GetInstructionSet() const;
-  void SetElfImageTableOffset(uint32_t elf_image_offset);
   void SetExecutableOffset(uint32_t executable_offset);
   uint32_t GetImageFileLocationChecksum() const;
   uint32_t GetImageFileLocationSize() const;
@@ -60,8 +56,6 @@
 
   InstructionSet instruction_set_;
   uint32_t dex_file_count_;
-  uint32_t elf_image_count_;
-  uint32_t elf_image_table_offset_;
   uint32_t executable_offset_;
 
   uint32_t image_file_location_checksum_;
@@ -74,6 +68,7 @@
 class PACKED OatMethodOffsets {
  public:
   OatMethodOffsets();
+
   OatMethodOffsets(uint32_t code_offset,
                    uint32_t frame_size_in_bytes,
                    uint32_t core_spill_mask,
@@ -83,14 +78,10 @@
                    uint32_t gc_map_offset,
                    uint32_t invoke_stub_offset
 #if defined(ART_USE_LLVM_COMPILER)
-                 , 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
                    );
+
   ~OatMethodOffsets();
 
   uint32_t code_offset_;
@@ -103,12 +94,7 @@
   uint32_t invoke_stub_offset_;
 
 #if defined(ART_USE_LLVM_COMPILER)
-  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
 };