Extend relocation packing to cover arm64.

tools/relocation_packer/src/packer_unittest.cc

Index: tools/relocation_packer/src/packer_unittest.cc
diff --git a/tools/relocation_packer/src/packer_unittest.cc b/tools/relocation_packer/src/packer_unittest.cc
index ac70caa360a1287ef7c0eb7569220857da7d3f33..de5be7979da33c82d5053d481fb5aaf7004f1104 100644
--- a/tools/relocation_packer/src/packer_unittest.cc
+++ b/tools/relocation_packer/src/packer_unittest.cc
@@ -24,11 +24,30 @@ bool CheckRelocation(ELF::Addr addr, const ELF::Rel& relocation) {
       ELF_R_TYPE(relocation.r_info) == ELF::kRelativeRelocationCode;
 }
 
+void AddRelocation(ELF::Addr addr,
+                   ELF::Sxword addend,
+                   std::vector<ELF::Rela>* relocations) {
+  ELF::Rela relocation;
+  relocation.r_offset = addr;
+  relocation.r_info = ELF_R_INFO(0, ELF::kRelativeRelocationCode);
+  relocation.r_addend = addend;
+  relocations->push_back(relocation);
+}
+
+bool CheckRelocation(ELF::Addr addr,
+                     ELF::Sxword addend,
+                     const ELF::Rela& relocation) {
+  return relocation.r_offset == addr &&
+      ELF_R_SYM(relocation.r_info) == 0 &&
+      ELF_R_TYPE(relocation.r_info) == ELF::kRelativeRelocationCode &&
+      relocation.r_addend == addend;
+}
+
 }  // namespace
 
 namespace relocation_packer {
 
-TEST(Packer, Pack) {
+TEST(Packer, PackRel) {
   std::vector<ELF::Rel> relocations;
   std::vector<uint8_t> packed;
 
@@ -72,7 +91,7 @@ TEST(Packer, Pack) {
   EXPECT_EQ(0, packed[15]);
 }
 
-TEST(Packer, Unpack) {
+TEST(Packer, UnpackRel) {
   std::vector<uint8_t> packed;
   std::vector<ELF::Rel> relocations;
 
@@ -116,4 +135,116 @@ TEST(Packer, Unpack) {
   EXPECT_TRUE(CheckRelocation(0xd1ce0020, relocations[5]));
 }
 
+TEST(Packer, PackRela) {
+  std::vector<ELF::Rela> relocations;
+  std::vector<uint8_t> packed;
+
+  RelocationPacker packer;
+
+  // Initial relocation.
+  AddRelocation(0xd1ce0000, 10000, &relocations);
+  // Two more relocations, 4 byte offset deltas, 12 byte addend deltas.
+  AddRelocation(0xd1ce0004, 10012, &relocations);
+  AddRelocation(0xd1ce0008, 10024, &relocations);
+  // Three more relocations, 8 byte deltas, -24 byte addend deltas.
+  AddRelocation(0xd1ce0010, 10000, &relocations);
+  AddRelocation(0xd1ce0018, 9976, &relocations);
+  AddRelocation(0xd1ce0020, 9952, &relocations);
+
+  packed.clear();
+  packer.PackRelativeRelocations(relocations, &packed);
+
+  EXPECT_EQ(24, packed.size());
+  // Identifier.
+  EXPECT_EQ('A', packed[0]);
+  EXPECT_EQ('P', packed[1]);
+  EXPECT_EQ('A', packed[2]);
+  EXPECT_EQ('1', packed[3]);
+  // Delta pairs count.
+  EXPECT_EQ(6, packed[4]);
+  // 0xd1ce0000
+  EXPECT_EQ(128, packed[5]);
+  EXPECT_EQ(128, packed[6]);
+  EXPECT_EQ(184, packed[7]);
+  EXPECT_EQ(142, packed[8]);
+  EXPECT_EQ(13, packed[9]);
+  // 10000
+  EXPECT_EQ(144, packed[10]);
+  EXPECT_EQ(206, packed[11]);
+  EXPECT_EQ(0, packed[12]);
+  // 4, 12
+  EXPECT_EQ(4, packed[13]);
+  EXPECT_EQ(12, packed[14]);
+  // 4, 12
+  EXPECT_EQ(4, packed[15]);
+  EXPECT_EQ(12, packed[16]);
+  // 8, -24
+  EXPECT_EQ(8, packed[17]);
+  EXPECT_EQ(104, packed[18]);
+  // 8, -24
+  EXPECT_EQ(8, packed[19]);
+  EXPECT_EQ(104, packed[20]);
+  // 8, -24
+  EXPECT_EQ(8, packed[21]);
+  EXPECT_EQ(104, packed[22]);
+  // Padding.
+  EXPECT_EQ(0, packed[23]);
+}
+
+TEST(Packer, UnpackRela) {
+  std::vector<uint8_t> packed;
+  std::vector<ELF::Rela> relocations;
+
+  RelocationPacker packer;
+
+  // Identifier.
+  packed.push_back('A');
+  packed.push_back('P');
+  packed.push_back('A');
+  packed.push_back('1');
+  // Delta pairs count.
+  packed.push_back(6);
+  // 0xd1ce0000
+  packed.push_back(128);
+  packed.push_back(128);
+  packed.push_back(184);
+  packed.push_back(142);
+  packed.push_back(13);
+  // 10000
+  packed.push_back(144);
+  packed.push_back(206);
+  packed.push_back(0);
+  // 4, 12
+  packed.push_back(4);
+  packed.push_back(12);
+  // 4, 12
+  packed.push_back(4);
+  packed.push_back(12);
+  // 8, -24
+  packed.push_back(8);
+  packed.push_back(104);
+  // 8, -24
+  packed.push_back(8);
+  packed.push_back(104);
+  // 8, -24
+  packed.push_back(8);
+  packed.push_back(104);
+  // Padding.
+  packed.push_back(0);
+
+  relocations.clear();
+  packer.UnpackRelativeRelocations(packed, &relocations);
+
+  EXPECT_EQ(6, relocations.size());
+  // Initial relocation.
+  EXPECT_TRUE(CheckRelocation(0xd1ce0000, 10000, relocations[0]));
+  // Two more relocations, 4 byte offset deltas, 12 byte addend deltas.
+  EXPECT_TRUE(CheckRelocation(0xd1ce0004, 10012, relocations[1]));
+  EXPECT_TRUE(CheckRelocation(0xd1ce0008, 10024, relocations[2]));
+  // Three more relocations, 8 byte offset deltas, -24 byte addend deltas.
+  EXPECT_TRUE(CheckRelocation(0xd1ce0010, 10000, relocations[3]));
+  EXPECT_TRUE(CheckRelocation(0xd1ce0018, 9976, relocations[4]));
+  EXPECT_TRUE(CheckRelocation(0xd1ce0020, 9952, relocations[5]));
+}
+
 }  // namespace relocation_packer