Changeset 158205 in webkit

Timestamp:

Oct 29, 2013 12:02:46 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Fix CPU(ARM_TRADITIONAL) build after r157690.
​https://bugs.webkit.org/show_bug.cgi?id=123247

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

Since r157690, the executableCopy function has been removed from AssemblerBuffer.h
and the copy of executable code occurs in the linkCode function (in LinkBuffer.cpp).
As the constant pool for jumps is updated in the executableCopy function of ARM_TRADITIONAL,
this part of code still needs to be called and absolute jumps must be corrected to anticipate
the copy of the executable code through memcpy.

• assembler/ARMAssembler.cpp:

(JSC::ARMAssembler::prepareExecutableCopy): Rename executableCopy to prepareExecutableCopy
and correct absolute jump values using the delta between the source and destination buffers.

• assembler/ARMAssembler.h:
• assembler/LinkBuffer.cpp:

(JSC::LinkBuffer::linkCode): Call prepareExecutableCopy just before the memcpy.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/ARMAssembler.cpp (modified) (3 diffs)
• assembler/ARMAssembler.h (modified) (1 diff)
• assembler/LinkBuffer.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-10-29  Julien Brianceau  <jbriance@cisco.com>
+
+        Fix CPU(ARM_TRADITIONAL) build after r157690.
+        https://bugs.webkit.org/show_bug.cgi?id=123247
+
+        Reviewed by Michael Saboff.
+
+        Since r157690, the executableCopy function has been removed from AssemblerBuffer.h
+        and the copy of executable code occurs in the linkCode function (in LinkBuffer.cpp).
+        As the constant pool for jumps is updated in the executableCopy function of ARM_TRADITIONAL,
+        this part of code still needs to be called and absolute jumps must be corrected to anticipate
+        the copy of the executable code through memcpy.
+
+        * assembler/ARMAssembler.cpp:
+        (JSC::ARMAssembler::prepareExecutableCopy): Rename executableCopy to prepareExecutableCopy
+        and correct absolute jump values using the delta between the source and destination buffers.
+        * assembler/ARMAssembler.h:
+        * assembler/LinkBuffer.cpp:
+        (JSC::LinkBuffer::linkCode): Call prepareExecutableCopy just before the memcpy.
+
 2013-10-28  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/assembler/ARMAssembler.cpp

@@ -392 +392 @@
 }
 
-PassRefPtr<ExecutableMemoryHandle> 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
@@ -399 +399 @@
         bkpt(0);
 
-    RefPtr<ExecutableMemoryHandle> result = m_buffer.executableCopy(vm, ownerUID, effort);
-    char* data = reinterpret_cast<char*>(result->start());
+    char* data = reinterpret_cast<char*>(m_buffer.data());
+    ptrdiff_t delta = reinterpret_cast<char*>(to) - data;
 
     for (Jumps::Iterator iter = m_jumps.begin(); iter != m_jumps.end(); ++iter) {
@@ -416 +416 @@
                 }
             }
-            *addr = reinterpret_cast<ARMWord>(data + *addr);
-        }
-    }
-
-    return result;
+            *addr = reinterpret_cast<ARMWord>(data + delta + *addr);
+        }
+    }
 }
 

trunk/Source/JavaScriptCore/assembler/ARMAssembler.h

@@ -809 +809 @@
         }
 
-        PassRefPtr<ExecutableMemoryHandle> executableCopy(VM&, void* ownerUID, JITCompilationEffort);
+        void prepareExecutableCopy(void* to);
 
         unsigned debugOffset() { return m_buffer.debugOffset(); }

trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp

@@ -148 +148 @@
         return;
     ASSERT(m_code);
+#if CPU(ARM_TRADITIONAL)
+    m_assembler->m_assembler.prepareExecutableCopy(m_code);
+#endif
     memcpy(m_code, buffer.data(), buffer.codeSize());
 #elif CPU(ARM_THUMB2)