Changeset 46209 in webkit for trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

Timestamp:

Jul 21, 2009, 8:24:34 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam Weinig.

Move call linking / repatching down from AbstractMacroAssembler into MacroAssemblerARCH classes.
( ​https://bugs.webkit.org/show_bug.cgi?id=27527 )

This allows the implementation to be defined per architecture. Specifically this addresses the
fact that x86-64 MacroAssembler implements far calls as a load to register, followed by a call
to register. Patching the call actually requires the pointer load to be patched, rather than
the call to be patched. This is implementation detail specific to MacroAssemblerX86_64, and as
such is best handled there.

• assembler/AbstractMacroAssembler.h:
• assembler/MacroAssemblerARM.h: (JSC::MacroAssemblerARM::linkCall): (JSC::MacroAssemblerARM::repatchCall):
• assembler/MacroAssemblerARMv7.h: (JSC::MacroAssemblerARMv7::linkCall): (JSC::MacroAssemblerARMv7::repatchCall):
• assembler/MacroAssemblerX86.h: (JSC::MacroAssemblerX86::linkCall): (JSC::MacroAssemblerX86::repatchCall):
• assembler/MacroAssemblerX86_64.h: (JSC::MacroAssemblerX86_64::linkCall): (JSC::MacroAssemblerX86_64::repatchCall):

File:

• trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h (modified) (6 diffs)

trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -36 +36 @@
 #if ENABLE(ASSEMBLER)
 
-// FIXME: keep transitioning this out into MacroAssemblerX86_64.
-#if PLATFORM(X86_64)
-#define REPTACH_OFFSET_CALL_R11 3
-#endif
-
 namespace JSC {
 
@@ -296 +291 @@
         template<class TemplateAssemblerType>
         friend class AbstractMacroAssembler;
-        friend class LinkBuffer;
+
     public:
         enum Flags {
@@ -331 +326 @@
         }
 
+        JmpSrc m_jmp;
     private:
-        JmpSrc m_jmp;
         Flags m_flags;
     };
@@ -486 +481 @@
     AssemblerType m_assembler;
 
-private:
     friend class LinkBuffer;
     friend class RepatchBuffer;
@@ -495 +489 @@
     }
 
-    static void linkCall(void* code, Call call, FunctionPtr function)
-    {
-#if PLATFORM(X86_64)
-        if (!call.isFlagSet(Call::Near)) {
-            char* callLocation = reinterpret_cast<char*>(getLinkerAddress(code, call.m_jmp)) - REPTACH_OFFSET_CALL_R11;
-            AssemblerType::linkPointerForCall(callLocation, function.value());
-        } else
-#endif
-        AssemblerType::linkCall(code, call.m_jmp, function.value());
-    }
-
     static void linkPointer(void* code, typename AssemblerType::JmpDst label, void* value)
     {
@@ -531 +514 @@
     }
 
-    static void repatchCall(CodeLocationCall call, CodeLocationLabel destination)
-    {
-#if PLATFORM(X86_64)
-        AssemblerType::repatchPointer(call.dataLabelPtrAtOffset(-REPTACH_OFFSET_CALL_R11).dataLocation(), destination.executableAddress());
-#else
-        AssemblerType::relinkCall(call.dataLocation(), destination.executableAddress());
-#endif
-    }
-
-    static void repatchCall(CodeLocationCall call, FunctionPtr destination)
-    {
-#if PLATFORM(X86_64)
-        AssemblerType::repatchPointer(call.dataLabelPtrAtOffset(-REPTACH_OFFSET_CALL_R11).dataLocation(), destination.executableAddress());
-#else
-        AssemblerType::relinkCall(call.dataLocation(), destination.executableAddress());
-#endif
-    }
-
     static void repatchNearCall(CodeLocationNearCall nearCall, CodeLocationLabel destination)
     {