Changeset 94922 in webkit

Timestamp:

Sep 11, 2011 12:08:25 AM (13 years ago)

Author:

Csaba Osztrogonác

Message:

ARM and MIPS assemblers still refer to executable pools.
​https://bugs.webkit.org/show_bug.cgi?id=67903

Patch by Filip Pizlo <​fpizlo@apple.com> on 2011-09-11
Reviewed by Csaba Osztrogonác.

• assembler/ARMAssembler.cpp:

(JSC::ARMAssembler::executableCopy):

• assembler/ARMAssembler.h:
• assembler/AssemblerBufferWithConstantPool.h:
• assembler/MIPSAssembler.h:

(JSC::MIPSAssembler::executableCopy):

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-11  Filip Pizlo  <fpizlo@apple.com>
+
+        ARM and MIPS assemblers still refer to executable pools.
+        https://bugs.webkit.org/show_bug.cgi?id=67903
+
+        Reviewed by Csaba Osztrogonác.
+
+        * assembler/ARMAssembler.cpp:
+        (JSC::ARMAssembler::executableCopy):
+        * assembler/ARMAssembler.h:
+        * assembler/AssemblerBufferWithConstantPool.h:
+        * assembler/MIPSAssembler.h:
+        (JSC::MIPSAssembler::executableCopy):
+
 2011-09-08  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/assembler/ARMAssembler.cpp

@@ -344 +344 @@
 }
 
-void* ARMAssembler::executableCopy(JSGlobalData& globalData, ExecutablePool* allocator)
+PassRefPtr<ExecutableMemoryHandle> ARMAssembler::executableCopy(JSGlobalData& globalData)
 {
     // 64-bit alignment is required for next constant pool and JIT code as well
@@ -351 +351 @@
         bkpt(0);
 
-    char* data = reinterpret_cast<char*>(m_buffer.executableCopy(globalData, allocator));
+    RefPtr<ExecutableMemoryHandle> result = m_buffer.executableCopy(globalData);
+    char* data = reinterpret_cast<char*>(result->start());
 
     for (Jumps::Iterator iter = m_jumps.begin(); iter != m_jumps.end(); ++iter) {
@@ -371 +372 @@
     }
 
-    return data;
+    return result;
 }
 

trunk/Source/JavaScriptCore/assembler/ARMAssembler.h

@@ -680 +680 @@
         }
 
-        void* executableCopy(JSGlobalData&, ExecutablePool* allocator);
+        PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData&);
 
 #ifndef NDEBUG

trunk/Source/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h

@@ -196 +196 @@
     }
 
-    void* executableCopy(JSGlobalData& globalData, ExecutablePool* allocator)
+    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData)
     {
         flushConstantPool(false);
-        return AssemblerBuffer::executableCopy(globalData, allocator);
+        return AssemblerBuffer::executableCopy(globalData);
     }
 

trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h

@@ -646 +646 @@
     }
 
-    void* executableCopy(JSGlobalData& globalData, ExecutablePool* allocator)
-    {
-        void *result = m_buffer.executableCopy(globalData, allocator);
+    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData)
+    {
+        RefPtr<ExecutableMemoryHandle> result = m_buffer.executableCopy(globalData);
         if (!result)
             return 0;
 
-        relocateJumps(m_buffer.data(), result);
-        return result;
+        relocateJumps(m_buffer.data(), result->start());
+        return result.release();
     }