diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-03-08 17:45:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-08 17:45:59 +0000 |
| commit | 8ba5641ddc43fc13cdb0158bd9f3237c4a90a356 (patch) | |
| tree | 4dad508f24b675e87dd31ff26e597289a329c5cc /compiler/optimizing/code_generator_arm_vixl.h | |
| parent | 66f40dbc3e56c7102820842ec49a55b70cf0e151 (diff) | |
| parent | b066d43b1d9184899aff32b1f243d092611ad9c6 (diff) | |
| download | art-8ba5641ddc43fc13cdb0158bd9f3237c4a90a356.tar.gz art-8ba5641ddc43fc13cdb0158bd9f3237c4a90a356.tar.bz2 art-8ba5641ddc43fc13cdb0158bd9f3237c4a90a356.zip | |
Merge "Load ArtMethod* from .data.bimg.rel.ro entries."
Diffstat (limited to 'compiler/optimizing/code_generator_arm_vixl.h')
| -rw-r--r-- | compiler/optimizing/code_generator_arm_vixl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_arm_vixl.h b/compiler/optimizing/code_generator_arm_vixl.h index 8e6bc0627a..054acbc390 100644 --- a/compiler/optimizing/code_generator_arm_vixl.h +++ b/compiler/optimizing/code_generator_arm_vixl.h @@ -580,6 +580,7 @@ class CodeGeneratorARMVIXL : public CodeGenerator { vixl::aarch32::Label add_pc_label; }; + PcRelativePatchInfo* NewBootImageRelRoPatch(uint32_t boot_image_offset); PcRelativePatchInfo* NewBootImageMethodPatch(MethodReference target_method); PcRelativePatchInfo* NewMethodBssEntryPatch(MethodReference target_method); PcRelativePatchInfo* NewBootImageTypePatch(const DexFile& dex_file, dex::TypeIndex type_index); @@ -804,7 +805,7 @@ class CodeGeneratorARMVIXL : public CodeGenerator { // Deduplication map for 32-bit literals, used for non-patchable boot image addresses. Uint32ToLiteralMap uint32_literals_; - // PC-relative method patch info for kBootImageLinkTimePcRelative. + // PC-relative method patch info for kBootImageLinkTimePcRelative/kBootImageRelRo. ArenaDeque<PcRelativePatchInfo> boot_image_method_patches_; // PC-relative method patch info for kBssEntry. ArenaDeque<PcRelativePatchInfo> method_bss_entry_patches_; |