Add patchoat tool to Art.
Add a new executable called patchoat to art. This tool takes already
compiled images and oat files and changes their base address, acting as
a cheap form of relocation.
Add a --include-patch-information flag to dex2oat and code to add
required patch information to oat files created with the quick compiler.
Bug: 15358152
Change-Id: Ie0c580db45bb14ec180deb84930def6c3628d97d
diff --git a/patchoat/patchoat.h b/patchoat/patchoat.h
new file mode 100644
index 0000000..b9f36d4
--- /dev/null
+++ b/patchoat/patchoat.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ART_PATCHOAT_PATCHOAT_H_
+#define ART_PATCHOAT_PATCHOAT_H_
+
+#include "base/macros.h"
+#include "base/mutex.h"
+#include "instruction_set.h"
+#include "os.h"
+#include "elf_file.h"
+#include "elf_utils.h"
+#include "gc/accounting/space_bitmap.h"
+#include "gc/heap.h"
+#include "utils.h"
+
+namespace art {
+
+class ImageHeader;
+
+namespace mirror {
+class Object;
+class Reference;
+class Class;
+class ArtMethod;
+};
+
+int patchoat(int argc, char** argv);
+
+class PatchOat {
+ public:
+ static bool Patch(File* oat_in, off_t delta, File* oat_out, TimingLogger& timings);
+
+ static bool Patch(const std::string& art_location, off_t delta, File* art_out, InstructionSet isa,
+ TimingLogger& timings);
+
+ static bool Patch(const File* oat_in, const std::string& art_location,
+ off_t delta, File* oat_out, File* art_out, InstructionSet isa,
+ TimingLogger& timings);
+
+ private:
+ std::unique_ptr<ElfFile> oat_file_;
+ MemMap* image_;
+ gc::accounting::ContinuousSpaceBitmap* bitmap_;
+ MemMap* heap_;
+ off_t delta_;
+ TimingLogger& timings_;
+
+ // Takes ownership only of the ElfFile. All other pointers are only borrowed.
+ PatchOat(ElfFile* oat_file, off_t delta, TimingLogger& timings)
+ : oat_file_(oat_file), delta_(delta), timings_(timings) {}
+ PatchOat(MemMap* image, gc::accounting::ContinuousSpaceBitmap* bitmap,
+ MemMap* heap, off_t delta, TimingLogger& timings)
+ : image_(image), bitmap_(bitmap), heap_(heap),
+ delta_(delta), timings_(timings) {}
+ PatchOat(ElfFile* oat_file, MemMap* image, gc::accounting::ContinuousSpaceBitmap* bitmap,
+ MemMap* heap, off_t delta, TimingLogger& timings)
+ : oat_file_(oat_file), image_(image), bitmap_(bitmap), heap_(heap),
+ delta_(delta), timings_(timings) {}
+ ~PatchOat() {}
+
+ static void BitmapCallback(mirror::Object* obj, void* arg)
+ SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
+ reinterpret_cast<PatchOat*>(arg)->VisitObject(obj);
+ }
+
+ void VisitObject(mirror::Object* obj)
+ SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ void FixupMethod(mirror::ArtMethod* object, mirror::ArtMethod* copy)
+ SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ bool InHeap(mirror::Object*);
+
+ bool CheckOatFile();
+
+ // Patches oat in place, modifying the oat_file given to the constructor.
+ bool PatchElf();
+ bool PatchTextSection();
+ bool PatchSymbols(Elf32_Shdr* section);
+
+ bool PatchImage() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+
+ bool WriteElf(File* out);
+ bool WriteImage(File* out);
+
+ mirror::Object* RelocatedCopyOf(mirror::Object*);
+ mirror::Object* RelocatedAddressOf(mirror::Object* obj);
+
+ class PatchVisitor {
+ public:
+ PatchVisitor(PatchOat* patcher, mirror::Object* copy) : patcher_(patcher), copy_(copy) {}
+ ~PatchVisitor() {}
+ void operator() (mirror::Object* obj, MemberOffset off, bool b) const
+ EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_, Locks::heap_bitmap_lock_);
+ // For reference classes.
+ void operator() (mirror::Class* cls, mirror::Reference* ref) const
+ EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_, Locks::heap_bitmap_lock_);
+ private:
+ PatchOat* patcher_;
+ mirror::Object* copy_;
+ };
+
+ DISALLOW_IMPLICIT_CONSTRUCTORS(PatchOat);
+};
+
+} // namespace art
+#endif // ART_PATCHOAT_PATCHOAT_H_