Changeset 157690 in webkit for trunk/Source/JavaScriptCore/assembler/X86Assembler.h

Timestamp:

Oct 19, 2013, 7:07:39 PM (12 years ago)

Author:

[email protected]

Message:

Restructure LinkBuffer to allow for alternate allocation strategies
​https://bugs.webkit.org/show_bug.cgi?id=123071

Reviewed by Oliver Hunt.

The idea is to eventually allow a LinkBuffer to place the code into an already
allocated region of memory. That region of memory could be the nop-slide left behind
by a llvm.webkit.patchpoint.

• assembler/ARM64Assembler.h:

(JSC::ARM64Assembler::buffer):

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

(JSC::LinkBuffer::copyCompactAndLinkCode):
(JSC::LinkBuffer::linkCode):
(JSC::LinkBuffer::allocate):
(JSC::LinkBuffer::shrink):

• assembler/LinkBuffer.h:

(JSC::LinkBuffer::LinkBuffer):
(JSC::LinkBuffer::didFailToAllocate):

• assembler/X86Assembler.h:

(JSC::X86Assembler::buffer):
(JSC::X86Assembler::X86InstructionFormatter::memoryModRM):

File:

• trunk/Source/JavaScriptCore/assembler/X86Assembler.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/assembler/X86Assembler.h

@@ -334 +334 @@
     {
     }
+    
+    AssemblerBuffer& buffer() { return m_formatter.m_buffer; }
 
     // Stack operations:
@@ -2123 +2125 @@
     }
     
-    PassRefPtr<ExecutableMemoryHandle> executableCopy(VM& vm, void* ownerUID, JITCompilationEffort effort)
-    {
-        return m_formatter.executableCopy(vm, ownerUID, effort);
-    }
-
     unsigned debugOffset() { return m_formatter.debugOffset(); }
 
@@ -2481 +2478 @@
         void* data() const { return m_buffer.data(); }
 
-        PassRefPtr<ExecutableMemoryHandle> executableCopy(VM& vm, void* ownerUID, JITCompilationEffort effort)
-        {
-            return m_buffer.executableCopy(vm, ownerUID, effort);
-        }
-
         unsigned debugOffset() { return m_buffer.debugOffset(); }
 
@@ -2659 +2651 @@
 #endif
 
+    public:
         AssemblerBuffer m_buffer;
     } m_formatter;