Elliott Hughes | 2faa5f1 | 2012-01-30 14:42:07 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2011 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 16 | |
| 17 | #include "image_writer.h" |
| 18 | |
Brian Carlstrom | 6cd40e5 | 2012-05-03 14:15:11 -0700 | [diff] [blame] | 19 | #include <sys/stat.h> |
Elliott Hughes | 90a3369 | 2011-08-30 13:27:07 -0700 | [diff] [blame] | 20 | |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 21 | #include <vector> |
| 22 | |
Elliott Hughes | 07ed66b | 2012-12-12 18:34:25 -0800 | [diff] [blame] | 23 | #include "base/logging.h" |
Elliott Hughes | 7616005 | 2012-12-12 16:31:20 -0800 | [diff] [blame] | 24 | #include "base/unix_file/fd_file.h" |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 25 | #include "class_linker.h" |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 26 | #include "compiled_method.h" |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 27 | #include "compiler/driver/compiler_driver.h" |
Ian Rogers | 4f6ad8a | 2013-03-18 15:27:28 -0700 | [diff] [blame^] | 28 | #include "dex_file-inl.h" |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 29 | #include "gc/card_table-inl.h" |
Mathieu Chartier | 1c23e1e | 2012-10-12 14:14:11 -0700 | [diff] [blame] | 30 | #include "gc/large_object_space.h" |
| 31 | #include "gc/space.h" |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 32 | #include "globals.h" |
| 33 | #include "heap.h" |
Brian Carlstrom | 4a289ed | 2011-08-16 17:17:49 -0700 | [diff] [blame] | 34 | #include "image.h" |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 35 | #include "intern_table.h" |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 36 | #include "mirror/array-inl.h" |
| 37 | #include "mirror/class-inl.h" |
| 38 | #include "mirror/class_loader.h" |
| 39 | #include "mirror/dex_cache.h" |
| 40 | #include "mirror/field-inl.h" |
| 41 | #include "mirror/abstract_method-inl.h" |
| 42 | #include "mirror/object-inl.h" |
| 43 | #include "mirror/object_array-inl.h" |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 44 | #include "oat.h" |
Logan Chien | 0c717dd | 2012-03-28 18:31:07 +0800 | [diff] [blame] | 45 | #include "oat_file.h" |
Ian Rogers | 6d4d9fc | 2011-11-30 16:24:48 -0800 | [diff] [blame] | 46 | #include "object_utils.h" |
Brian Carlstrom | 1f87008 | 2011-08-23 16:02:11 -0700 | [diff] [blame] | 47 | #include "runtime.h" |
Ian Rogers | 00f7d0e | 2012-07-19 15:28:27 -0700 | [diff] [blame] | 48 | #include "scoped_thread_state_change.h" |
Ian Rogers | 1f53934 | 2012-10-03 21:09:42 -0700 | [diff] [blame] | 49 | #include "sirt_ref.h" |
Elliott Hughes | a168c83 | 2012-06-12 15:34:20 -0700 | [diff] [blame] | 50 | #include "UniquePtr.h" |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 51 | #include "utils.h" |
| 52 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 53 | using namespace art::mirror; |
| 54 | |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 55 | namespace art { |
| 56 | |
Brian Carlstrom | a004aa9 | 2012-02-08 18:05:09 -0800 | [diff] [blame] | 57 | bool ImageWriter::Write(const std::string& image_filename, |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 58 | uintptr_t image_begin, |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 59 | const std::string& oat_filename, |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 60 | const std::string& oat_location, |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 61 | const CompilerDriver& compiler_driver) { |
Brian Carlstrom | a004aa9 | 2012-02-08 18:05:09 -0800 | [diff] [blame] | 62 | CHECK(!image_filename.empty()); |
Brian Carlstrom | aded5f7 | 2011-10-07 17:15:04 -0700 | [diff] [blame] | 63 | |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 64 | CHECK_NE(image_begin, 0U); |
| 65 | image_begin_ = reinterpret_cast<byte*>(image_begin); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 66 | |
Elliott Hughes | b3bd5f0 | 2012-03-08 21:05:27 -0800 | [diff] [blame] | 67 | Heap* heap = Runtime::Current()->GetHeap(); |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 68 | const Spaces& spaces = heap->GetSpaces(); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 69 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 70 | ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); |
| 71 | const std::vector<DexCache*>& all_dex_caches = class_linker->GetDexCaches(); |
| 72 | for (size_t i = 0; i < all_dex_caches.size(); i++) { |
| 73 | DexCache* dex_cache = all_dex_caches[i]; |
Ian Rogers | 64b6d14 | 2012-10-29 16:34:15 -0700 | [diff] [blame] | 74 | dex_caches_.insert(dex_cache); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 75 | } |
| 76 | |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 77 | UniquePtr<File> oat_file(OS::OpenFile(oat_filename.c_str(), true, false)); |
| 78 | if (oat_file.get() == NULL) { |
| 79 | LOG(ERROR) << "Failed to open oat file " << oat_filename << " for " << oat_location; |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 80 | return false; |
| 81 | } |
Brian Carlstrom | 265091e | 2013-01-30 14:08:26 -0800 | [diff] [blame] | 82 | oat_file_ = OatFile::OpenWritable(oat_file.get(), oat_location); |
Elliott Hughes | b25c3f6 | 2012-03-26 16:35:06 -0700 | [diff] [blame] | 83 | class_linker->RegisterOatFile(*oat_file_); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 84 | |
Ian Rogers | 00f7d0e | 2012-07-19 15:28:27 -0700 | [diff] [blame] | 85 | { |
| 86 | Thread::Current()->TransitionFromSuspendedToRunnable(); |
| 87 | PruneNonImageClasses(); // Remove junk |
| 88 | ComputeLazyFieldsForImageClasses(); // Add useful information |
| 89 | ComputeEagerResolvedStrings(); |
| 90 | Thread::Current()->TransitionFromRunnableToSuspended(kNative); |
| 91 | } |
Elliott Hughes | b3bd5f0 | 2012-03-08 21:05:27 -0800 | [diff] [blame] | 92 | heap->CollectGarbage(false); // Remove garbage |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 93 | // Trim size of alloc spaces |
| 94 | // TODO: C++0x auto |
| 95 | for (Spaces::const_iterator cur = spaces.begin(); cur != spaces.end(); ++cur) { |
| 96 | if ((*cur)->IsAllocSpace()) { |
| 97 | (*cur)->AsAllocSpace()->Trim(); |
| 98 | } |
| 99 | } |
| 100 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 101 | if (!AllocMemory()) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 102 | return false; |
| 103 | } |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 104 | #ifndef NDEBUG |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 105 | { |
| 106 | ScopedObjectAccess soa(Thread::Current()); |
| 107 | CheckNonImageClassesRemoved(); |
| 108 | } |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 109 | #endif |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 110 | Thread::Current()->TransitionFromSuspendedToRunnable(); |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 111 | size_t oat_loaded_size = 0; |
| 112 | size_t oat_data_offset = 0; |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 113 | compiler_driver.GetOatElfInformation(oat_file.get(), oat_loaded_size, oat_data_offset); |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 114 | CalculateNewObjectOffsets(oat_loaded_size, oat_data_offset); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 115 | CopyAndFixupObjects(); |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 116 | PatchOatCodeAndMethods(compiler_driver); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 117 | Thread::Current()->TransitionFromRunnableToSuspended(kNative); |
Elliott Hughes | d8ddfd5 | 2011-08-15 14:32:53 -0700 | [diff] [blame] | 118 | |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 119 | UniquePtr<File> image_file(OS::OpenFile(image_filename.c_str(), true)); |
| 120 | if (image_file.get() == NULL) { |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 121 | LOG(ERROR) << "Failed to open image file " << image_filename; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 122 | return false; |
| 123 | } |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 124 | if (fchmod(image_file->Fd(), 0644) != 0) { |
Brian Carlstrom | 6cd40e5 | 2012-05-03 14:15:11 -0700 | [diff] [blame] | 125 | PLOG(ERROR) << "Failed to make image file world readable: " << image_filename; |
| 126 | return EXIT_FAILURE; |
| 127 | } |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 128 | bool success = image_file->WriteFully(image_->Begin(), image_end_); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 129 | if (!success) { |
| 130 | PLOG(ERROR) << "Failed to write image file " << image_filename; |
| 131 | return false; |
| 132 | } |
| 133 | return true; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 134 | } |
| 135 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 136 | bool ImageWriter::AllocMemory() { |
Mathieu Chartier | 2fde533 | 2012-09-14 14:51:54 -0700 | [diff] [blame] | 137 | const Spaces& spaces = Runtime::Current()->GetHeap()->GetSpaces(); |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 138 | size_t size = 0; |
Mathieu Chartier | 2fde533 | 2012-09-14 14:51:54 -0700 | [diff] [blame] | 139 | for (Spaces::const_iterator it = spaces.begin(); it != spaces.end(); ++it) { |
| 140 | if ((*it)->IsAllocSpace()) { |
| 141 | size += (*it)->Size(); |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 142 | } |
| 143 | } |
| 144 | |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 145 | int prot = PROT_READ | PROT_WRITE; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 146 | size_t length = RoundUp(size, kPageSize); |
Ian Rogers | a40307e | 2013-02-22 11:32:44 -0800 | [diff] [blame] | 147 | image_.reset(MemMap::MapAnonymous("image writer image", NULL, length, prot)); |
Elliott Hughes | 90a3369 | 2011-08-30 13:27:07 -0700 | [diff] [blame] | 148 | if (image_.get() == NULL) { |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 149 | LOG(ERROR) << "Failed to allocate memory for image file generation"; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 150 | return false; |
| 151 | } |
| 152 | return true; |
| 153 | } |
| 154 | |
Ian Rogers | d418eda | 2012-01-30 12:14:28 -0800 | [diff] [blame] | 155 | void ImageWriter::ComputeLazyFieldsForImageClasses() { |
| 156 | Runtime* runtime = Runtime::Current(); |
| 157 | ClassLinker* class_linker = runtime->GetClassLinker(); |
Ian Rogers | 00f7d0e | 2012-07-19 15:28:27 -0700 | [diff] [blame] | 158 | class_linker->VisitClassesWithoutClassesLock(ComputeLazyFieldsForClassesVisitor, NULL); |
Ian Rogers | d418eda | 2012-01-30 12:14:28 -0800 | [diff] [blame] | 159 | } |
| 160 | |
Elliott Hughes | 1bac54f | 2012-03-16 12:48:31 -0700 | [diff] [blame] | 161 | bool ImageWriter::ComputeLazyFieldsForClassesVisitor(Class* c, void* /*arg*/) { |
| 162 | c->ComputeName(); |
Ian Rogers | d418eda | 2012-01-30 12:14:28 -0800 | [diff] [blame] | 163 | return true; |
| 164 | } |
| 165 | |
Ian Rogers | d1f1bf0 | 2012-02-26 16:59:20 -0800 | [diff] [blame] | 166 | void ImageWriter::ComputeEagerResolvedStringsCallback(Object* obj, void* arg) { |
| 167 | if (!obj->GetClass()->IsStringClass()) { |
| 168 | return; |
| 169 | } |
| 170 | String* string = obj->AsString(); |
| 171 | std::string utf8_string(string->ToModifiedUtf8()); |
| 172 | ImageWriter* writer = reinterpret_cast<ImageWriter*>(arg); |
Ian Rogers | d1f1bf0 | 2012-02-26 16:59:20 -0800 | [diff] [blame] | 173 | typedef Set::const_iterator CacheIt; // TODO: C++0x auto |
| 174 | for (CacheIt it = writer->dex_caches_.begin(), end = writer->dex_caches_.end(); it != end; ++it) { |
| 175 | DexCache* dex_cache = *it; |
Ian Rogers | 4445a7e | 2012-10-05 17:19:13 -0700 | [diff] [blame] | 176 | const DexFile& dex_file = *dex_cache->GetDexFile(); |
Ian Rogers | d1f1bf0 | 2012-02-26 16:59:20 -0800 | [diff] [blame] | 177 | const DexFile::StringId* string_id = dex_file.FindStringId(utf8_string); |
| 178 | if (string_id != NULL) { |
| 179 | // This string occurs in this dex file, assign the dex cache entry. |
| 180 | uint32_t string_idx = dex_file.GetIndexForStringId(*string_id); |
| 181 | if (dex_cache->GetResolvedString(string_idx) == NULL) { |
| 182 | dex_cache->SetResolvedString(string_idx, string); |
| 183 | } |
| 184 | } |
| 185 | } |
| 186 | } |
| 187 | |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 188 | void ImageWriter::ComputeEagerResolvedStrings() |
Ian Rogers | b726dcb | 2012-09-05 08:57:23 -0700 | [diff] [blame] | 189 | SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 190 | // TODO: Check image spaces only? |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 191 | Heap* heap = Runtime::Current()->GetHeap(); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 192 | WriterMutexLock mu(Thread::Current(), *Locks::heap_bitmap_lock_); |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 193 | heap->FlushAllocStack(); |
| 194 | heap->GetLiveBitmap()->Walk(ComputeEagerResolvedStringsCallback, this); |
Ian Rogers | d1f1bf0 | 2012-02-26 16:59:20 -0800 | [diff] [blame] | 195 | } |
| 196 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 197 | bool ImageWriter::IsImageClass(const Class* klass) { |
| 198 | if (image_classes_ == NULL) { |
| 199 | return true; |
| 200 | } |
| 201 | while (klass->IsArrayClass()) { |
| 202 | klass = klass->GetComponentType(); |
| 203 | } |
Elliott Hughes | c3b77c7 | 2011-12-15 20:56:48 -0800 | [diff] [blame] | 204 | if (klass->IsPrimitive()) { |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 205 | return true; |
| 206 | } |
Ian Rogers | 6d4d9fc | 2011-11-30 16:24:48 -0800 | [diff] [blame] | 207 | const std::string descriptor(ClassHelper(klass).GetDescriptor()); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 208 | return image_classes_->find(descriptor) != image_classes_->end(); |
| 209 | } |
| 210 | |
| 211 | |
| 212 | struct NonImageClasses { |
| 213 | ImageWriter* image_writer; |
| 214 | std::set<std::string>* non_image_classes; |
| 215 | }; |
| 216 | |
| 217 | void ImageWriter::PruneNonImageClasses() { |
| 218 | if (image_classes_ == NULL) { |
| 219 | return; |
| 220 | } |
| 221 | Runtime* runtime = Runtime::Current(); |
| 222 | ClassLinker* class_linker = runtime->GetClassLinker(); |
| 223 | |
| 224 | std::set<std::string> non_image_classes; |
| 225 | NonImageClasses context; |
| 226 | context.image_writer = this; |
| 227 | context.non_image_classes = &non_image_classes; |
| 228 | class_linker->VisitClasses(NonImageClassesVisitor, &context); |
| 229 | |
| 230 | typedef std::set<std::string>::const_iterator ClassIt; // TODO: C++0x auto |
| 231 | for (ClassIt it = non_image_classes.begin(), end = non_image_classes.end(); it != end; ++it) { |
Elliott Hughes | c3b77c7 | 2011-12-15 20:56:48 -0800 | [diff] [blame] | 232 | class_linker->RemoveClass((*it).c_str(), NULL); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 233 | } |
| 234 | |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 235 | AbstractMethod* resolution_method = runtime->GetResolutionMethod(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 236 | typedef Set::const_iterator CacheIt; // TODO: C++0x auto |
| 237 | for (CacheIt it = dex_caches_.begin(), end = dex_caches_.end(); it != end; ++it) { |
| 238 | DexCache* dex_cache = *it; |
| 239 | for (size_t i = 0; i < dex_cache->NumResolvedTypes(); i++) { |
| 240 | Class* klass = dex_cache->GetResolvedType(i); |
| 241 | if (klass != NULL && !IsImageClass(klass)) { |
| 242 | dex_cache->SetResolvedType(i, NULL); |
| 243 | dex_cache->GetInitializedStaticStorage()->Set(i, NULL); |
| 244 | } |
| 245 | } |
| 246 | for (size_t i = 0; i < dex_cache->NumResolvedMethods(); i++) { |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 247 | AbstractMethod* method = dex_cache->GetResolvedMethod(i); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 248 | if (method != NULL && !IsImageClass(method->GetDeclaringClass())) { |
Ian Rogers | 1984651 | 2012-02-24 11:42:47 -0800 | [diff] [blame] | 249 | dex_cache->SetResolvedMethod(i, resolution_method); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 250 | } |
| 251 | } |
| 252 | for (size_t i = 0; i < dex_cache->NumResolvedFields(); i++) { |
| 253 | Field* field = dex_cache->GetResolvedField(i); |
| 254 | if (field != NULL && !IsImageClass(field->GetDeclaringClass())) { |
| 255 | dex_cache->SetResolvedField(i, NULL); |
| 256 | } |
| 257 | } |
| 258 | } |
| 259 | } |
| 260 | |
| 261 | bool ImageWriter::NonImageClassesVisitor(Class* klass, void* arg) { |
| 262 | NonImageClasses* context = reinterpret_cast<NonImageClasses*>(arg); |
| 263 | if (!context->image_writer->IsImageClass(klass)) { |
Ian Rogers | 6d4d9fc | 2011-11-30 16:24:48 -0800 | [diff] [blame] | 264 | context->non_image_classes->insert(ClassHelper(klass).GetDescriptor()); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 265 | } |
| 266 | return true; |
| 267 | } |
| 268 | |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 269 | void ImageWriter::CheckNonImageClassesRemoved() |
Ian Rogers | b726dcb | 2012-09-05 08:57:23 -0700 | [diff] [blame] | 270 | SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 271 | if (image_classes_ == NULL) { |
| 272 | return; |
| 273 | } |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 274 | |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 275 | Heap* heap = Runtime::Current()->GetHeap(); |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 276 | Thread* self = Thread::Current(); |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 277 | { |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 278 | WriterMutexLock mu(self, *Locks::heap_bitmap_lock_); |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 279 | heap->FlushAllocStack(); |
| 280 | } |
| 281 | |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 282 | ReaderMutexLock mu(self, *Locks::heap_bitmap_lock_); |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 283 | heap->GetLiveBitmap()->Walk(CheckNonImageClassesRemovedCallback, this); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 284 | } |
| 285 | |
| 286 | void ImageWriter::CheckNonImageClassesRemovedCallback(Object* obj, void* arg) { |
| 287 | ImageWriter* image_writer = reinterpret_cast<ImageWriter*>(arg); |
| 288 | if (!obj->IsClass()) { |
| 289 | return; |
| 290 | } |
| 291 | Class* klass = obj->AsClass(); |
Elliott Hughes | c3b77c7 | 2011-12-15 20:56:48 -0800 | [diff] [blame] | 292 | if (!image_writer->IsImageClass(klass)) { |
| 293 | image_writer->DumpImageClasses(); |
| 294 | CHECK(image_writer->IsImageClass(klass)) << ClassHelper(klass).GetDescriptor() |
| 295 | << " " << PrettyDescriptor(klass); |
| 296 | } |
| 297 | } |
| 298 | |
| 299 | void ImageWriter::DumpImageClasses() { |
| 300 | typedef std::set<std::string>::const_iterator It; // TODO: C++0x auto |
| 301 | for (It it = image_classes_->begin(), end = image_classes_->end(); it != end; ++it) { |
| 302 | LOG(INFO) << " " << *it; |
| 303 | } |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 304 | } |
| 305 | |
Brian Carlstrom | 78128a6 | 2011-09-15 17:21:19 -0700 | [diff] [blame] | 306 | void ImageWriter::CalculateNewObjectOffsetsCallback(Object* obj, void* arg) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 307 | DCHECK(obj != NULL); |
| 308 | DCHECK(arg != NULL); |
| 309 | ImageWriter* image_writer = reinterpret_cast<ImageWriter*>(arg); |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 310 | |
| 311 | // if it is a string, we want to intern it if its not interned. |
Elliott Hughes | dbb4079 | 2011-11-18 17:05:22 -0800 | [diff] [blame] | 312 | if (obj->GetClass()->IsStringClass()) { |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 313 | // we must be an interned string that was forward referenced and already assigned |
Elliott Hughes | b3bd5f0 | 2012-03-08 21:05:27 -0800 | [diff] [blame] | 314 | if (image_writer->IsImageOffsetAssigned(obj)) { |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 315 | DCHECK_EQ(obj, obj->AsString()->Intern()); |
| 316 | return; |
| 317 | } |
Ian Rogers | 1f53934 | 2012-10-03 21:09:42 -0700 | [diff] [blame] | 318 | SirtRef<String> interned(Thread::Current(), obj->AsString()->Intern()); |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 319 | if (obj != interned.get()) { |
Elliott Hughes | b3bd5f0 | 2012-03-08 21:05:27 -0800 | [diff] [blame] | 320 | if (!image_writer->IsImageOffsetAssigned(interned.get())) { |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 321 | // interned obj is after us, allocate its location early |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 322 | image_writer->AssignImageOffset(interned.get()); |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 323 | } |
| 324 | // point those looking for this object to the interned version. |
Elliott Hughes | b3bd5f0 | 2012-03-08 21:05:27 -0800 | [diff] [blame] | 325 | image_writer->SetImageOffset(obj, image_writer->GetImageOffset(interned.get())); |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 326 | return; |
| 327 | } |
| 328 | // else (obj == interned), nothing to do but fall through to the normal case |
| 329 | } |
| 330 | |
| 331 | image_writer->AssignImageOffset(obj); |
Brian Carlstrom | 4e777d4 | 2011-08-15 13:53:52 -0700 | [diff] [blame] | 332 | } |
| 333 | |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 334 | ObjectArray<Object>* ImageWriter::CreateImageRoots() const { |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 335 | Runtime* runtime = Runtime::Current(); |
| 336 | ClassLinker* class_linker = runtime->GetClassLinker(); |
| 337 | Class* object_array_class = class_linker->FindSystemClass("[Ljava/lang/Object;"); |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 338 | Thread* self = Thread::Current(); |
Brian Carlstrom | 58ae941 | 2011-10-04 00:56:06 -0700 | [diff] [blame] | 339 | |
| 340 | // build an Object[] of all the DexCaches used in the source_space_ |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 341 | ObjectArray<Object>* dex_caches = ObjectArray<Object>::Alloc(self, object_array_class, |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 342 | dex_caches_.size()); |
| 343 | int i = 0; |
| 344 | typedef Set::const_iterator It; // TODO: C++0x auto |
| 345 | for (It it = dex_caches_.begin(), end = dex_caches_.end(); it != end; ++it, ++i) { |
| 346 | dex_caches->Set(i, *it); |
Brian Carlstrom | 58ae941 | 2011-10-04 00:56:06 -0700 | [diff] [blame] | 347 | } |
| 348 | |
| 349 | // build an Object[] of the roots needed to restore the runtime |
Ian Rogers | 1f53934 | 2012-10-03 21:09:42 -0700 | [diff] [blame] | 350 | SirtRef<ObjectArray<Object> > |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 351 | image_roots(self, |
| 352 | ObjectArray<Object>::Alloc(self, object_array_class, |
| 353 | ImageHeader::kImageRootsMax)); |
Ian Rogers | 169c9a7 | 2011-11-13 20:13:17 -0800 | [diff] [blame] | 354 | image_roots->Set(ImageHeader::kJniStubArray, runtime->GetJniDlsymLookupStub()); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 355 | image_roots->Set(ImageHeader::kAbstractMethodErrorStubArray, |
| 356 | runtime->GetAbstractMethodErrorStubArray()); |
Ian Rogers | 1cb0a1d | 2011-10-06 15:24:35 -0700 | [diff] [blame] | 357 | image_roots->Set(ImageHeader::kStaticResolutionStubArray, |
| 358 | runtime->GetResolutionStubArray(Runtime::kStaticMethod)); |
| 359 | image_roots->Set(ImageHeader::kUnknownMethodResolutionStubArray, |
| 360 | runtime->GetResolutionStubArray(Runtime::kUnknownMethod)); |
Ian Rogers | 1984651 | 2012-02-24 11:42:47 -0800 | [diff] [blame] | 361 | image_roots->Set(ImageHeader::kResolutionMethod, runtime->GetResolutionMethod()); |
Ian Rogers | 4f0d07c | 2011-10-06 23:38:47 -0700 | [diff] [blame] | 362 | image_roots->Set(ImageHeader::kCalleeSaveMethod, |
| 363 | runtime->GetCalleeSaveMethod(Runtime::kSaveAll)); |
| 364 | image_roots->Set(ImageHeader::kRefsOnlySaveMethod, |
| 365 | runtime->GetCalleeSaveMethod(Runtime::kRefsOnly)); |
| 366 | image_roots->Set(ImageHeader::kRefsAndArgsSaveMethod, |
| 367 | runtime->GetCalleeSaveMethod(Runtime::kRefsAndArgs)); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 368 | image_roots->Set(ImageHeader::kOatLocation, |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 369 | String::AllocFromModifiedUtf8(self, oat_file_->GetLocation().c_str())); |
Brian Carlstrom | 58ae941 | 2011-10-04 00:56:06 -0700 | [diff] [blame] | 370 | image_roots->Set(ImageHeader::kDexCaches, |
| 371 | dex_caches); |
Brian Carlstrom | 34f426c | 2011-10-04 12:58:02 -0700 | [diff] [blame] | 372 | image_roots->Set(ImageHeader::kClassRoots, |
| 373 | class_linker->GetClassRoots()); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 374 | for (int i = 0; i < ImageHeader::kImageRootsMax; i++) { |
| 375 | CHECK(image_roots->Get(i) != NULL); |
| 376 | } |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 377 | return image_roots.get(); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 378 | } |
| 379 | |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 380 | void ImageWriter::CalculateNewObjectOffsets(size_t oat_loaded_size, size_t oat_data_offset) { |
| 381 | CHECK_NE(0U, oat_loaded_size); |
Ian Rogers | 1f53934 | 2012-10-03 21:09:42 -0700 | [diff] [blame] | 382 | Thread* self = Thread::Current(); |
| 383 | SirtRef<ObjectArray<Object> > image_roots(self, CreateImageRoots()); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 384 | |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 385 | Heap* heap = Runtime::Current()->GetHeap(); |
Mathieu Chartier | e0f0cb3 | 2012-08-28 11:26:00 -0700 | [diff] [blame] | 386 | const Spaces& spaces = heap->GetSpaces(); |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 387 | DCHECK(!spaces.empty()); |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 388 | DCHECK_EQ(0U, image_end_); |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 389 | |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 390 | // leave space for the header, but do not write it yet, we need to |
| 391 | // know where image_roots is going to end up |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 392 | image_end_ += RoundUp(sizeof(ImageHeader), 8); // 64-bit-alignment |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 393 | |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 394 | { |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 395 | WriterMutexLock mu(self, *Locks::heap_bitmap_lock_); |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 396 | heap->FlushAllocStack(); |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 397 | // TODO: Image spaces only? |
| 398 | // TODO: Add InOrderWalk to heap bitmap. |
Ian Rogers | 1f53934 | 2012-10-03 21:09:42 -0700 | [diff] [blame] | 399 | const char* old = self->StartAssertNoThreadSuspension("ImageWriter"); |
Mathieu Chartier | e0f0cb3 | 2012-08-28 11:26:00 -0700 | [diff] [blame] | 400 | DCHECK(heap->GetLargeObjectsSpace()->GetLiveObjects()->IsEmpty()); |
| 401 | for (Spaces::const_iterator it = spaces.begin(); it != spaces.end(); ++it) { |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 402 | (*it)->GetLiveBitmap()->InOrderWalk(CalculateNewObjectOffsetsCallback, this); |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 403 | DCHECK_LT(image_end_, image_->Size()); |
| 404 | } |
Ian Rogers | 1f53934 | 2012-10-03 21:09:42 -0700 | [diff] [blame] | 405 | self->EndAssertNoThreadSuspension(old); |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 406 | } |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 407 | |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 408 | const byte* oat_file_begin = image_begin_ + RoundUp(image_end_, kPageSize); |
| 409 | const byte* oat_file_end = oat_file_begin + oat_loaded_size; |
| 410 | oat_data_begin_ = oat_file_begin + oat_data_offset; |
| 411 | const byte* oat_data_end = oat_data_begin_ + oat_file_->Size(); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 412 | |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 413 | // return to write header at start of image with future location of image_roots |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 414 | ImageHeader image_header(reinterpret_cast<uint32_t>(image_begin_), |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 415 | reinterpret_cast<uint32_t>(GetImageAddress(image_roots.get())), |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 416 | oat_file_->GetOatHeader().GetChecksum(), |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 417 | reinterpret_cast<uint32_t>(oat_file_begin), |
| 418 | reinterpret_cast<uint32_t>(oat_data_begin_), |
| 419 | reinterpret_cast<uint32_t>(oat_data_end), |
| 420 | reinterpret_cast<uint32_t>(oat_file_end)); |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 421 | memcpy(image_->Begin(), &image_header, sizeof(image_header)); |
Brian Carlstrom | 700c8d3 | 2012-11-05 10:42:02 -0800 | [diff] [blame] | 422 | |
| 423 | // Note that image_end_ is left at end of used space |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 424 | } |
| 425 | |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 426 | void ImageWriter::CopyAndFixupObjects() |
Ian Rogers | b726dcb | 2012-09-05 08:57:23 -0700 | [diff] [blame] | 427 | SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 428 | Thread* self = Thread::Current(); |
| 429 | const char* old_cause = self->StartAssertNoThreadSuspension("ImageWriter"); |
Elliott Hughes | b3bd5f0 | 2012-03-08 21:05:27 -0800 | [diff] [blame] | 430 | Heap* heap = Runtime::Current()->GetHeap(); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 431 | // TODO: heap validation can't handle this fix up pass |
Elliott Hughes | b3bd5f0 | 2012-03-08 21:05:27 -0800 | [diff] [blame] | 432 | heap->DisableObjectValidation(); |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 433 | // TODO: Image spaces only? |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 434 | WriterMutexLock mu(self, *Locks::heap_bitmap_lock_); |
Mathieu Chartier | 357e9be | 2012-08-01 11:00:14 -0700 | [diff] [blame] | 435 | heap->FlushAllocStack(); |
Mathieu Chartier | b062fdd | 2012-07-03 09:51:48 -0700 | [diff] [blame] | 436 | heap->GetLiveBitmap()->Walk(CopyAndFixupObjectsCallback, this); |
Ian Rogers | 50b35e2 | 2012-10-04 10:09:15 -0700 | [diff] [blame] | 437 | self->EndAssertNoThreadSuspension(old_cause); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 438 | } |
| 439 | |
Brian Carlstrom | 78128a6 | 2011-09-15 17:21:19 -0700 | [diff] [blame] | 440 | void ImageWriter::CopyAndFixupObjectsCallback(Object* object, void* arg) { |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 441 | DCHECK(object != NULL); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 442 | DCHECK(arg != NULL); |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 443 | const Object* obj = object; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 444 | ImageWriter* image_writer = reinterpret_cast<ImageWriter*>(arg); |
Elliott Hughes | d8ddfd5 | 2011-08-15 14:32:53 -0700 | [diff] [blame] | 445 | |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 446 | // see GetLocalAddress for similar computation |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 447 | size_t offset = image_writer->GetImageOffset(obj); |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 448 | byte* dst = image_writer->image_->Begin() + offset; |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 449 | const byte* src = reinterpret_cast<const byte*>(obj); |
Elliott Hughes | 04b63fd | 2011-08-16 09:40:10 -0700 | [diff] [blame] | 450 | size_t n = obj->SizeOf(); |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 451 | DCHECK_LT(offset + n, image_writer->image_->Size()); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 452 | memcpy(dst, src, n); |
| 453 | Object* copy = reinterpret_cast<Object*>(dst); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 454 | copy->SetField32(Object::MonitorOffset(), 0, false); // We may have inflated the lock during compilation. |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 455 | image_writer->FixupObject(obj, copy); |
| 456 | } |
| 457 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 458 | void ImageWriter::FixupObject(const Object* orig, Object* copy) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 459 | DCHECK(orig != NULL); |
| 460 | DCHECK(copy != NULL); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 461 | copy->SetClass(down_cast<Class*>(GetImageAddress(orig->GetClass()))); |
Brian Carlstrom | 9cff8e1 | 2011-08-18 16:47:29 -0700 | [diff] [blame] | 462 | // TODO: special case init of pointers to malloc data (or removal of these pointers) |
| 463 | if (orig->IsClass()) { |
| 464 | FixupClass(orig->AsClass(), down_cast<Class*>(copy)); |
| 465 | } else if (orig->IsObjectArray()) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 466 | FixupObjectArray(orig->AsObjectArray<Object>(), down_cast<ObjectArray<Object>*>(copy)); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 467 | } else if (orig->IsMethod()) { |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 468 | FixupMethod(orig->AsMethod(), down_cast<AbstractMethod*>(copy)); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 469 | } else { |
| 470 | FixupInstanceFields(orig, copy); |
| 471 | } |
| 472 | } |
| 473 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 474 | void ImageWriter::FixupClass(const Class* orig, Class* copy) { |
Brian Carlstrom | 9cff8e1 | 2011-08-18 16:47:29 -0700 | [diff] [blame] | 475 | FixupInstanceFields(orig, copy); |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 476 | FixupStaticFields(orig, copy); |
Brian Carlstrom | 9cff8e1 | 2011-08-18 16:47:29 -0700 | [diff] [blame] | 477 | } |
| 478 | |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 479 | void ImageWriter::FixupMethod(const AbstractMethod* orig, AbstractMethod* copy) { |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 480 | FixupInstanceFields(orig, copy); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 481 | |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 482 | // OatWriter replaces the code_ and invoke_stub_ with offset values. |
Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 483 | // Here we readjust to a pointer relative to oat_begin_ |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 484 | |
| 485 | // Every type of method can have an invoke stub |
| 486 | uint32_t invoke_stub_offset = orig->GetOatInvokeStubOffset(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 487 | const byte* invoke_stub = GetOatAddress(invoke_stub_offset); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 488 | copy->SetInvokeStub(reinterpret_cast<AbstractMethod::InvokeStub*>(const_cast<byte*>(invoke_stub))); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 489 | |
| 490 | if (orig->IsAbstract()) { |
| 491 | // Abstract methods are pointed to a stub that will throw AbstractMethodError if they are called |
| 492 | ByteArray* orig_ame_stub_array_ = Runtime::Current()->GetAbstractMethodErrorStubArray(); |
| 493 | ByteArray* copy_ame_stub_array_ = down_cast<ByteArray*>(GetImageAddress(orig_ame_stub_array_)); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 494 | copy->SetCode(copy_ame_stub_array_->GetData()); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 495 | return; |
| 496 | } |
| 497 | |
Ian Rogers | 1984651 | 2012-02-24 11:42:47 -0800 | [diff] [blame] | 498 | if (orig == Runtime::Current()->GetResolutionMethod()) { |
| 499 | // The resolution stub's code points at the unknown resolution trampoline |
| 500 | ByteArray* orig_res_stub_array_ = |
| 501 | Runtime::Current()->GetResolutionStubArray(Runtime::kUnknownMethod); |
| 502 | CHECK(orig->GetCode() == orig_res_stub_array_->GetData()); |
| 503 | ByteArray* copy_res_stub_array_ = down_cast<ByteArray*>(GetImageAddress(orig_res_stub_array_)); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 504 | copy->SetCode(copy_res_stub_array_->GetData()); |
Ian Rogers | 1984651 | 2012-02-24 11:42:47 -0800 | [diff] [blame] | 505 | return; |
| 506 | } |
| 507 | |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 508 | // Non-abstract methods typically have code |
| 509 | uint32_t code_offset = orig->GetOatCodeOffset(); |
Ian Rogers | 1984651 | 2012-02-24 11:42:47 -0800 | [diff] [blame] | 510 | const byte* code = NULL; |
| 511 | if (orig->IsStatic()) { |
| 512 | // Static methods may point at the resolution trampoline stub |
| 513 | ByteArray* orig_res_stub_array_ = |
| 514 | Runtime::Current()->GetResolutionStubArray(Runtime::kStaticMethod); |
| 515 | if (reinterpret_cast<int8_t*>(code_offset) == orig_res_stub_array_->GetData()) { |
| 516 | ByteArray* copy_res_stub_array_ = down_cast<ByteArray*>(GetImageAddress(orig_res_stub_array_)); |
| 517 | code = reinterpret_cast<const byte*>(copy_res_stub_array_->GetData()); |
| 518 | } |
| 519 | } |
| 520 | if (code == NULL) { |
| 521 | code = GetOatAddress(code_offset); |
| 522 | } |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 523 | copy->SetCode(code); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 524 | |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 525 | if (orig->IsNative()) { |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 526 | // The native method's pointer is directed to a stub to lookup via dlsym. |
| 527 | // Note this is not the code_ pointer, that is handled above. |
Ian Rogers | 169c9a7 | 2011-11-13 20:13:17 -0800 | [diff] [blame] | 528 | ByteArray* orig_jni_stub_array_ = Runtime::Current()->GetJniDlsymLookupStub(); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 529 | ByteArray* copy_jni_stub_array_ = down_cast<ByteArray*>(GetImageAddress(orig_jni_stub_array_)); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 530 | copy->SetNativeMethod(copy_jni_stub_array_->GetData()); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 531 | } else { |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 532 | // normal (non-abstract non-native) methods have mapping tables to relocate |
| 533 | uint32_t mapping_table_off = orig->GetOatMappingTableOffset(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 534 | const byte* mapping_table = GetOatAddress(mapping_table_off); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 535 | copy->SetMappingTable(reinterpret_cast<const uint32_t*>(mapping_table)); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 536 | |
| 537 | uint32_t vmap_table_offset = orig->GetOatVmapTableOffset(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 538 | const byte* vmap_table = GetOatAddress(vmap_table_offset); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 539 | copy->SetVmapTable(reinterpret_cast<const uint16_t*>(vmap_table)); |
Brian Carlstrom | e7d856b | 2012-01-11 18:10:55 -0800 | [diff] [blame] | 540 | |
Ian Rogers | 0c7abda | 2012-09-19 13:33:42 -0700 | [diff] [blame] | 541 | uint32_t native_gc_map_offset = orig->GetOatNativeGcMapOffset(); |
| 542 | const byte* native_gc_map = GetOatAddress(native_gc_map_offset); |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 543 | copy->SetNativeGcMap(reinterpret_cast<const uint8_t*>(native_gc_map)); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 544 | } |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 545 | } |
| 546 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 547 | void ImageWriter::FixupObjectArray(const ObjectArray<Object>* orig, ObjectArray<Object>* copy) { |
Elliott Hughes | d8ddfd5 | 2011-08-15 14:32:53 -0700 | [diff] [blame] | 548 | for (int32_t i = 0; i < orig->GetLength(); ++i) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 549 | const Object* element = orig->Get(i); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 550 | copy->SetPtrWithoutChecks(i, GetImageAddress(element)); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 551 | } |
| 552 | } |
| 553 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 554 | void ImageWriter::FixupInstanceFields(const Object* orig, Object* copy) { |
| 555 | DCHECK(orig != NULL); |
| 556 | DCHECK(copy != NULL); |
| 557 | Class* klass = orig->GetClass(); |
| 558 | DCHECK(klass != NULL); |
| 559 | FixupFields(orig, |
| 560 | copy, |
| 561 | klass->GetReferenceInstanceOffsets(), |
| 562 | false); |
| 563 | } |
| 564 | |
| 565 | void ImageWriter::FixupStaticFields(const Class* orig, Class* copy) { |
| 566 | DCHECK(orig != NULL); |
| 567 | DCHECK(copy != NULL); |
| 568 | FixupFields(orig, |
| 569 | copy, |
| 570 | orig->GetReferenceStaticOffsets(), |
| 571 | true); |
| 572 | } |
| 573 | |
| 574 | void ImageWriter::FixupFields(const Object* orig, |
| 575 | Object* copy, |
| 576 | uint32_t ref_offsets, |
| 577 | bool is_static) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 578 | if (ref_offsets != CLASS_WALK_SUPER) { |
| 579 | // Found a reference offset bitmap. Fixup the specified offsets. |
| 580 | while (ref_offsets != 0) { |
| 581 | size_t right_shift = CLZ(ref_offsets); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 582 | MemberOffset byte_offset = CLASS_OFFSET_FROM_CLZ(right_shift); |
| 583 | const Object* ref = orig->GetFieldObject<const Object*>(byte_offset, false); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 584 | // Use SetFieldPtr to avoid card marking since we are writing to the image. |
| 585 | copy->SetFieldPtr(byte_offset, GetImageAddress(ref), false); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 586 | ref_offsets &= ~(CLASS_HIGH_BIT >> right_shift); |
| 587 | } |
| 588 | } else { |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 589 | // There is no reference offset bitmap. In the non-static case, |
| 590 | // walk up the class inheritance hierarchy and find reference |
| 591 | // offsets the hard way. In the static case, just consider this |
| 592 | // class. |
| 593 | for (const Class *klass = is_static ? orig->AsClass() : orig->GetClass(); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 594 | klass != NULL; |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 595 | klass = is_static ? NULL : klass->GetSuperClass()) { |
| 596 | size_t num_reference_fields = (is_static |
| 597 | ? klass->NumReferenceStaticFields() |
| 598 | : klass->NumReferenceInstanceFields()); |
| 599 | for (size_t i = 0; i < num_reference_fields; ++i) { |
| 600 | Field* field = (is_static |
| 601 | ? klass->GetStaticField(i) |
| 602 | : klass->GetInstanceField(i)); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 603 | MemberOffset field_offset = field->GetOffset(); |
| 604 | const Object* ref = orig->GetFieldObject<const Object*>(field_offset, false); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 605 | // Use SetFieldPtr to avoid card marking since we are writing to the image. |
| 606 | copy->SetFieldPtr(field_offset, GetImageAddress(ref), false); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 607 | } |
| 608 | } |
| 609 | } |
Ian Rogers | 64b6d14 | 2012-10-29 16:34:15 -0700 | [diff] [blame] | 610 | if (!is_static && orig->IsReferenceInstance()) { |
| 611 | // Fix-up referent, that isn't marked as an object field, for References. |
| 612 | Field* field = orig->GetClass()->FindInstanceField("referent", "Ljava/lang/Object;"); |
| 613 | MemberOffset field_offset = field->GetOffset(); |
| 614 | const Object* ref = orig->GetFieldObject<const Object*>(field_offset, false); |
| 615 | // Use SetFieldPtr to avoid card marking since we are writing to the image. |
| 616 | copy->SetFieldPtr(field_offset, GetImageAddress(ref), false); |
| 617 | } |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 618 | } |
| 619 | |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 620 | static AbstractMethod* GetTargetMethod(const CompilerDriver::PatchInformation* patch) |
Ian Rogers | b726dcb | 2012-09-05 08:57:23 -0700 | [diff] [blame] | 621 | SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 622 | ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); |
Ian Rogers | 00f7d0e | 2012-07-19 15:28:27 -0700 | [diff] [blame] | 623 | DexCache* dex_cache = class_linker->FindDexCache(patch->GetDexFile()); |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 624 | AbstractMethod* method = class_linker->ResolveMethod(patch->GetDexFile(), |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 625 | patch->GetTargetMethodIdx(), |
Ian Rogers | 00f7d0e | 2012-07-19 15:28:27 -0700 | [diff] [blame] | 626 | dex_cache, |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 627 | NULL, |
jeffhao | c0228b8 | 2012-08-29 18:15:05 -0700 | [diff] [blame] | 628 | NULL, |
Ian Rogers | 08f753d | 2012-08-24 14:35:25 -0700 | [diff] [blame] | 629 | patch->GetTargetInvokeType()); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 630 | CHECK(method != NULL) |
| 631 | << patch->GetDexFile().GetLocation() << " " << patch->GetTargetMethodIdx(); |
Brian Carlstrom | 0637e27 | 2012-03-20 01:07:52 -0700 | [diff] [blame] | 632 | CHECK(!method->IsRuntimeMethod()) |
| 633 | << patch->GetDexFile().GetLocation() << " " << patch->GetTargetMethodIdx(); |
Ian Rogers | 00f7d0e | 2012-07-19 15:28:27 -0700 | [diff] [blame] | 634 | CHECK(dex_cache->GetResolvedMethods()->Get(patch->GetTargetMethodIdx()) == method) |
Brian Carlstrom | 0637e27 | 2012-03-20 01:07:52 -0700 | [diff] [blame] | 635 | << patch->GetDexFile().GetLocation() << " " << patch->GetReferrerMethodIdx() << " " |
Ian Rogers | 00f7d0e | 2012-07-19 15:28:27 -0700 | [diff] [blame] | 636 | << PrettyMethod(dex_cache->GetResolvedMethods()->Get(patch->GetTargetMethodIdx())) << " " |
Brian Carlstrom | 0637e27 | 2012-03-20 01:07:52 -0700 | [diff] [blame] | 637 | << PrettyMethod(method); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 638 | return method; |
| 639 | } |
| 640 | |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 641 | void ImageWriter::PatchOatCodeAndMethods(const CompilerDriver& compiler) { |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 642 | Thread* self = Thread::Current(); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 643 | ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 644 | const char* old_cause = self->StartAssertNoThreadSuspension("ImageWriter"); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 645 | |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 646 | typedef std::vector<const CompilerDriver::PatchInformation*> Patches; |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 647 | const Patches& code_to_patch = compiler.GetCodeToPatch(); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 648 | for (size_t i = 0; i < code_to_patch.size(); i++) { |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 649 | const CompilerDriver::PatchInformation* patch = code_to_patch[i]; |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 650 | AbstractMethod* target = GetTargetMethod(patch); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 651 | uint32_t code = reinterpret_cast<uint32_t>(class_linker->GetOatCodeFor(target)); |
| 652 | uint32_t code_base = reinterpret_cast<uint32_t>(&oat_file_->GetOatHeader()); |
| 653 | uint32_t code_offset = code - code_base; |
| 654 | SetPatchLocation(patch, reinterpret_cast<uint32_t>(GetOatAddress(code_offset))); |
| 655 | } |
| 656 | |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 657 | const Patches& methods_to_patch = compiler.GetMethodsToPatch(); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 658 | for (size_t i = 0; i < methods_to_patch.size(); i++) { |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 659 | const CompilerDriver::PatchInformation* patch = methods_to_patch[i]; |
Mathieu Chartier | 66f1925 | 2012-09-18 08:57:04 -0700 | [diff] [blame] | 660 | AbstractMethod* target = GetTargetMethod(patch); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 661 | SetPatchLocation(patch, reinterpret_cast<uint32_t>(GetImageAddress(target))); |
| 662 | } |
Brian Carlstrom | a85b837 | 2012-10-18 17:00:32 -0700 | [diff] [blame] | 663 | |
| 664 | // Update the image header with the new checksum after patching |
| 665 | ImageHeader* image_header = reinterpret_cast<ImageHeader*>(image_->Begin()); |
| 666 | image_header->SetOatChecksum(oat_file_->GetOatHeader().GetChecksum()); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 667 | self->EndAssertNoThreadSuspension(old_cause); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 668 | } |
| 669 | |
Ian Rogers | 1212a02 | 2013-03-04 10:48:41 -0800 | [diff] [blame] | 670 | void ImageWriter::SetPatchLocation(const CompilerDriver::PatchInformation* patch, uint32_t value) { |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 671 | ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 672 | const void* oat_code = class_linker->GetOatCodeFor(patch->GetDexFile(), |
| 673 | patch->GetReferrerMethodIdx()); |
Brian Carlstrom | a85b837 | 2012-10-18 17:00:32 -0700 | [diff] [blame] | 674 | OatHeader& oat_header = const_cast<OatHeader&>(oat_file_->GetOatHeader()); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 675 | // TODO: make this Thumb2 specific |
Mathieu Chartier | e35517a | 2012-10-30 18:49:55 -0700 | [diff] [blame] | 676 | uint8_t* base = reinterpret_cast<uint8_t*>(reinterpret_cast<uint32_t>(oat_code) & ~0x1); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 677 | uint32_t* patch_location = reinterpret_cast<uint32_t*>(base + patch->GetLiteralOffset()); |
| 678 | #ifndef NDEBUG |
| 679 | const DexFile::MethodId& id = patch->GetDexFile().GetMethodId(patch->GetTargetMethodIdx()); |
| 680 | uint32_t expected = reinterpret_cast<uint32_t>(&id); |
| 681 | uint32_t actual = *patch_location; |
| 682 | CHECK(actual == expected || actual == value) << std::hex |
| 683 | << "actual=" << actual |
| 684 | << "expected=" << expected |
| 685 | << "value=" << value; |
| 686 | #endif |
Elliott Hughes | b25c3f6 | 2012-03-26 16:35:06 -0700 | [diff] [blame] | 687 | *patch_location = value; |
Brian Carlstrom | a85b837 | 2012-10-18 17:00:32 -0700 | [diff] [blame] | 688 | oat_header.UpdateChecksum(patch_location, sizeof(value)); |
Brian Carlstrom | f582258 | 2012-03-19 22:34:31 -0700 | [diff] [blame] | 689 | } |
| 690 | |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 691 | } // namespace art |