VIXL Dissassembler Integration Upgrade May. 2022

This patch is needed as the VIXL disassembler visitor instrumentation
interface has changed.

VIXL now has all of its instruction specific instrumentation functions
declared as private and therefore they cannot be overriden by the
ART disassembler class as it was before.

Now it is required by VIXL to override the main catch-all generic
Visit function, which now passes with it a metadata object. This
metadata is then used in the overriding function to select which
instrumentation to perform based on the instruction type detected
in the instruction sequence at runtime.

This patch is tested against ART with the public VIXL tag 6.3.0
(https://github.com/Linaro/vixl/tree/6.3.0) having been
merged into the AOSP ./external/vixl repo.

Test: test-art-target
Test: test-art-host
Test: test-art-host-vixl
Test: run-vixl-tests
Test: art_disassembler_tests
Change-Id: I9c2b936354763f0d116dfb7fe355841b9f833a34

1 files changed, 8 insertions, 4 deletions

diff --git a/disassembler/disassembler_arm64.h b/disassembler/disassembler_arm64.h
index a895dfe823..d0443d2b39 100644
--- a/disassembler/disassembler_arm64.h
+++ b/disassembler/disassembler_arm64.h
@@ -47,16 +47,20 @@ class CustomDisassembler final : public vixl::aarch64::Disassembler {
   void AppendRegisterNameToOutput(const vixl::aarch64::Instruction* instr,
                                   const vixl::aarch64::CPURegister& reg) 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;
+
+ private:
   // Improve the disassembly of literal load instructions.
-  void VisitLoadLiteral(const vixl::aarch64::Instruction* instr) override;
+  void VisitLoadLiteralInstr(const vixl::aarch64::Instruction* instr);
 
   // Improve the disassembly of thread offset.
-  void VisitLoadStoreUnsignedOffset(const vixl::aarch64::Instruction* instr) override;
+  void VisitLoadStoreUnsignedOffsetInstr(const vixl::aarch64::Instruction* instr);
 
   // Improve the disassembly of branch to thunk jumping to pointer from thread entrypoint.
-  void VisitUnconditionalBranch(const vixl::aarch64::Instruction* instr) override;
+  void VisitUnconditionalBranchInstr(const vixl::aarch64::Instruction* instr);
 
- private:
   void AppendThreadOfsetName(const vixl::aarch64::Instruction* instr);
 
   // Indicate if the disassembler should read data loaded from literal pools.