diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-01-14 15:39:17 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-01-19 11:19:38 +0000 |
| commit | f8bcf723ce920981705c6913fffb1f4d3de6793d (patch) | |
| tree | d0bced1e1e422c32d3f148c1ded7846063fb25f6 /src/3rdparty/masm/disassembler/ARMv7 | |
| parent | 9876f7ac8bd3679a9ed0e617aaadad032403a88f (diff) | |
V4: add Aarch64/ARM64 support.
This uses the JavaScriptCore assembler rev. 195098. It is tested on iOS
(for which it is disabled, as it only allows marking pages as executable when
running from Xcode). Testing on Linux will be done when hardware
arrives.
Change-Id: I650e15fec03c27d4b326a2d70863a89b85cfc5c3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/masm/disassembler/ARMv7')
| -rw-r--r-- | src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.cpp b/src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.cpp index d9afdd447a..6af71e523b 100644 --- a/src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.cpp +++ b/src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.cpp @@ -1623,6 +1623,8 @@ const char* ARMv7DOpcodeVCVT::format() default: n1 = "vcvt.?"; n2 = ".?"; + dregPrefix = '?'; + mregPrefix = '?'; break; } diff --git a/src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.h b/src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.h index 051d05525a..03e0ba21c4 100644 --- a/src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.h +++ b/src/3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.h @@ -127,7 +127,7 @@ protected: void appendPCRelativeOffset(int32_t immediate) { - bufferPrintf("0x%x", reinterpret_cast<uint32_t>(m_currentPC + immediate)); + bufferPrintf("%p", m_currentPC + immediate); } void appendShiftAmount(unsigned amount) |