Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 1 | // Copyright 2011 Google Inc. All Rights Reserved. |
| 2 | |
| 3 | #include "image_writer.h" |
| 4 | |
| 5 | #include <sys/mman.h> |
Elliott Hughes | 90a3369 | 2011-08-30 13:27:07 -0700 | [diff] [blame] | 6 | |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 7 | #include <vector> |
| 8 | |
Elliott Hughes | 90a3369 | 2011-08-30 13:27:07 -0700 | [diff] [blame] | 9 | #include "UniquePtr.h" |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 10 | #include "class_linker.h" |
Brian Carlstrom | 1f87008 | 2011-08-23 16:02:11 -0700 | [diff] [blame] | 11 | #include "class_loader.h" |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 12 | #include "compiled_method.h" |
Elliott Hughes | 90a3369 | 2011-08-30 13:27:07 -0700 | [diff] [blame] | 13 | #include "dex_cache.h" |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 14 | #include "file.h" |
| 15 | #include "globals.h" |
| 16 | #include "heap.h" |
Brian Carlstrom | 4a289ed | 2011-08-16 17:17:49 -0700 | [diff] [blame] | 17 | #include "image.h" |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 18 | #include "intern_table.h" |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 19 | #include "logging.h" |
| 20 | #include "object.h" |
Ian Rogers | 6d4d9fc | 2011-11-30 16:24:48 -0800 | [diff] [blame] | 21 | #include "object_utils.h" |
Brian Carlstrom | 1f87008 | 2011-08-23 16:02:11 -0700 | [diff] [blame] | 22 | #include "runtime.h" |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 23 | #include "space.h" |
| 24 | #include "utils.h" |
| 25 | |
| 26 | namespace art { |
| 27 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 28 | bool ImageWriter::Write(const char* image_filename, |
| 29 | uintptr_t image_base, |
| 30 | const std::string& oat_filename, |
| 31 | const std::string& strip_location_prefix) { |
Brian Carlstrom | aded5f7 | 2011-10-07 17:15:04 -0700 | [diff] [blame] | 32 | CHECK(image_filename != NULL); |
| 33 | |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 34 | CHECK_NE(image_base, 0U); |
| 35 | image_base_ = reinterpret_cast<byte*>(image_base); |
| 36 | |
| 37 | const std::vector<Space*>& spaces = Heap::GetSpaces(); |
| 38 | // currently just write the last space, assuming it is the space that was being used for allocation |
| 39 | CHECK_GE(spaces.size(), 1U); |
| 40 | source_space_ = spaces[spaces.size()-1]; |
Brian Carlstrom | 58ae941 | 2011-10-04 00:56:06 -0700 | [diff] [blame] | 41 | CHECK(!source_space_->IsImageSpace()); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 42 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 43 | ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); |
| 44 | const std::vector<DexCache*>& all_dex_caches = class_linker->GetDexCaches(); |
| 45 | for (size_t i = 0; i < all_dex_caches.size(); i++) { |
| 46 | DexCache* dex_cache = all_dex_caches[i]; |
| 47 | if (InSourceSpace(dex_cache)) { |
| 48 | dex_caches_.insert(dex_cache); |
| 49 | } |
| 50 | } |
| 51 | |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 52 | oat_file_.reset(OatFile::Open(oat_filename, strip_location_prefix, NULL)); |
| 53 | if (oat_file_.get() == NULL) { |
| 54 | LOG(ERROR) << "Failed to open oat file " << oat_filename; |
| 55 | return false; |
| 56 | } |
| 57 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 58 | if (!AllocMemory()) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 59 | return false; |
| 60 | } |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 61 | PruneNonImageClasses(); |
Brian Carlstrom | 693267a | 2011-09-06 09:25:34 -0700 | [diff] [blame] | 62 | Heap::CollectGarbage(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 63 | #ifndef NDEBUG |
| 64 | CheckNonImageClassesRemoved(); |
| 65 | #endif |
Ian Rogers | 5d76c43 | 2011-10-31 21:42:49 -0700 | [diff] [blame] | 66 | Heap::DisableCardMarking(); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 67 | CalculateNewObjectOffsets(); |
| 68 | CopyAndFixupObjects(); |
Elliott Hughes | d8ddfd5 | 2011-08-15 14:32:53 -0700 | [diff] [blame] | 69 | |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 70 | UniquePtr<File> file(OS::OpenFile(image_filename, true)); |
Elliott Hughes | 90a3369 | 2011-08-30 13:27:07 -0700 | [diff] [blame] | 71 | if (file.get() == NULL) { |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 72 | LOG(ERROR) << "Failed to open image file " << image_filename; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 73 | return false; |
| 74 | } |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 75 | bool success = file->WriteFully(image_->GetAddress(), image_top_); |
| 76 | if (!success) { |
| 77 | PLOG(ERROR) << "Failed to write image file " << image_filename; |
| 78 | return false; |
| 79 | } |
| 80 | return true; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 81 | } |
| 82 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 83 | bool ImageWriter::AllocMemory() { |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 84 | size_t size = source_space_->Size(); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 85 | int prot = PROT_READ | PROT_WRITE; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 86 | size_t length = RoundUp(size, kPageSize); |
Brian Carlstrom | 8952189 | 2011-12-07 22:05:07 -0800 | [diff] [blame] | 87 | image_.reset(MemMap::MapAnonymous("image-writer-image", NULL, length, prot)); |
Elliott Hughes | 90a3369 | 2011-08-30 13:27:07 -0700 | [diff] [blame] | 88 | if (image_.get() == NULL) { |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 89 | LOG(ERROR) << "Failed to allocate memory for image file generation"; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 90 | return false; |
| 91 | } |
| 92 | return true; |
| 93 | } |
| 94 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 95 | bool ImageWriter::IsImageClass(const Class* klass) { |
| 96 | if (image_classes_ == NULL) { |
| 97 | return true; |
| 98 | } |
| 99 | while (klass->IsArrayClass()) { |
| 100 | klass = klass->GetComponentType(); |
| 101 | } |
Elliott Hughes | c3b77c7 | 2011-12-15 20:56:48 -0800 | [diff] [blame] | 102 | if (klass->IsPrimitive()) { |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 103 | return true; |
| 104 | } |
Ian Rogers | 6d4d9fc | 2011-11-30 16:24:48 -0800 | [diff] [blame] | 105 | const std::string descriptor(ClassHelper(klass).GetDescriptor()); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 106 | return image_classes_->find(descriptor) != image_classes_->end(); |
| 107 | } |
| 108 | |
| 109 | |
| 110 | struct NonImageClasses { |
| 111 | ImageWriter* image_writer; |
| 112 | std::set<std::string>* non_image_classes; |
| 113 | }; |
| 114 | |
| 115 | void ImageWriter::PruneNonImageClasses() { |
| 116 | if (image_classes_ == NULL) { |
| 117 | return; |
| 118 | } |
| 119 | Runtime* runtime = Runtime::Current(); |
| 120 | ClassLinker* class_linker = runtime->GetClassLinker(); |
| 121 | |
| 122 | std::set<std::string> non_image_classes; |
| 123 | NonImageClasses context; |
| 124 | context.image_writer = this; |
| 125 | context.non_image_classes = &non_image_classes; |
| 126 | class_linker->VisitClasses(NonImageClassesVisitor, &context); |
| 127 | |
| 128 | typedef std::set<std::string>::const_iterator ClassIt; // TODO: C++0x auto |
| 129 | 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] | 130 | class_linker->RemoveClass((*it).c_str(), NULL); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 131 | } |
| 132 | |
| 133 | typedef Set::const_iterator CacheIt; // TODO: C++0x auto |
| 134 | for (CacheIt it = dex_caches_.begin(), end = dex_caches_.end(); it != end; ++it) { |
| 135 | DexCache* dex_cache = *it; |
| 136 | for (size_t i = 0; i < dex_cache->NumResolvedTypes(); i++) { |
| 137 | Class* klass = dex_cache->GetResolvedType(i); |
| 138 | if (klass != NULL && !IsImageClass(klass)) { |
| 139 | dex_cache->SetResolvedType(i, NULL); |
| 140 | dex_cache->GetInitializedStaticStorage()->Set(i, NULL); |
| 141 | } |
| 142 | } |
| 143 | for (size_t i = 0; i < dex_cache->NumResolvedMethods(); i++) { |
| 144 | Method* method = dex_cache->GetResolvedMethod(i); |
| 145 | if (method != NULL && !IsImageClass(method->GetDeclaringClass())) { |
| 146 | dex_cache->SetResolvedMethod(i, NULL); |
| 147 | Runtime::TrampolineType type = Runtime::GetTrampolineType(method); |
| 148 | ByteArray* res_trampoline = runtime->GetResolutionStubArray(type); |
| 149 | dex_cache->GetCodeAndDirectMethods()->SetResolvedDirectMethodTrampoline(i, res_trampoline); |
| 150 | } |
| 151 | } |
| 152 | for (size_t i = 0; i < dex_cache->NumResolvedFields(); i++) { |
| 153 | Field* field = dex_cache->GetResolvedField(i); |
| 154 | if (field != NULL && !IsImageClass(field->GetDeclaringClass())) { |
| 155 | dex_cache->SetResolvedField(i, NULL); |
| 156 | } |
| 157 | } |
| 158 | } |
| 159 | } |
| 160 | |
| 161 | bool ImageWriter::NonImageClassesVisitor(Class* klass, void* arg) { |
| 162 | NonImageClasses* context = reinterpret_cast<NonImageClasses*>(arg); |
| 163 | if (!context->image_writer->IsImageClass(klass)) { |
Ian Rogers | 6d4d9fc | 2011-11-30 16:24:48 -0800 | [diff] [blame] | 164 | context->non_image_classes->insert(ClassHelper(klass).GetDescriptor()); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 165 | } |
| 166 | return true; |
| 167 | } |
| 168 | |
| 169 | void ImageWriter::CheckNonImageClassesRemoved() { |
| 170 | if (image_classes_ == NULL) { |
| 171 | return; |
| 172 | } |
| 173 | Heap::GetLiveBits()->Walk(CheckNonImageClassesRemovedCallback, this); |
| 174 | } |
| 175 | |
| 176 | void ImageWriter::CheckNonImageClassesRemovedCallback(Object* obj, void* arg) { |
| 177 | ImageWriter* image_writer = reinterpret_cast<ImageWriter*>(arg); |
| 178 | if (!obj->IsClass()) { |
| 179 | return; |
| 180 | } |
| 181 | Class* klass = obj->AsClass(); |
Elliott Hughes | c3b77c7 | 2011-12-15 20:56:48 -0800 | [diff] [blame] | 182 | if (!image_writer->IsImageClass(klass)) { |
| 183 | image_writer->DumpImageClasses(); |
| 184 | CHECK(image_writer->IsImageClass(klass)) << ClassHelper(klass).GetDescriptor() |
| 185 | << " " << PrettyDescriptor(klass); |
| 186 | } |
| 187 | } |
| 188 | |
| 189 | void ImageWriter::DumpImageClasses() { |
| 190 | typedef std::set<std::string>::const_iterator It; // TODO: C++0x auto |
| 191 | for (It it = image_classes_->begin(), end = image_classes_->end(); it != end; ++it) { |
| 192 | LOG(INFO) << " " << *it; |
| 193 | } |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 194 | } |
| 195 | |
Brian Carlstrom | 78128a6 | 2011-09-15 17:21:19 -0700 | [diff] [blame] | 196 | void ImageWriter::CalculateNewObjectOffsetsCallback(Object* obj, void* arg) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 197 | DCHECK(obj != NULL); |
| 198 | DCHECK(arg != NULL); |
| 199 | ImageWriter* image_writer = reinterpret_cast<ImageWriter*>(arg); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 200 | if (!image_writer->InSourceSpace(obj)) { |
| 201 | return; |
| 202 | } |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 203 | |
| 204 | // 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] | 205 | if (obj->GetClass()->IsStringClass()) { |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 206 | // we must be an interned string that was forward referenced and already assigned |
| 207 | if (IsImageOffsetAssigned(obj)) { |
| 208 | DCHECK_EQ(obj, obj->AsString()->Intern()); |
| 209 | return; |
| 210 | } |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 211 | SirtRef<String> interned(obj->AsString()->Intern()); |
| 212 | if (obj != interned.get()) { |
| 213 | if (!IsImageOffsetAssigned(interned.get())) { |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 214 | // interned obj is after us, allocate its location early |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 215 | image_writer->AssignImageOffset(interned.get()); |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 216 | } |
| 217 | // point those looking for this object to the interned version. |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 218 | SetImageOffset(obj, GetImageOffset(interned.get())); |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 219 | return; |
| 220 | } |
| 221 | // else (obj == interned), nothing to do but fall through to the normal case |
| 222 | } |
| 223 | |
| 224 | image_writer->AssignImageOffset(obj); |
Brian Carlstrom | 4e777d4 | 2011-08-15 13:53:52 -0700 | [diff] [blame] | 225 | } |
| 226 | |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 227 | ObjectArray<Object>* ImageWriter::CreateImageRoots() const { |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 228 | Runtime* runtime = Runtime::Current(); |
| 229 | ClassLinker* class_linker = runtime->GetClassLinker(); |
| 230 | Class* object_array_class = class_linker->FindSystemClass("[Ljava/lang/Object;"); |
Brian Carlstrom | 58ae941 | 2011-10-04 00:56:06 -0700 | [diff] [blame] | 231 | |
| 232 | // build an Object[] of all the DexCaches used in the source_space_ |
Brian Carlstrom | 58ae941 | 2011-10-04 00:56:06 -0700 | [diff] [blame] | 233 | ObjectArray<Object>* dex_caches = ObjectArray<Object>::Alloc(object_array_class, |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 234 | dex_caches_.size()); |
| 235 | int i = 0; |
| 236 | typedef Set::const_iterator It; // TODO: C++0x auto |
| 237 | for (It it = dex_caches_.begin(), end = dex_caches_.end(); it != end; ++it, ++i) { |
| 238 | dex_caches->Set(i, *it); |
Brian Carlstrom | 58ae941 | 2011-10-04 00:56:06 -0700 | [diff] [blame] | 239 | } |
| 240 | |
| 241 | // build an Object[] of the roots needed to restore the runtime |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 242 | SirtRef<ObjectArray<Object> > image_roots( |
| 243 | ObjectArray<Object>::Alloc(object_array_class, ImageHeader::kImageRootsMax)); |
Ian Rogers | 169c9a7 | 2011-11-13 20:13:17 -0800 | [diff] [blame] | 244 | image_roots->Set(ImageHeader::kJniStubArray, runtime->GetJniDlsymLookupStub()); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 245 | image_roots->Set(ImageHeader::kAbstractMethodErrorStubArray, |
| 246 | runtime->GetAbstractMethodErrorStubArray()); |
Ian Rogers | 1cb0a1d | 2011-10-06 15:24:35 -0700 | [diff] [blame] | 247 | image_roots->Set(ImageHeader::kInstanceResolutionStubArray, |
| 248 | runtime->GetResolutionStubArray(Runtime::kInstanceMethod)); |
| 249 | image_roots->Set(ImageHeader::kStaticResolutionStubArray, |
| 250 | runtime->GetResolutionStubArray(Runtime::kStaticMethod)); |
| 251 | image_roots->Set(ImageHeader::kUnknownMethodResolutionStubArray, |
| 252 | runtime->GetResolutionStubArray(Runtime::kUnknownMethod)); |
Ian Rogers | 4f0d07c | 2011-10-06 23:38:47 -0700 | [diff] [blame] | 253 | image_roots->Set(ImageHeader::kCalleeSaveMethod, |
| 254 | runtime->GetCalleeSaveMethod(Runtime::kSaveAll)); |
| 255 | image_roots->Set(ImageHeader::kRefsOnlySaveMethod, |
| 256 | runtime->GetCalleeSaveMethod(Runtime::kRefsOnly)); |
| 257 | image_roots->Set(ImageHeader::kRefsAndArgsSaveMethod, |
| 258 | runtime->GetCalleeSaveMethod(Runtime::kRefsAndArgs)); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 259 | image_roots->Set(ImageHeader::kOatLocation, |
| 260 | String::AllocFromModifiedUtf8(oat_file_->GetLocation().c_str())); |
Brian Carlstrom | 58ae941 | 2011-10-04 00:56:06 -0700 | [diff] [blame] | 261 | image_roots->Set(ImageHeader::kDexCaches, |
| 262 | dex_caches); |
Brian Carlstrom | 34f426c | 2011-10-04 12:58:02 -0700 | [diff] [blame] | 263 | image_roots->Set(ImageHeader::kClassRoots, |
| 264 | class_linker->GetClassRoots()); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 265 | for (int i = 0; i < ImageHeader::kImageRootsMax; i++) { |
| 266 | CHECK(image_roots->Get(i) != NULL); |
| 267 | } |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 268 | return image_roots.get(); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 269 | } |
| 270 | |
Brian Carlstrom | 4e777d4 | 2011-08-15 13:53:52 -0700 | [diff] [blame] | 271 | void ImageWriter::CalculateNewObjectOffsets() { |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 272 | SirtRef<ObjectArray<Object> > image_roots(CreateImageRoots()); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 273 | |
Brian Carlstrom | 4e777d4 | 2011-08-15 13:53:52 -0700 | [diff] [blame] | 274 | HeapBitmap* heap_bitmap = Heap::GetLiveBits(); |
| 275 | DCHECK(heap_bitmap != NULL); |
| 276 | DCHECK_EQ(0U, image_top_); |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 277 | |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 278 | // leave space for the header, but do not write it yet, we need to |
| 279 | // know where image_roots is going to end up |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 280 | image_top_ += RoundUp(sizeof(ImageHeader), 8); // 64-bit-alignment |
| 281 | |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 282 | heap_bitmap->Walk(CalculateNewObjectOffsetsCallback, this); // TODO: add Space-limited Walk |
Brian Carlstrom | 4e777d4 | 2011-08-15 13:53:52 -0700 | [diff] [blame] | 283 | DCHECK_LT(image_top_, image_->GetLength()); |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 284 | |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 285 | // Note that image_top_ is left at end of used space |
| 286 | oat_base_ = image_base_ + RoundUp(image_top_, kPageSize); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 287 | const byte* oat_limit = oat_base_ + oat_file_->GetSize(); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 288 | |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 289 | // return to write header at start of image with future location of image_roots |
| 290 | ImageHeader image_header(reinterpret_cast<uint32_t>(image_base_), |
Brian Carlstrom | 40381fb | 2011-10-19 14:13:40 -0700 | [diff] [blame] | 291 | reinterpret_cast<uint32_t>(GetImageAddress(image_roots.get())), |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 292 | oat_file_->GetOatHeader().GetChecksum(), |
| 293 | reinterpret_cast<uint32_t>(oat_base_), |
| 294 | reinterpret_cast<uint32_t>(oat_limit)); |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 295 | memcpy(image_->GetAddress(), &image_header, sizeof(image_header)); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 296 | } |
| 297 | |
| 298 | void ImageWriter::CopyAndFixupObjects() { |
| 299 | HeapBitmap* heap_bitmap = Heap::GetLiveBits(); |
| 300 | DCHECK(heap_bitmap != NULL); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 301 | // TODO: heap validation can't handle this fix up pass |
| 302 | Heap::DisableObjectValidation(); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 303 | heap_bitmap->Walk(CopyAndFixupObjectsCallback, this); // TODO: add Space-limited Walk |
| 304 | FixupDexCaches(); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 305 | } |
| 306 | |
Brian Carlstrom | 78128a6 | 2011-09-15 17:21:19 -0700 | [diff] [blame] | 307 | void ImageWriter::CopyAndFixupObjectsCallback(Object* object, void* arg) { |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 308 | DCHECK(object != NULL); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 309 | DCHECK(arg != NULL); |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 310 | const Object* obj = object; |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 311 | ImageWriter* image_writer = reinterpret_cast<ImageWriter*>(arg); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 312 | if (!image_writer->InSourceSpace(object)) { |
| 313 | return; |
| 314 | } |
Elliott Hughes | d8ddfd5 | 2011-08-15 14:32:53 -0700 | [diff] [blame] | 315 | |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 316 | // see GetLocalAddress for similar computation |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 317 | size_t offset = image_writer->GetImageOffset(obj); |
Brian Carlstrom | 4e777d4 | 2011-08-15 13:53:52 -0700 | [diff] [blame] | 318 | byte* dst = image_writer->image_->GetAddress() + offset; |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 319 | const byte* src = reinterpret_cast<const byte*>(obj); |
Elliott Hughes | 04b63fd | 2011-08-16 09:40:10 -0700 | [diff] [blame] | 320 | size_t n = obj->SizeOf(); |
Brian Carlstrom | 4e777d4 | 2011-08-15 13:53:52 -0700 | [diff] [blame] | 321 | DCHECK_LT(offset + n, image_writer->image_->GetLength()); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 322 | memcpy(dst, src, n); |
| 323 | Object* copy = reinterpret_cast<Object*>(dst); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 324 | ResetImageOffset(copy); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 325 | image_writer->FixupObject(obj, copy); |
| 326 | } |
| 327 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 328 | void ImageWriter::FixupObject(const Object* orig, Object* copy) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 329 | DCHECK(orig != NULL); |
| 330 | DCHECK(copy != NULL); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 331 | copy->SetClass(down_cast<Class*>(GetImageAddress(orig->GetClass()))); |
Brian Carlstrom | 9cff8e1 | 2011-08-18 16:47:29 -0700 | [diff] [blame] | 332 | // TODO: special case init of pointers to malloc data (or removal of these pointers) |
| 333 | if (orig->IsClass()) { |
| 334 | FixupClass(orig->AsClass(), down_cast<Class*>(copy)); |
| 335 | } else if (orig->IsObjectArray()) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 336 | FixupObjectArray(orig->AsObjectArray<Object>(), down_cast<ObjectArray<Object>*>(copy)); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 337 | } else if (orig->IsMethod()) { |
| 338 | FixupMethod(orig->AsMethod(), down_cast<Method*>(copy)); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 339 | } else { |
| 340 | FixupInstanceFields(orig, copy); |
| 341 | } |
| 342 | } |
| 343 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 344 | void ImageWriter::FixupClass(const Class* orig, Class* copy) { |
Brian Carlstrom | 9cff8e1 | 2011-08-18 16:47:29 -0700 | [diff] [blame] | 345 | FixupInstanceFields(orig, copy); |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 346 | FixupStaticFields(orig, copy); |
Brian Carlstrom | 9cff8e1 | 2011-08-18 16:47:29 -0700 | [diff] [blame] | 347 | } |
| 348 | |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 349 | static uint32_t FixupCode(const ByteArray* copy_code_array, uint32_t orig_code) { |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 350 | // TODO: change to DCHECK when all code compiling |
| 351 | if (copy_code_array == NULL) { |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 352 | return 0; |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 353 | } |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 354 | uint32_t copy_code = reinterpret_cast<uint32_t>(copy_code_array->GetData()); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 355 | // TODO: remember InstructionSet with each code array so we know if we need to do thumb fixup? |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 356 | if ((orig_code % 2) == 1) { |
| 357 | return copy_code + 1; |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 358 | } |
| 359 | return copy_code; |
| 360 | } |
| 361 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 362 | void ImageWriter::FixupMethod(const Method* orig, Method* copy) { |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 363 | FixupInstanceFields(orig, copy); |
Brian Carlstrom | e24fa61 | 2011-09-29 00:53:55 -0700 | [diff] [blame] | 364 | |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 365 | // OatWriter replaces the code_ and invoke_stub_ with offset values. |
| 366 | // Here we readjust to a pointer relative to oat_base_ |
| 367 | |
| 368 | // Every type of method can have an invoke stub |
| 369 | uint32_t invoke_stub_offset = orig->GetOatInvokeStubOffset(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 370 | const byte* invoke_stub = GetOatAddress(invoke_stub_offset); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 371 | copy->invoke_stub_ = reinterpret_cast<const Method::InvokeStub*>(invoke_stub); |
| 372 | |
| 373 | if (orig->IsAbstract()) { |
| 374 | // Abstract methods are pointed to a stub that will throw AbstractMethodError if they are called |
| 375 | ByteArray* orig_ame_stub_array_ = Runtime::Current()->GetAbstractMethodErrorStubArray(); |
| 376 | ByteArray* copy_ame_stub_array_ = down_cast<ByteArray*>(GetImageAddress(orig_ame_stub_array_)); |
| 377 | copy->code_ = copy_ame_stub_array_->GetData(); |
| 378 | return; |
| 379 | } |
| 380 | |
| 381 | // Non-abstract methods typically have code |
| 382 | uint32_t code_offset = orig->GetOatCodeOffset(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 383 | const byte* code = GetOatAddress(code_offset); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 384 | copy->code_ = code; |
| 385 | |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 386 | if (orig->IsNative()) { |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 387 | // The native method's pointer is directed to a stub to lookup via dlsym. |
| 388 | // Note this is not the code_ pointer, that is handled above. |
Ian Rogers | 169c9a7 | 2011-11-13 20:13:17 -0800 | [diff] [blame] | 389 | ByteArray* orig_jni_stub_array_ = Runtime::Current()->GetJniDlsymLookupStub(); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 390 | ByteArray* copy_jni_stub_array_ = down_cast<ByteArray*>(GetImageAddress(orig_jni_stub_array_)); |
| 391 | copy->native_method_ = copy_jni_stub_array_->GetData(); |
| 392 | } else { |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 393 | // normal (non-abstract non-native) methods have mapping tables to relocate |
| 394 | uint32_t mapping_table_off = orig->GetOatMappingTableOffset(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 395 | const byte* mapping_table = GetOatAddress(mapping_table_off); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 396 | copy->mapping_table_ = reinterpret_cast<const uint32_t*>(mapping_table); |
| 397 | |
| 398 | uint32_t vmap_table_offset = orig->GetOatVmapTableOffset(); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 399 | const byte* vmap_table = GetOatAddress(vmap_table_offset); |
Brian Carlstrom | 3320cf4 | 2011-10-04 14:58:28 -0700 | [diff] [blame] | 400 | copy->vmap_table_ = reinterpret_cast<const uint16_t*>(vmap_table); |
Brian Carlstrom | e7d856b | 2012-01-11 18:10:55 -0800 | [diff] [blame^] | 401 | |
| 402 | uint32_t gc_map_offset = orig->GetOatGcMapOffset(); |
| 403 | const byte* gc_map = GetOatAddress(gc_map_offset); |
| 404 | copy->gc_map_ = reinterpret_cast<const uint8_t*>(gc_map); |
Brian Carlstrom | 1619286 | 2011-09-12 17:50:06 -0700 | [diff] [blame] | 405 | } |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 406 | } |
| 407 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 408 | void ImageWriter::FixupObjectArray(const ObjectArray<Object>* orig, ObjectArray<Object>* copy) { |
Elliott Hughes | d8ddfd5 | 2011-08-15 14:32:53 -0700 | [diff] [blame] | 409 | for (int32_t i = 0; i < orig->GetLength(); ++i) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 410 | const Object* element = orig->Get(i); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 411 | copy->SetWithoutChecks(i, GetImageAddress(element)); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 412 | } |
| 413 | } |
| 414 | |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 415 | void ImageWriter::FixupInstanceFields(const Object* orig, Object* copy) { |
| 416 | DCHECK(orig != NULL); |
| 417 | DCHECK(copy != NULL); |
| 418 | Class* klass = orig->GetClass(); |
| 419 | DCHECK(klass != NULL); |
| 420 | FixupFields(orig, |
| 421 | copy, |
| 422 | klass->GetReferenceInstanceOffsets(), |
| 423 | false); |
| 424 | } |
| 425 | |
| 426 | void ImageWriter::FixupStaticFields(const Class* orig, Class* copy) { |
| 427 | DCHECK(orig != NULL); |
| 428 | DCHECK(copy != NULL); |
| 429 | FixupFields(orig, |
| 430 | copy, |
| 431 | orig->GetReferenceStaticOffsets(), |
| 432 | true); |
| 433 | } |
| 434 | |
| 435 | void ImageWriter::FixupFields(const Object* orig, |
| 436 | Object* copy, |
| 437 | uint32_t ref_offsets, |
| 438 | bool is_static) { |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 439 | if (ref_offsets != CLASS_WALK_SUPER) { |
| 440 | // Found a reference offset bitmap. Fixup the specified offsets. |
| 441 | while (ref_offsets != 0) { |
| 442 | size_t right_shift = CLZ(ref_offsets); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 443 | MemberOffset byte_offset = CLASS_OFFSET_FROM_CLZ(right_shift); |
| 444 | const Object* ref = orig->GetFieldObject<const Object*>(byte_offset, false); |
| 445 | copy->SetFieldObject(byte_offset, GetImageAddress(ref), false); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 446 | ref_offsets &= ~(CLASS_HIGH_BIT >> right_shift); |
| 447 | } |
| 448 | } else { |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 449 | // There is no reference offset bitmap. In the non-static case, |
| 450 | // walk up the class inheritance hierarchy and find reference |
| 451 | // offsets the hard way. In the static case, just consider this |
| 452 | // class. |
| 453 | for (const Class *klass = is_static ? orig->AsClass() : orig->GetClass(); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 454 | klass != NULL; |
Brian Carlstrom | 4873d46 | 2011-08-21 15:23:39 -0700 | [diff] [blame] | 455 | klass = is_static ? NULL : klass->GetSuperClass()) { |
| 456 | size_t num_reference_fields = (is_static |
| 457 | ? klass->NumReferenceStaticFields() |
| 458 | : klass->NumReferenceInstanceFields()); |
| 459 | for (size_t i = 0; i < num_reference_fields; ++i) { |
| 460 | Field* field = (is_static |
| 461 | ? klass->GetStaticField(i) |
| 462 | : klass->GetInstanceField(i)); |
Ian Rogers | 0cfe1fb | 2011-08-26 03:29:44 -0700 | [diff] [blame] | 463 | MemberOffset field_offset = field->GetOffset(); |
| 464 | const Object* ref = orig->GetFieldObject<const Object*>(field_offset, false); |
| 465 | copy->SetFieldObject(field_offset, GetImageAddress(ref), false); |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 466 | } |
| 467 | } |
| 468 | } |
| 469 | } |
| 470 | |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 471 | void ImageWriter::FixupDexCaches() { |
| 472 | typedef Set::const_iterator It; // TODO: C++0x auto |
| 473 | for (It it = dex_caches_.begin(), end = dex_caches_.end(); it != end; ++it) { |
| 474 | DexCache* orig = *it; |
| 475 | DexCache* copy = down_cast<DexCache*>(GetLocalAddress(orig)); |
| 476 | FixupDexCache(orig, copy); |
| 477 | } |
| 478 | } |
| 479 | |
| 480 | void ImageWriter::FixupDexCache(const DexCache* orig, DexCache* copy) { |
| 481 | CHECK(orig != NULL); |
| 482 | CHECK(copy != NULL); |
| 483 | |
Ian Rogers | ad25ac5 | 2011-10-04 19:13:33 -0700 | [diff] [blame] | 484 | // The original array value |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 485 | CodeAndDirectMethods* orig_cadms = orig->GetCodeAndDirectMethods(); |
Ian Rogers | ad25ac5 | 2011-10-04 19:13:33 -0700 | [diff] [blame] | 486 | // The compacted object in local memory but not at the correct image address |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 487 | CodeAndDirectMethods* copy_cadms = down_cast<CodeAndDirectMethods*>(GetLocalAddress(orig_cadms)); |
Ian Rogers | ad25ac5 | 2011-10-04 19:13:33 -0700 | [diff] [blame] | 488 | |
Ian Rogers | 1cb0a1d | 2011-10-06 15:24:35 -0700 | [diff] [blame] | 489 | Runtime* runtime = Runtime::Current(); |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 490 | for (size_t i = 0; i < orig->NumResolvedMethods(); i++) { |
| 491 | Method* orig_method = orig->GetResolvedMethod(i); |
Ian Rogers | ad25ac5 | 2011-10-04 19:13:33 -0700 | [diff] [blame] | 492 | if (orig_method != NULL && !InSourceSpace(orig_method)) { |
| 493 | continue; |
| 494 | } |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 495 | // if it was unresolved or a resolved static method in an uninit class, use a resolution stub |
| 496 | // we need to use the stub in the static method case to ensure <clinit> is run. |
Elliott Hughes | c3b77c7 | 2011-12-15 20:56:48 -0800 | [diff] [blame] | 497 | if (orig_method == NULL |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 498 | || (orig_method->IsStatic() && !orig_method->GetDeclaringClass()->IsInitialized())) { |
Ian Rogers | 1cb0a1d | 2011-10-06 15:24:35 -0700 | [diff] [blame] | 499 | uint32_t orig_res_stub_code = orig_cadms->Get(CodeAndDirectMethods::CodeIndex(i)); |
| 500 | if (orig_res_stub_code == 0) { |
| 501 | continue; // NULL maps the same in the image and the original |
Ian Rogers | ad25ac5 | 2011-10-04 19:13:33 -0700 | [diff] [blame] | 502 | } |
Ian Rogers | 1cb0a1d | 2011-10-06 15:24:35 -0700 | [diff] [blame] | 503 | Runtime::TrampolineType type = Runtime::GetTrampolineType(orig_method); // Type of trampoline |
| 504 | ByteArray* orig_res_stub_array = runtime->GetResolutionStubArray(type); |
| 505 | // Do we need to relocate this for this space? |
| 506 | if (!InSourceSpace(orig_res_stub_array)) { |
| 507 | continue; |
| 508 | } |
Ian Rogers | 1cb0a1d | 2011-10-06 15:24:35 -0700 | [diff] [blame] | 509 | // Compute address in image of resolution stub and the code address |
| 510 | ByteArray* image_res_stub_array = down_cast<ByteArray*>(GetImageAddress(orig_res_stub_array)); |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 511 | uint32_t image_res_stub_code = FixupCode(image_res_stub_array, orig_res_stub_code); |
Ian Rogers | 1cb0a1d | 2011-10-06 15:24:35 -0700 | [diff] [blame] | 512 | // Put the image code address in the array |
| 513 | copy_cadms->Set(CodeAndDirectMethods::CodeIndex(i), image_res_stub_code); |
Ian Rogers | ad25ac5 | 2011-10-04 19:13:33 -0700 | [diff] [blame] | 514 | } else if (orig_method->IsDirect()) { |
Brian Carlstrom | ae82698 | 2011-11-09 01:33:42 -0800 | [diff] [blame] | 515 | // if it was resolved in the original, resolve it in the copy |
Brian Carlstrom | 69b15fb | 2011-09-03 12:25:21 -0700 | [diff] [blame] | 516 | Method* copy_method = down_cast<Method*>(GetLocalAddress(orig_method)); |
| 517 | copy_cadms->Set(CodeAndDirectMethods::CodeIndex(i), |
| 518 | reinterpret_cast<int32_t>(copy_method->code_)); |
| 519 | copy_cadms->Set(CodeAndDirectMethods::MethodIndex(i), |
| 520 | reinterpret_cast<int32_t>(GetImageAddress(orig_method))); |
| 521 | } |
| 522 | } |
| 523 | } |
| 524 | |
Brian Carlstrom | db4d540 | 2011-08-09 12:18:28 -0700 | [diff] [blame] | 525 | } // namespace art |