summaryrefslogtreecommitdiff
path: root/compiler/linker/linker_patch.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2024-04-15 14:04:38 +0000
committer VladimĂ­r Marko <vmarko@google.com> 2024-04-16 09:25:42 +0000
commit253075f929835d5b86b62840459e1b4f63e31aa1 (patch)
tree48048755bb4459ef55e29b4b6d41176e9a79d0ae /compiler/linker/linker_patch.h
parent3293b63fd384bbe7e9c143e8b80761345d507536 (diff)
Rename `.data.bimg.rel.ro` to `.data.img.rel.ro`.
Prepare for adding app image patches to the same section. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 38313278 Change-Id: Ib552f005b3a2859152d0de9fa6b2fcd48a0f3feb
Diffstat (limited to 'compiler/linker/linker_patch.h')
-rw-r--r--compiler/linker/linker_patch.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/linker/linker_patch.h b/compiler/linker/linker_patch.h
index 133088240b..6e09ea8954 100644
--- a/compiler/linker/linker_patch.h
+++ b/compiler/linker/linker_patch.h
@@ -45,7 +45,7 @@ class LinkerPatch {
// Note: Actual patching is instruction_set-dependent.
enum class Type : uint8_t {
kIntrinsicReference, // Boot image reference for an intrinsic, see IntrinsicObjects.
- kDataBimgRelRo,
+ kBootImageRelRo,
kMethodRelative,
kMethodBssEntry,
kJniEntrypointRelative,
@@ -70,10 +70,10 @@ class LinkerPatch {
return patch;
}
- static LinkerPatch DataBimgRelRoPatch(size_t literal_offset,
- uint32_t pc_insn_offset,
- uint32_t boot_image_offset) {
- LinkerPatch patch(literal_offset, Type::kDataBimgRelRo, /* target_dex_file= */ nullptr);
+ static LinkerPatch BootImageRelRoPatch(size_t literal_offset,
+ uint32_t pc_insn_offset,
+ uint32_t boot_image_offset) {
+ LinkerPatch patch(literal_offset, Type::kBootImageRelRo, /* target_dex_file= */ nullptr);
patch.boot_image_offset_ = boot_image_offset;
patch.pc_insn_offset_ = pc_insn_offset;
return patch;
@@ -224,7 +224,7 @@ class LinkerPatch {
}
uint32_t BootImageOffset() const {
- DCHECK(patch_type_ == Type::kDataBimgRelRo);
+ DCHECK(patch_type_ == Type::kBootImageRelRo);
return boot_image_offset_;
}
@@ -276,7 +276,7 @@ class LinkerPatch {
uint32_t PcInsnOffset() const {
DCHECK(patch_type_ == Type::kIntrinsicReference ||
- patch_type_ == Type::kDataBimgRelRo ||
+ patch_type_ == Type::kBootImageRelRo ||
patch_type_ == Type::kMethodRelative ||
patch_type_ == Type::kMethodBssEntry ||
patch_type_ == Type::kJniEntrypointRelative ||
@@ -322,7 +322,7 @@ class LinkerPatch {
Type patch_type_ : 8;
union {
uint32_t cmp1_; // Used for relational operators.
- uint32_t boot_image_offset_; // Data to write to the .data.bimg.rel.ro entry.
+ uint32_t boot_image_offset_; // Data to write to the boot image .data.img.rel.ro entry.
uint32_t method_idx_; // Method index for Call/Method patches.
uint32_t type_idx_; // Type index for Type patches.
uint32_t string_idx_; // String index for String patches.