From a4e969f4965059196ca948db781e52f7cfebf19e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 24 May 2016 08:28:08 +0000 Subject: webkitgtk-2.12.3 --- Source/JavaScriptCore/assembler/LinkBuffer.cpp | 104 ++++++++++++++++--------- 1 file changed, 67 insertions(+), 37 deletions(-) (limited to 'Source/JavaScriptCore/assembler/LinkBuffer.cpp') diff --git a/Source/JavaScriptCore/assembler/LinkBuffer.cpp b/Source/JavaScriptCore/assembler/LinkBuffer.cpp index a7f469da8..82fb2ed39 100644 --- a/Source/JavaScriptCore/assembler/LinkBuffer.cpp +++ b/Source/JavaScriptCore/assembler/LinkBuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. + * Copyright (C) 2012-2015 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,12 +28,22 @@ #if ENABLE(ASSEMBLER) +#include "CodeBlock.h" +#include "JITCode.h" +#include "JSCInlines.h" #include "Options.h" #include "VM.h" #include namespace JSC { +bool shouldDumpDisassemblyFor(CodeBlock* codeBlock) +{ + if (JITCode::isOptimizingJIT(codeBlock->jitType()) && Options::dumpDFGDisassembly()) + return true; + return Options::dumpDisassembly(); +} + LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithoutDisassembly() { performFinalization(); @@ -47,38 +57,57 @@ LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithoutDisassembly() LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithDisassembly(const char* format, ...) { - ASSERT(Options::showDisassembly() || Options::showDFGDisassembly()); - CodeRef result = finalizeCodeWithoutDisassembly(); -#if ENABLE(DISASSEMBLER) - dataLogF("Generated JIT code for "); + if (m_alreadyDisassembled) + return result; + + StringPrintStream out; + out.printf("Generated JIT code for "); va_list argList; va_start(argList, format); - WTF::dataLogFV(format, argList); + out.vprintf(format, argList); va_end(argList); - dataLogF(":\n"); + out.printf(":\n"); + + out.printf(" Code at [%p, %p):\n", result.code().executableAddress(), static_cast(result.code().executableAddress()) + result.size()); + + CString header = out.toCString(); - dataLogF(" Code at [%p, %p):\n", result.code().executableAddress(), static_cast(result.code().executableAddress()) + result.size()); + if (Options::asyncDisassembly()) { + disassembleAsynchronously(header, result, m_size, " "); + return result; + } + + dataLog(header); disassemble(result.code(), m_size, " ", WTF::dataFile()); -#else - UNUSED_PARAM(format); -#endif // ENABLE(DISASSEMBLER) return result; } #if ENABLE(BRANCH_COMPACTION) +static ALWAYS_INLINE void recordLinkOffsets(AssemblerData& assemblerData, int32_t regionStart, int32_t regionEnd, int32_t offset) +{ + int32_t ptr = regionStart / sizeof(int32_t); + const int32_t end = regionEnd / sizeof(int32_t); + int32_t* offsets = reinterpret_cast(assemblerData.buffer()); + while (ptr < end) + offsets[ptr++] = offset; +} + template -void LinkBuffer::copyCompactAndLinkCode(void* ownerUID, JITCompilationEffort effort) +void LinkBuffer::copyCompactAndLinkCode(MacroAssembler& macroAssembler, void* ownerUID, JITCompilationEffort effort) { - m_initialSize = m_assembler->m_assembler.codeSize(); + m_initialSize = macroAssembler.m_assembler.codeSize(); allocate(m_initialSize, ownerUID, effort); - uint8_t* inData = (uint8_t*)m_assembler->unlinkedCode(); + if (didFailToAllocate()) + return; + Vector& jumpsToLink = macroAssembler.jumpsToLink(); + m_assemblerStorage = macroAssembler.m_assembler.buffer().releaseAssemblerData(); + uint8_t* inData = reinterpret_cast(m_assemblerStorage.buffer()); uint8_t* outData = reinterpret_cast(m_code); int readPtr = 0; int writePtr = 0; - Vector& jumpsToLink = m_assembler->jumpsToLink(); unsigned jumpCount = jumpsToLink.size(); for (unsigned i = 0; i < jumpCount; ++i) { int offset = readPtr - writePtr; @@ -94,7 +123,7 @@ void LinkBuffer::copyCompactAndLinkCode(void* ownerUID, JITCompilationEffort eff ASSERT(!(writePtr % 2)); while (copySource != copyEnd) *copyDst++ = *copySource++; - m_assembler->recordLinkOffsets(readPtr, jumpsToLink[i].from(), offset); + recordLinkOffsets(m_assemblerStorage, readPtr, jumpsToLink[i].from(), offset); readPtr += regionSize; writePtr += regionSize; @@ -104,28 +133,28 @@ void LinkBuffer::copyCompactAndLinkCode(void* ownerUID, JITCompilationEffort eff if (jumpsToLink[i].to() >= jumpsToLink[i].from()) target = outData + jumpsToLink[i].to() - offset; // Compensate for what we have collapsed so far else - target = outData + jumpsToLink[i].to() - m_assembler->executableOffsetFor(jumpsToLink[i].to()); + target = outData + jumpsToLink[i].to() - executableOffsetFor(jumpsToLink[i].to()); - JumpLinkType jumpLinkType = m_assembler->computeJumpType(jumpsToLink[i], outData + writePtr, target); + JumpLinkType jumpLinkType = MacroAssembler::computeJumpType(jumpsToLink[i], outData + writePtr, target); // Compact branch if we can... - if (m_assembler->canCompact(jumpsToLink[i].type())) { + if (MacroAssembler::canCompact(jumpsToLink[i].type())) { // Step back in the write stream - int32_t delta = m_assembler->jumpSizeDelta(jumpsToLink[i].type(), jumpLinkType); + int32_t delta = MacroAssembler::jumpSizeDelta(jumpsToLink[i].type(), jumpLinkType); if (delta) { writePtr -= delta; - m_assembler->recordLinkOffsets(jumpsToLink[i].from() - delta, readPtr, readPtr - writePtr); + recordLinkOffsets(m_assemblerStorage, jumpsToLink[i].from() - delta, readPtr, readPtr - writePtr); } } jumpsToLink[i].setFrom(writePtr); } // Copy everything after the last jump memcpy(outData + writePtr, inData + readPtr, m_initialSize - readPtr); - m_assembler->recordLinkOffsets(readPtr, m_initialSize, readPtr - writePtr); + recordLinkOffsets(m_assemblerStorage, readPtr, m_initialSize, readPtr - writePtr); for (unsigned i = 0; i < jumpCount; ++i) { uint8_t* location = outData + jumpsToLink[i].from(); - uint8_t* target = outData + jumpsToLink[i].to() - m_assembler->executableOffsetFor(jumpsToLink[i].to()); - m_assembler->link(jumpsToLink[i], location, target); + uint8_t* target = outData + jumpsToLink[i].to() - executableOffsetFor(jumpsToLink[i].to()); + MacroAssembler::link(jumpsToLink[i], location, target); } jumpsToLink.clear(); @@ -141,29 +170,31 @@ void LinkBuffer::copyCompactAndLinkCode(void* ownerUID, JITCompilationEffort eff #endif -void LinkBuffer::linkCode(void* ownerUID, JITCompilationEffort effort) +void LinkBuffer::linkCode(MacroAssembler& macroAssembler, void* ownerUID, JITCompilationEffort effort) { #if !ENABLE(BRANCH_COMPACTION) #if defined(ASSEMBLER_HAS_CONSTANT_POOL) && ASSEMBLER_HAS_CONSTANT_POOL - m_assembler->m_assembler.buffer().flushConstantPool(false); + macroAssembler.m_assembler.buffer().flushConstantPool(false); #endif - AssemblerBuffer& buffer = m_assembler->m_assembler.buffer(); + AssemblerBuffer& buffer = macroAssembler.m_assembler.buffer(); allocate(buffer.codeSize(), ownerUID, effort); if (!m_didAllocate) return; ASSERT(m_code); #if CPU(ARM_TRADITIONAL) - m_assembler->m_assembler.prepareExecutableCopy(m_code); + macroAssembler.m_assembler.prepareExecutableCopy(m_code); #endif memcpy(m_code, buffer.data(), buffer.codeSize()); #if CPU(MIPS) - m_assembler->m_assembler.relocateJumps(buffer.data(), m_code); + macroAssembler.m_assembler.relocateJumps(buffer.data(), m_code); #endif #elif CPU(ARM_THUMB2) - copyCompactAndLinkCode(ownerUID, effort); + copyCompactAndLinkCode(macroAssembler, ownerUID, effort); #elif CPU(ARM64) - copyCompactAndLinkCode(ownerUID, effort); + copyCompactAndLinkCode(macroAssembler, ownerUID, effort); #endif + + m_linkTasks = WTFMove(macroAssembler.m_linkTasks); } void LinkBuffer::allocate(size_t initialSize, void* ownerUID, JITCompilationEffort effort) @@ -180,7 +211,6 @@ void LinkBuffer::allocate(size_t initialSize, void* ownerUID, JITCompilationEffo m_executableMemory = m_vm->executableAllocator.allocate(*m_vm, initialSize, ownerUID, effort); if (!m_executableMemory) return; - ExecutableAllocator::makeWritable(m_executableMemory->start(), m_executableMemory->sizeInBytes()); m_code = m_executableMemory->start(); m_size = initialSize; m_didAllocate = true; @@ -188,12 +218,17 @@ void LinkBuffer::allocate(size_t initialSize, void* ownerUID, JITCompilationEffo void LinkBuffer::shrink(size_t newSize) { + if (!m_executableMemory) + return; m_size = newSize; m_executableMemory->shrink(m_size); } void LinkBuffer::performFinalization() { + for (auto& task : m_linkTasks) + task->run(*this); + #ifndef NDEBUG ASSERT(!isCompilationThread()); ASSERT(!m_completed); @@ -201,11 +236,6 @@ void LinkBuffer::performFinalization() m_completed = true; #endif -#if ENABLE(BRANCH_COMPACTION) - ExecutableAllocator::makeExecutable(code(), m_initialSize); -#else - ExecutableAllocator::makeExecutable(code(), m_size); -#endif MacroAssembler::cacheFlush(code(), m_size); } -- cgit v1.2.1