commit e24fa61603a60ade3797e4a0c8b3fccb346cb048
author Brian Carlstrom <bdc@google.com> Thu Sep 29 00:53:55 2011 -0700
committer Brian Carlstrom <bdc@google.com> Mon Oct 03 10:28:05 2011 -0700
tree 9ec5ed942eb9ece6d4d261ffd21956c94f9968fe
parent 06cbeb990e94f9c4576601e27145fe132e34a686

Separate oat from image

Change-Id: If2abdb99826ead14e3465d90ba2acffd89709389

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index 015f638..2051051 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -74,7 +74,9 @@
       LOG(FATAL) << "Failed to create space from " << boot_image_file_name;
     }
     spaces_.push_back(boot_space);
-    requested_base = boot_space->GetBase() + RoundUp(boot_space->Size(), kPageSize);
+    byte* oat_limit_addr = boot_space->GetImageHeader().GetOatLimitAddr();
+    requested_base = reinterpret_cast<byte*>(RoundUp(reinterpret_cast<uintptr_t>(oat_limit_addr),
+                                                     kPageSize));
   }
 
   std::vector<Space*> image_spaces;
@@ -85,7 +87,9 @@
     }
     image_spaces.push_back(space);
     spaces_.push_back(space);
-    requested_base = space->GetBase() + RoundUp(space->Size(), kPageSize);
+    byte* oat_limit_addr = space->GetImageHeader().GetOatLimitAddr();
+    requested_base = reinterpret_cast<byte*>(RoundUp(reinterpret_cast<uintptr_t>(oat_limit_addr),
+                                                     kPageSize));
   }
 
   Space* space = Space::Create(initial_size, maximum_size, requested_base);