Changeset 46202 in webkit for trunk/JavaScriptCore/assembler/X86Assembler.h

Timestamp:

Jul 21, 2009, 5:37:03 PM (16 years ago)

Author:

[email protected]

Message:

2009-07-21 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Move LinkBuffer/RepatchBuffer out of AbstractMacroAssembler.
( ​https://bugs.webkit.org/show_bug.cgi?id=27485 )

This change is the first step in a process to move code that should be in
the architecture-specific MacroAssembler classes up out of Assmbler and
AbstractMacroAssembler.

• JavaScriptCore.xcodeproj/project.pbxproj:
  • added new files

• assembler/ARMAssembler.h: (JSC::ARMAssembler::linkPointer):
  • rename patchPointer to bring it in line with the current link/repatch naming scheme

• assembler/ARMv7Assembler.h: (JSC::ARMv7Assembler::linkCall): (JSC::ARMv7Assembler::linkPointer): (JSC::ARMv7Assembler::relinkCall): (JSC::ARMv7Assembler::repatchInt32): (JSC::ARMv7Assembler::repatchPointer): (JSC::ARMv7Assembler::setInt32): (JSC::ARMv7Assembler::setPointer):
  • rename patchPointer to bring it in line with the current link/repatch naming scheme

• assembler/AbstractMacroAssembler.h: (JSC::AbstractMacroAssembler::linkJump): (JSC::AbstractMacroAssembler::linkCall): (JSC::AbstractMacroAssembler::linkPointer): (JSC::AbstractMacroAssembler::getLinkerAddress): (JSC::AbstractMacroAssembler::getLinkerCallReturnOffset): (JSC::AbstractMacroAssembler::repatchJump): (JSC::AbstractMacroAssembler::repatchCall): (JSC::AbstractMacroAssembler::repatchNearCall): (JSC::AbstractMacroAssembler::repatchInt32): (JSC::AbstractMacroAssembler::repatchPointer): (JSC::AbstractMacroAssembler::repatchLoadPtrToLEA):
  • remove the LinkBuffer/RepatchBuffer classes, but leave a set of (private, friended) methods to interface to the Assembler

• assembler/LinkBuffer.h: Added. (JSC::LinkBuffer::LinkBuffer): (JSC::LinkBuffer::~LinkBuffer): (JSC::LinkBuffer::link): (JSC::LinkBuffer::patch): (JSC::LinkBuffer::locationOf): (JSC::LinkBuffer::locationOfNearCall): (JSC::LinkBuffer::returnAddressOffset): (JSC::LinkBuffer::finalizeCode): (JSC::LinkBuffer::finalizeCodeAddendum): (JSC::LinkBuffer::code): (JSC::LinkBuffer::performFinalization):
  • new file containing the LinkBuffer class, previously a member of AbstractMacroAssembler

• assembler/RepatchBuffer.h: Added. (JSC::RepatchBuffer::RepatchBuffer): (JSC::RepatchBuffer::relink): (JSC::RepatchBuffer::repatch): (JSC::RepatchBuffer::repatchLoadPtrToLEA): (JSC::RepatchBuffer::relinkCallerToTrampoline): (JSC::RepatchBuffer::relinkCallerToFunction): (JSC::RepatchBuffer::relinkNearCallerToTrampoline):
  • new file containing the RepatchBuffer class, previously a member of AbstractMacroAssembler

• assembler/X86Assembler.h: (JSC::X86Assembler::linkJump): (JSC::X86Assembler::linkCall): (JSC::X86Assembler::linkPointerForCall): (JSC::X86Assembler::linkPointer): (JSC::X86Assembler::relinkJump): (JSC::X86Assembler::relinkCall): (JSC::X86Assembler::repatchInt32): (JSC::X86Assembler::repatchPointer): (JSC::X86Assembler::setPointer): (JSC::X86Assembler::setInt32): (JSC::X86Assembler::setRel32):
  • rename patchPointer to bring it in line with the current link/repatch naming scheme

• jit/JIT.cpp: (JSC::ctiPatchNearCallByReturnAddress): (JSC::ctiPatchCallByReturnAddress):
  • include new headers
  • remove MacroAssembler:: specification from RepatchBuffer usage

• jit/JITPropertyAccess.cpp:
• yarr/RegexJIT.cpp:
  • include new headers

File:

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

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -1368 +1368 @@
 
         char* code = reinterpret_cast<char*>(m_formatter.data());
-        patchRel32(code + from.m_offset, code + to.m_offset);
+        setRel32(code + from.m_offset, code + to.m_offset);
     }
     
@@ -1375 +1375 @@
         ASSERT(from.m_offset != -1);
 
-        patchRel32(reinterpret_cast<char*>(code) + from.m_offset, to);
+        setRel32(reinterpret_cast<char*>(code) + from.m_offset, to);
     }
 
@@ -1382 +1382 @@
         ASSERT(from.m_offset != -1);
 
-        patchRel32(reinterpret_cast<char*>(code) + from.m_offset, to);
-    }
-
-#if PLATFORM(X86_64)
-    static void patchPointerForCall(void* where, void* value)
+        setRel32(reinterpret_cast<char*>(code) + from.m_offset, to);
+    }
+
+#if PLATFORM(X86_64)
+    static void linkPointerForCall(void* where, void* value)
     {
         reinterpret_cast<void**>(where)[-1] = value;
@@ -1392 +1392 @@
 #endif
 
-    static void patchPointer(void* code, JmpDst where, void* value)
+    static void linkPointer(void* code, JmpDst where, void* value)
     {
         ASSERT(where.m_offset != -1);
 
-        patchPointer(reinterpret_cast<char*>(code) + where.m_offset, value);
+        setPointer(reinterpret_cast<char*>(code) + where.m_offset, value);
     }
 
@@ -1402 +1402 @@
     {
         ExecutableAllocator::MakeWritable unprotect(reinterpret_cast<char*>(from) - sizeof(int32_t), sizeof(int32_t));
-        patchRel32(from, to);
+        setRel32(from, to);
     }
     
@@ -1408 +1408 @@
     {
         ExecutableAllocator::MakeWritable unprotect(reinterpret_cast<char*>(from) - sizeof(int32_t), sizeof(int32_t));
-        patchRel32(from, to);
+        setRel32(from, to);
     }
 
@@ -1414 +1414 @@
     {
         ExecutableAllocator::MakeWritable unprotect(reinterpret_cast<char*>(where) - sizeof(int32_t), sizeof(int32_t));
-        patchInt32(where, value);
+        setInt32(where, value);
     }
 
@@ -1420 +1420 @@
     {
         ExecutableAllocator::MakeWritable unprotect(reinterpret_cast<char*>(where) - sizeof(void*), sizeof(void*));
-        patchPointer(where, value);
+        setPointer(where, value);
     }
 
@@ -1478 +1478 @@
 private:
 
-    static void patchPointer(void* where, void* value)
+    static void setPointer(void* where, void* value)
     {
         reinterpret_cast<void**>(where)[-1] = value;
     }
 
-    static void patchInt32(void* where, int32_t value)
+    static void setInt32(void* where, int32_t value)
     {
         reinterpret_cast<int32_t*>(where)[-1] = value;
     }
 
-    static void patchRel32(void* from, void* to)
+    static void setRel32(void* from, void* to)
     {
         intptr_t offset = reinterpret_cast<intptr_t>(to) - reinterpret_cast<intptr_t>(from);
         ASSERT(offset == static_cast<int32_t>(offset));
 
-        patchInt32(from, offset);
+        setInt32(from, offset);
     }