diff options
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/ARMv7Assembler.h | 3 | ||||
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/masm/assembler/ARMv7Assembler.h b/src/3rdparty/masm/assembler/ARMv7Assembler.h index 99a0e82b1a..3a0a435ab9 100644 --- a/src/3rdparty/masm/assembler/ARMv7Assembler.h +++ b/src/3rdparty/masm/assembler/ARMv7Assembler.h @@ -30,6 +30,7 @@ #if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2) #include "AssemblerBuffer.h" +#include "MacroAssemblerCodeRef.h" #include <wtf/Assertions.h> #include <wtf/Vector.h> #include <stdint.h> @@ -2111,7 +2112,7 @@ public: { ASSERT(!(reinterpret_cast<intptr_t>(code) & 1)); ASSERT(from.isSet()); - ASSERT(reinterpret_cast<intptr_t>(to) & 1); + ASSERT_VALID_CODE_POINTER(to); setPointer(reinterpret_cast<uint16_t*>(reinterpret_cast<intptr_t>(code) + from.m_offset) - 1, to, false); } diff --git a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h index 89cffb1278..b699316b91 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h @@ -33,10 +33,12 @@ #include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> #include <wtf/UnusedParam.h> +#include <qglobal.h> // ASSERT_VALID_CODE_POINTER checks that ptr is a non-null pointer, and that it is a valid // instruction address on the platform (for example, check any alignment requirements). -#if CPU(ARM_THUMB2) +// (Disabled checks on Android/ARM because we want to intermix thumb and arm) +#if CPU(ARM_THUMB2) && !defined(Q_OS_ANDROID) // ARM/thumb instructions must be 16-bit aligned, but all code pointers to be loaded // into the processor are decorated with the bottom bit set, indicating that this is // thumb code (as oposed to 32-bit traditional ARM). The first test checks for both |