JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / assembler / LinkBuffer.cpp

diff --git a/assembler/LinkBuffer.cpp b/assembler/LinkBuffer.cpp
index e4bc95853c5bac95b3e46a7f00fcf521dac75ed1..d53ef451b1ce6a35fd2970e503f66d49f0793e37 100644 (file)
--- a/assembler/LinkBuffer.cpp
+++ b/assembler/LinkBuffer.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2012 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
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -28,52 +28,86 @@
 
 #if ENABLE(ASSEMBLER)
 
 
 #if ENABLE(ASSEMBLER)
 

+#include "CodeBlock.h"
+#include "JITCode.h"
+#include "JSCInlines.h"

 #include "Options.h"
 #include "Options.h"

+#include "VM.h"
+#include <wtf/CompilationThread.h>

 
 namespace JSC {
 
 
 namespace JSC {
 

+bool shouldShowDisassemblyFor(CodeBlock* codeBlock)
+{
+    if (JITCode::isOptimizingJIT(codeBlock->jitType()) && Options::showDFGDisassembly())
+        return true;
+    return Options::showDisassembly();
+}
+

 LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithoutDisassembly()
 {
     performFinalization();
     
 LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithoutDisassembly()
 {
     performFinalization();
     

-    return CodeRef(m_executableMemory);
+    ASSERT(m_didAllocate);
+    if (m_executableMemory)
+        return CodeRef(m_executableMemory);
+    
+    return CodeRef::createSelfManagedCodeRef(MacroAssemblerCodePtr(m_code));

 }
 
 LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithDisassembly(const char* format, ...)
 {
 }
 
 LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithDisassembly(const char* format, ...)
 {

-    ASSERT(Options::showDisassembly() || Options::showDFGDisassembly());
-    

     CodeRef result = finalizeCodeWithoutDisassembly();
     CodeRef result = finalizeCodeWithoutDisassembly();

+
+    if (m_alreadyDisassembled)
+        return result;

     
     

-    dataLogF("Generated JIT code for ");
+    StringPrintStream out;
+    out.printf("Generated JIT code for ");

     va_list argList;
     va_start(argList, format);
     va_list argList;
     va_start(argList, format);

-    WTF::dataLogFV(format, argList);
+    out.vprintf(format, argList);

     va_end(argList);
     va_end(argList);

-    dataLogF(":\n");
+    out.printf(":\n");
+
+    out.printf("    Code at [%p, %p):\n", result.code().executableAddress(), static_cast<char*>(result.code().executableAddress()) + result.size());
+    
+    CString header = out.toCString();
+    
+    if (Options::asyncDisassembly()) {
+        disassembleAsynchronously(header, result, m_size, "    ");
+        return result;
+    }

     
     

-    dataLogF("    Code at [%p, %p):\n", result.code().executableAddress(), static_cast<char*>(result.code().executableAddress()) + result.size());
+    dataLog(header);

     disassemble(result.code(), m_size, "    ", WTF::dataFile());
     
     return result;
 }
 
 #if ENABLE(BRANCH_COMPACTION)
     disassemble(result.code(), m_size, "    ", WTF::dataFile());
     
     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<int32_t*>(assemblerData.buffer());
+    while (ptr < end)
+        offsets[ptr++] = offset;
+}
+

 template <typename InstructionType>
 template <typename InstructionType>

-void LinkBuffer::copyCompactAndLinkCode(void* ownerUID, JITCompilationEffort effort)
+void LinkBuffer::copyCompactAndLinkCode(MacroAssembler& macroAssembler, void* ownerUID, JITCompilationEffort effort)

 {
 {

-    m_initialSize = m_assembler->m_assembler.codeSize();
-    m_executableMemory = m_vm->executableAllocator.allocate(*m_vm, m_initialSize, ownerUID, effort);
-    if (!m_executableMemory)
+    m_initialSize = macroAssembler.m_assembler.codeSize();
+    allocate(m_initialSize, ownerUID, effort);
+    if (didFailToAllocate())

         return;
         return;

-    m_code = (uint8_t*)m_executableMemory->start();
-    ASSERT(m_code);
-    ExecutableAllocator::makeWritable(m_code, m_initialSize);
-    uint8_t* inData = (uint8_t*)m_assembler->unlinkedCode();
+    Vector<LinkRecord, 0, UnsafeVectorOverflow>& jumpsToLink = macroAssembler.jumpsToLink();
+    m_assemblerStorage = macroAssembler.m_assembler.buffer().releaseAssemblerData();
+    uint8_t* inData = reinterpret_cast<uint8_t*>(m_assemblerStorage.buffer());

     uint8_t* outData = reinterpret_cast<uint8_t*>(m_code);
     int readPtr = 0;
     int writePtr = 0;
     uint8_t* outData = reinterpret_cast<uint8_t*>(m_code);
     int readPtr = 0;
     int writePtr = 0;

-    Vector<LinkRecord, 0, UnsafeVectorOverflow>& jumpsToLink = m_assembler->jumpsToLink();

     unsigned jumpCount = jumpsToLink.size();
     for (unsigned i = 0; i < jumpCount; ++i) {
         int offset = readPtr - writePtr;
     unsigned jumpCount = jumpsToLink.size();
     for (unsigned i = 0; i < jumpCount; ++i) {
         int offset = readPtr - writePtr;


@@ -89,7 +123,7 @@ void LinkBuffer::copyCompactAndLinkCode(void* ownerUID, JITCompilationEffort eff
         ASSERT(!(writePtr % 2));
         while (copySource != copyEnd)
             *copyDst++ = *copySource++;
         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;
             
         readPtr += regionSize;
         writePtr += regionSize;
             


@@ -99,33 +133,32 @@ 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
         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...
         // Compact branch if we can...

-        if (m_assembler->canCompact(jumpsToLink[i].type())) {
+        if (MacroAssembler::canCompact(jumpsToLink[i].type())) {

             // Step back in the write stream
             // 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;
             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);
             }
         }
         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();
         
     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();
     }
 
     jumpsToLink.clear();

-    m_size = writePtr + m_initialSize - readPtr;
-    m_executableMemory->shrink(m_size);
+    shrink(writePtr + m_initialSize - readPtr);

 
 #if DUMP_LINK_STATISTICS
     dumpLinkStatistics(m_code, m_initialSize, m_size);
 
 #if DUMP_LINK_STATISTICS
     dumpLinkStatistics(m_code, m_initialSize, m_size);


@@ -137,26 +170,63 @@ void LinkBuffer::copyCompactAndLinkCode(void* ownerUID, JITCompilationEffort eff
 #endif
 
 
 #endif
 
 

-void LinkBuffer::linkCode(void* ownerUID, JITCompilationEffort effort)
+void LinkBuffer::linkCode(MacroAssembler& macroAssembler, void* ownerUID, JITCompilationEffort effort)

 {
 {

-    ASSERT(!m_code);

 #if !ENABLE(BRANCH_COMPACTION)
 #if !ENABLE(BRANCH_COMPACTION)

-    m_executableMemory = m_assembler->m_assembler.executableCopy(*m_vm, ownerUID, effort);
-    if (!m_executableMemory)
+#if defined(ASSEMBLER_HAS_CONSTANT_POOL) && ASSEMBLER_HAS_CONSTANT_POOL
+    macroAssembler.m_assembler.buffer().flushConstantPool(false);
+#endif
+    AssemblerBuffer& buffer = macroAssembler.m_assembler.buffer();
+    allocate(buffer.codeSize(), ownerUID, effort);
+    if (!m_didAllocate)

         return;
         return;

-    m_code = m_executableMemory->start();
-    m_size = m_assembler->m_assembler.codeSize();

     ASSERT(m_code);
     ASSERT(m_code);

+#if CPU(ARM_TRADITIONAL)
+    macroAssembler.m_assembler.prepareExecutableCopy(m_code);
+#endif
+    memcpy(m_code, buffer.data(), buffer.codeSize());
+#if CPU(MIPS)
+    macroAssembler.m_assembler.relocateJumps(buffer.data(), m_code);
+#endif

 #elif CPU(ARM_THUMB2)
 #elif CPU(ARM_THUMB2)

-    copyCompactAndLinkCode<uint16_t>(ownerUID, effort);
+    copyCompactAndLinkCode<uint16_t>(macroAssembler, ownerUID, effort);

 #elif CPU(ARM64)
 #elif CPU(ARM64)

-    copyCompactAndLinkCode<uint32_t>(ownerUID, effort);
+    copyCompactAndLinkCode<uint32_t>(macroAssembler, ownerUID, effort);

 #endif
 }
 
 #endif
 }
 

+void LinkBuffer::allocate(size_t initialSize, void* ownerUID, JITCompilationEffort effort)
+{
+    if (m_code) {
+        if (initialSize > m_size)
+            return;
+        
+        m_didAllocate = true;
+        m_size = initialSize;
+        return;
+    }
+    
+    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;
+}
+
+void LinkBuffer::shrink(size_t newSize)
+{
+    if (!m_executableMemory)
+        return;
+    m_size = newSize;
+    m_executableMemory->shrink(m_size);
+}
+

 void LinkBuffer::performFinalization()
 {
 #ifndef NDEBUG
 void LinkBuffer::performFinalization()
 {
 #ifndef NDEBUG

+    ASSERT(!isCompilationThread());

     ASSERT(!m_completed);
     ASSERT(isValid());
     m_completed = true;
     ASSERT(!m_completed);
     ASSERT(isValid());
     m_completed = true;