Changeset 157796 in webkit

Timestamp:

Oct 22, 2013 8:51:51 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r157690, r157699) Fix architectures using AssemblerBufferWithConstantPool.
​https://bugs.webkit.org/show_bug.cgi?id=123092

Patch by Julien Brianceau <​jbriance@cisco.com> on 2013-10-22
Reviewed by Michael Saboff.

Impacted architectures are SH4 and ARM_TRADITIONAL.

• assembler/ARMAssembler.h:

(JSC::ARMAssembler::buffer):

• assembler/AssemblerBufferWithConstantPool.h:

(JSC::AssemblerBufferWithConstantPool::flushConstantPool):

• assembler/LinkBuffer.cpp:

(JSC::LinkBuffer::linkCode):

• assembler/SH4Assembler.h:

(JSC::SH4Assembler::buffer):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/ARMAssembler.h (modified) (1 diff)
• assembler/AssemblerBufferWithConstantPool.h (modified) (2 diffs)
• assembler/LinkBuffer.cpp (modified) (1 diff)
• assembler/SH4Assembler.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-10-22  Julien Brianceau  <jbriance@cisco.com>
+
+        REGRESSION(r157690, r157699) Fix architectures using AssemblerBufferWithConstantPool.
+        https://bugs.webkit.org/show_bug.cgi?id=123092
+
+        Reviewed by Michael Saboff.
+
+        Impacted architectures are SH4 and ARM_TRADITIONAL.
+
+        * assembler/ARMAssembler.h:
+        (JSC::ARMAssembler::buffer):
+        * assembler/AssemblerBufferWithConstantPool.h:
+        (JSC::AssemblerBufferWithConstantPool::flushConstantPool):
+        * assembler/LinkBuffer.cpp:
+        (JSC::LinkBuffer::linkCode):
+        * assembler/SH4Assembler.h:
+        (JSC::SH4Assembler::buffer):
+
 2013-10-22  Julien Brianceau  <jbriance@cisco.com>
 

trunk/Source/JavaScriptCore/assembler/ARMAssembler.h

@@ -151 +151 @@
         {
         }
+
+        ARMBuffer& buffer() { return m_buffer; }
 
         // ARM conditional constants

trunk/Source/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h

@@ -224 +224 @@
     }
 
+    void flushConstantPool(bool useBarrier = true)
+    {
+        if (!m_numConsts)
+            return;
+        int alignPool = (codeSize() + (useBarrier ? barrierSize : 0)) & (sizeof(uint64_t) - 1);
+
+        if (alignPool)
+            alignPool = sizeof(uint64_t) - alignPool;
+
+        // Callback to protect the constant pool from execution
+        if (useBarrier)
+            putIntegral(AssemblerType::placeConstantPoolBarrier(m_numConsts * sizeof(uint32_t) + alignPool));
+
+        if (alignPool) {
+            if (alignPool & 1)
+                AssemblerBuffer::putByte(AssemblerType::padForAlign8);
+            if (alignPool & 2)
+                AssemblerBuffer::putShort(AssemblerType::padForAlign16);
+            if (alignPool & 4)
+                AssemblerBuffer::putInt(AssemblerType::padForAlign32);
+        }
+
+        int constPoolOffset = codeSize();
+        append(reinterpret_cast<char*>(m_pool), m_numConsts * sizeof(uint32_t));
+
+        // Patch each PC relative load
+        for (LoadOffsets::Iterator iter = m_loadOffsets.begin(); iter != m_loadOffsets.end(); ++iter) {
+            void* loadAddr = reinterpret_cast<char*>(data()) + *iter;
+            AssemblerType::patchConstantPoolLoad(loadAddr, reinterpret_cast<char*>(data()) + constPoolOffset);
+        }
+
+        m_loadOffsets.clear();
+        m_numConsts = 0;
+    }
+
 private:
     void correctDeltas(int insnSize)
@@ -268 +303 @@
     }
 
-    void flushConstantPool(bool useBarrier = true)
-    {
-        if (m_numConsts == 0)
-            return;
-        int alignPool = (codeSize() + (useBarrier ? barrierSize : 0)) & (sizeof(uint64_t) - 1);
-
-        if (alignPool)
-            alignPool = sizeof(uint64_t) - alignPool;
-
-        // Callback to protect the constant pool from execution
-        if (useBarrier)
-            putIntegral(AssemblerType::placeConstantPoolBarrier(m_numConsts * sizeof(uint32_t) + alignPool));
-
-        if (alignPool) {
-            if (alignPool & 1)
-                AssemblerBuffer::putByte(AssemblerType::padForAlign8);
-            if (alignPool & 2)
-                AssemblerBuffer::putShort(AssemblerType::padForAlign16);
-            if (alignPool & 4)
-                AssemblerBuffer::putInt(AssemblerType::padForAlign32);
-        }
-
-        int constPoolOffset = codeSize();
-        append(reinterpret_cast<char*>(m_pool), m_numConsts * sizeof(uint32_t));
-
-        // Patch each PC relative load
-        for (LoadOffsets::Iterator iter = m_loadOffsets.begin(); iter != m_loadOffsets.end(); ++iter) {
-            void* loadAddr = reinterpret_cast<char*>(data()) + *iter;
-            AssemblerType::patchConstantPoolLoad(loadAddr, reinterpret_cast<char*>(data()) + constPoolOffset);
-        }
-
-        m_loadOffsets.clear();
-        m_numConsts = 0;
-    }
-
     void flushIfNoSpaceFor(int nextInsnSize)
     {

trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp

@@ -137 +137 @@
     ASSERT(!m_code);
 #if !ENABLE(BRANCH_COMPACTION)
+#if defined(ASSEMBLER_HAS_CONSTANT_POOL) && ASSEMBLER_HAS_CONSTANT_POOL
+    m_assembler->m_assembler.buffer().flushConstantPool(false);
+#endif
     AssemblerBuffer& buffer = m_assembler->m_assembler.buffer();
     allocate(buffer.codeSize(), ownerUID, effort);

trunk/Source/JavaScriptCore/assembler/SH4Assembler.h

@@ -350 +350 @@
     }
 
-    AssemblerBuffer& buffer() { return m_buffer; }
+    SH4Buffer& buffer() { return m_buffer; }
 
     // SH4 condition codes