Print the full relative address in Arm64

By printing with trailing zeroes (e.g. 0x00004074 instead of
0x4074) this brings Arm64 on par with other architectures.

Bug: 364443075
Fixes: 364443075
Test: art/test/testrunner/testrunner.py --target --64 --optimizing
Change-Id: Iade36a91316ca4310d71846ff2953ff7419877ee

2 files changed, 15 insertions, 0 deletions

diff --git a/disassembler/disassembler_arm64.cc b/disassembler/disassembler_arm64.cc
index 23472a8dca..ef27e75c8c 100644
--- a/disassembler/disassembler_arm64.cc
+++ b/disassembler/disassembler_arm64.cc
@@ -60,6 +60,17 @@ void CustomDisassembler::AppendRegisterNameToOutput(const Instruction* instr,
   Disassembler::AppendRegisterNameToOutput(instr, reg);
 }
 
+void CustomDisassembler::AppendCodeRelativeAddressToOutput(const Instruction* instr,
+                                                           const void* addr) {
+  USE(instr);
+  int64_t rel_addr = CodeRelativeAddress(addr);
+  if (rel_addr >= 0) {
+    AppendToOutput("(addr 0x%08" PRIx64 ")", rel_addr);
+  } else {
+    AppendToOutput("(addr -0x%08" PRIx64 ")", -rel_addr);
+  }
+}
+
 void CustomDisassembler::Visit(vixl::aarch64::Metadata* metadata, const Instruction* instr) {
   vixl::aarch64::Disassembler::Visit(metadata, instr);
   const std::string& form = (*metadata)["form"];
diff --git a/disassembler/disassembler_arm64.h b/disassembler/disassembler_arm64.h
index 7d49a03f58..d1b509127c 100644
--- a/disassembler/disassembler_arm64.h
+++ b/disassembler/disassembler_arm64.h
@@ -48,6 +48,10 @@ class CustomDisassembler final : public vixl::aarch64::Disassembler {
   void AppendRegisterNameToOutput(const vixl::aarch64::Instruction* instr,
                                   const vixl::aarch64::CPURegister& reg) override;
 
+  // Overriding to print the address with trailing zeroes e.g. 0x00004074 instead of 0x4074.
+  void AppendCodeRelativeAddressToOutput(const vixl::aarch64::Instruction* instr,
+                                         const void* addr) override;
+
   // Intercepts the instruction flow captured by the parent method,
   // to specially instrument for particular instruction types.
   void Visit(vixl::aarch64::Metadata* metadata, const vixl::aarch64::Instruction* instr) override;