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

diff --git a/src/oat.cc b/src/oat.cc
index ce7c133..cd9e0a3 100644
--- a/src/oat.cc
+++ b/src/oat.cc
@@ -29,7 +29,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) {
   memcpy(magic_, kOatMagic, sizeof(kOatMagic));
@@ -43,9 +42,6 @@
   dex_file_count_ = dex_files->size();
   UpdateChecksum(&dex_file_count_, sizeof(dex_file_count_));
 
-  elf_image_count_ = elf_image_count;
-  UpdateChecksum(&elf_image_count_, sizeof(elf_image_count_));
-
   image_file_location_checksum_ = image_file_location_checksum;
   UpdateChecksum(&image_file_location_checksum_, sizeof(image_file_location_checksum_));
 
@@ -53,7 +49,6 @@
   UpdateChecksum(&image_file_location_size_, sizeof(image_file_location_size_));
   UpdateChecksum(image_file_location.data(), image_file_location_size_);
 
-  elf_image_table_offset_ = 0;
   executable_offset_ = 0;
 }
 
@@ -77,16 +72,6 @@
   return dex_file_count_;
 }
 
-uint32_t OatHeader::GetElfImageCount() const {
-  DCHECK(IsValid());
-  return elf_image_count_;
-}
-
-uint32_t OatHeader::GetElfImageTableOffset() const {
-  DCHECK(IsValid());
-  return elf_image_table_offset_;
-}
-
 uint32_t OatHeader::GetChecksum() const {
   CHECK(IsValid());
   return adler32_checksum_;
@@ -131,12 +116,6 @@
                      GetImageFileLocationSize());
 }
 
-void OatHeader::SetElfImageTableOffset(uint32_t elf_image_table_offset) {
-  DCHECK(IsValid());
-  elf_image_table_offset_ = elf_image_table_offset;
-  UpdateChecksum(&elf_image_table_offset_, sizeof(elf_image_table_offset_));
-}
-
 void OatHeader::SetExecutableOffset(uint32_t executable_offset) {
   DCHECK_ALIGNED(executable_offset, kPageSize);
   CHECK_GT(executable_offset, sizeof(OatHeader));
@@ -156,12 +135,6 @@
     vmap_table_offset_(0),
     gc_map_offset_(0),
     invoke_stub_offset_(0)
-#if defined(ART_USE_LLVM_COMPILER)
-  , code_elf_idx_(static_cast<uint16_t>(-1u)),
-    code_elf_func_idx_(static_cast<uint16_t>(-1u)),
-    invoke_stub_elf_idx_(static_cast<uint16_t>(-1u)),
-    invoke_stub_elf_func_idx_(static_cast<uint16_t>(-1u))
-#endif
 {}
 
 OatMethodOffsets::OatMethodOffsets(uint32_t code_offset,
@@ -173,12 +146,7 @@
                                    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
                                    )
   : code_offset_(code_offset),
@@ -190,12 +158,7 @@
     gc_map_offset_(gc_map_offset),
     invoke_stub_offset_(invoke_stub_offset)
 #if defined(ART_USE_LLVM_COMPILER)
-  , code_elf_idx_(code_elf_idx),
-    code_elf_func_idx_(code_elf_func_idx),
-    invoke_stub_elf_idx_(invoke_stub_elf_idx),
-    invoke_stub_elf_func_idx_(invoke_stub_elf_func_idx),
-    proxy_stub_elf_idx_(proxy_stub_elf_idx),
-    proxy_stub_elf_func_idx_(proxy_stub_elf_func_idx)
+  , proxy_stub_offset_(proxy_stub_offset)
 #endif
 {}