summaryrefslogtreecommitdiffstats
path: root/disassembler/disassembler_arm64.cc
diff options
context:
space:
mode:
authorSerban Constantinescu <serban.constantinescu@arm.com>2014-11-25 20:05:46 +0000
committerSerban Constantinescu <serban.constantinescu@arm.com>2014-11-28 12:02:58 +0000
commit32f5b4d2c8c9b52e9522941c159577b21752d0fa (patch)
tree1b30de145c7865fd8a79f17a4cfe67b1b890878c /disassembler/disassembler_arm64.cc
parenteea79dd779ba199658ada7264f8f96d776e53f19 (diff)
downloadart-32f5b4d2c8c9b52e9522941c159577b21752d0fa.tar.gz
art-32f5b4d2c8c9b52e9522941c159577b21752d0fa.tar.bz2
art-32f5b4d2c8c9b52e9522941c159577b21752d0fa.zip
Vixl: Update the VIXL interface to VIXL 1.7 and enable VIXL debug.
This patch updates the interface to VIXL 1.7 and enables the debug version of VIXL when ART is built in debug mode. Change-Id: I443fb941bec3cffefba7038f93bb972e6b7d8db5 Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Diffstat (limited to 'disassembler/disassembler_arm64.cc')
-rw-r--r--disassembler/disassembler_arm64.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/disassembler/disassembler_arm64.cc b/disassembler/disassembler_arm64.cc
index fe50421ed..bd3bebf20 100644
--- a/disassembler/disassembler_arm64.cc
+++ b/disassembler/disassembler_arm64.cc
@@ -74,7 +74,7 @@ void CustomDisassembler::VisitLoadLiteral(const vixl::Instruction* instr) {
++buffer;
}
- void* data_address = instr->LiteralAddress();
+ void* data_address = instr->LiteralAddress<void*>();
ptrdiff_t buf_size_remaining = buffer_end - buffer;
vixl::Instr op = instr->Mask(vixl::LoadLiteralMask);