commit 0f0899ac8fbaa470922976d058bbb144fb9eea06
author Logan Chien <loganchien@google.com> Fri Mar 23 10:48:18 2012 +0800
committer Shih-wei Liao <sliao@google.com> Mon Mar 26 21:09:19 2012 -0700
tree c89031b21e24111b0a0cde440224104661cf4cf8
parent 3d6bfca7985c8446db60a2be4e4f03e66167e162

Add ElfImage to hold ELF image address and size.

(cherry picked from commit 578763dc6630156b163933720a85f8d34cbab652)

Change-Id: I76d03130eabb100869ea941c9e4fd92cc9244eeb

src/compiler_llvm/elf_loader.cc

diff --git a/src/compiler_llvm/elf_loader.cc b/src/compiler_llvm/elf_loader.cc
index f309b82..ccb02ad 100644
--- a/src/compiler_llvm/elf_loader.cc
+++ b/src/compiler_llvm/elf_loader.cc
@@ -17,6 +17,7 @@
 #include "elf_loader.h"
 
 #include "compiled_method.h"
+#include "elf_image.h"
 #include "logging.h"
 #include "object.h"
 #include "runtime_support_llvm.h"
@@ -36,7 +37,7 @@
 }
 
 
-bool ElfLoader::LoadElfAt(size_t elf_idx, const byte* image, size_t size) {
+bool ElfLoader::LoadElfAt(size_t elf_idx, const ElfImage& elf_image) {
   if (elf_idx < executables_.size() && executables_[elf_idx] != NULL) {
     return false;
   }
@@ -46,11 +47,13 @@
   }
 
   RSExecRef executable =
-    rsloaderCreateExec(reinterpret_cast<const unsigned char*>(image),
-                       size, art_find_runtime_support_func, NULL);
+    rsloaderCreateExec(elf_image.begin(), elf_image.size(),
+                       art_find_runtime_support_func, NULL);
 
   if (executable == NULL) {
-    LOG(WARNING) << "Failed to load ELF image: " << image << " size: " << size;
+    LOG(WARNING) << "Failed to load ELF"
+                 << " image: " << elf_image.begin()
+                 << " size: " << elf_image.size();
     return false;
   }