commit 700c8d31733534a3d978b75a03f6f7e177dc7e81
author Brian Carlstrom <bdc@google.com> Mon Nov 05 10:42:02 2012 -0800
committer Brian Carlstrom <bdc@google.com> Fri Jan 25 14:28:43 2013 -0800
tree 6b9d8d93a70e31dba3b0a880f886ce408776314c
parent 9adbff5b85fcae2b3e2443344415f6c17ea3ba0a

Move .oat files to ELF format

Generates .oat in ELF file format using MCLinker
- Uses MCLinker IRBuilder to create a synthetic .o from OatWriter output.
- Uses new ElfFile for prelinking to support art image optimizations.

Adapted OatFile to load using dlopen, ElfFile, or memory, removing raw MemMap mechanism.

Changed image code to not assume oat data will be immediately after
image to allow space for ELF headers.

Passes test-art and works with installd.

Change-Id: Idc026eddb5de93f4b97490c405f3ed7b39589749

src/oat_test.cc

diff --git a/src/oat_test.cc b/src/oat_test.cc
index 6f0e7b6..ec0fa7d 100644
--- a/src/oat_test.cc
+++ b/src/oat_test.cc
@@ -16,7 +16,7 @@
 
 #include "oat_file.h"
 #include "oat_writer.h"
-#include "file_output_stream.h"
+#include "vector_output_stream.h"
 
 #include "common_test.h"
 
@@ -80,27 +80,28 @@
 
   ScopedObjectAccess soa(Thread::Current());
   ScratchFile tmp;
-  FileOutputStream file_output_stream(tmp.GetFile());
-  bool success = OatWriter::Create(file_output_stream,
-                                   class_linker->GetBootClassPath(),
-                                   42U,
-                                   4096U,
-                                   "lue.art",
-                                   *compiler_.get());
-  ASSERT_TRUE(success);
+  std::vector<uint8_t> oat_contents;
+  VectorOutputStream output_stream(tmp.GetFilename(), oat_contents);
+  bool success_oat = OatWriter::Create(output_stream,
+                                       class_linker->GetBootClassPath(),
+                                       42U,
+                                       4096U,
+                                       "lue.art",
+                                       *compiler_.get());
+  ASSERT_TRUE(success_oat);
+  bool success_elf = compiler_->WriteElf(oat_contents, tmp.GetFile());
+  ASSERT_TRUE(success_elf);
 
   if (compile) {  // OatWriter strips the code, regenerate to compare
     compiler_->CompileAll(class_loader, class_linker->GetBootClassPath());
   }
-  UniquePtr<OatFile> oat_file(OatFile::Open(tmp.GetFilename(),
-                                            tmp.GetFilename(),
-                                            NULL));
+  UniquePtr<OatFile> oat_file(OatFile::Open(tmp.GetFilename(), tmp.GetFilename(), NULL));
   ASSERT_TRUE(oat_file.get() != NULL);
   const OatHeader& oat_header = oat_file->GetOatHeader();
   ASSERT_TRUE(oat_header.IsValid());
   ASSERT_EQ(1U, oat_header.GetDexFileCount());
   ASSERT_EQ(42U, oat_header.GetImageFileLocationOatChecksum());
-  ASSERT_EQ(4096U, oat_header.GetImageFileLocationOatBegin());
+  ASSERT_EQ(4096U, oat_header.GetImageFileLocationOatDataBegin());
   ASSERT_EQ("lue.art", oat_header.GetImageFileLocation());
 
   const DexFile* dex_file = java_lang_dex_file_;