diff options
| author | Serban Constantinescu <serban.constantinescu@arm.com> | 2014-11-25 20:05:46 +0000 |
|---|---|---|
| committer | Serban Constantinescu <serban.constantinescu@arm.com> | 2014-11-28 12:02:58 +0000 |
| commit | 32f5b4d2c8c9b52e9522941c159577b21752d0fa (patch) | |
| tree | 1b30de145c7865fd8a79f17a4cfe67b1b890878c /disassembler | |
| parent | eea79dd779ba199658ada7264f8f96d776e53f19 (diff) | |
| download | art-32f5b4d2c8c9b52e9522941c159577b21752d0fa.zip art-32f5b4d2c8c9b52e9522941c159577b21752d0fa.tar.gz art-32f5b4d2c8c9b52e9522941c159577b21752d0fa.tar.bz2 | |
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')
| -rw-r--r-- | disassembler/Android.mk | 6 | ||||
| -rw-r--r-- | disassembler/disassembler_arm64.cc | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index f2dd1ee..3ad2941 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -85,7 +85,11 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include external/libcxx/libcxx.mk # For disassembler_arm64. - LOCAL_SHARED_LIBRARIES += libvixl + ifeq ($$(art_ndebug_or_debug),debug) + LOCAL_SHARED_LIBRARIES += libvixld + else + LOCAL_SHARED_LIBRARIES += libvixl + endif ifeq ($$(art_target_or_host),target) include $(BUILD_SHARED_LIBRARY) else # host diff --git a/disassembler/disassembler_arm64.cc b/disassembler/disassembler_arm64.cc index fe50421..bd3bebf 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); |