From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/assembler/ARMAssembler.cpp | 27 ++++-------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'Source/JavaScriptCore/assembler/ARMAssembler.cpp') diff --git a/Source/JavaScriptCore/assembler/ARMAssembler.cpp b/Source/JavaScriptCore/assembler/ARMAssembler.cpp index 4f4199bf2..f9100d4c9 100644 --- a/Source/JavaScriptCore/assembler/ARMAssembler.cpp +++ b/Source/JavaScriptCore/assembler/ARMAssembler.cpp @@ -391,15 +391,15 @@ void ARMAssembler::baseIndexTransferFloat(DataTransferTypeFloat transferType, FP dataTransferFloat(transferType, srcDst, ARMRegisters::S1, offset); } -PassRefPtr ARMAssembler::executableCopy(VM& vm, void* ownerUID, JITCompilationEffort effort) +void ARMAssembler::prepareExecutableCopy(void* to) { // 64-bit alignment is required for next constant pool and JIT code as well m_buffer.flushWithoutBarrier(true); if (!m_buffer.isAligned(8)) bkpt(0); - RefPtr result = m_buffer.executableCopy(vm, ownerUID, effort); - char* data = reinterpret_cast(result->start()); + char* data = reinterpret_cast(m_buffer.data()); + ptrdiff_t delta = reinterpret_cast(to) - data; for (Jumps::Iterator iter = m_jumps.begin(); iter != m_jumps.end(); ++iter) { // The last bit is set if the constant must be placed on constant pool. @@ -415,30 +415,11 @@ PassRefPtr ARMAssembler::executableCopy(VM& vm, void* ow continue; } } - *addr = reinterpret_cast(data + *addr); + *addr = reinterpret_cast(data + delta + *addr); } } - - return result; } -#if OS(LINUX) && COMPILER(RVCT) - -__asm void ARMAssembler::cacheFlush(void* code, size_t size) -{ - ARM - push {r7} - add r1, r1, r0 - mov r7, #0xf0000 - add r7, r7, #0x2 - mov r2, #0x0 - svc #0x0 - pop {r7} - bx lr -} - -#endif - } // namespace JSC #endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL) -- cgit v1.2.1