Changeset 87356 in webkit for trunk/Source/JavaScriptCore/assembler/LinkBuffer.h

Timestamp:

May 25, 2011, 9:12:41 PM (14 years ago)

Author:

[email protected]

Message:

Bug 61501 - Unify AbstractMacroAssembler::differenceBetween methods.

Reviewed by Sam Weinig.

• assembler/AbstractMacroAssembler.h:

(JSC::AbstractMacroAssembler::Call::Call):
(JSC::AbstractMacroAssembler::Call::fromTailJump):
(JSC::AbstractMacroAssembler::Jump::Jump):
(JSC::AbstractMacroAssembler::Jump::link):
(JSC::AbstractMacroAssembler::Jump::linkTo):
(JSC::AbstractMacroAssembler::Jump::isSet):
(JSC::AbstractMacroAssembler::differenceBetween):
(JSC::AbstractMacroAssembler::linkJump):
(JSC::AbstractMacroAssembler::getLinkerCallReturnOffset):

• assembler/LinkBuffer.h:

(JSC::LinkBuffer::link):
(JSC::LinkBuffer::locationOf):
(JSC::LinkBuffer::locationOfNearCall):
(JSC::LinkBuffer::returnAddressOffset):

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::linkCall):

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::linkCall):

• assembler/MacroAssemblerMIPS.h:

(JSC::MacroAssemblerMIPS::linkCall):

• assembler/MacroAssemblerSH4.cpp:

(JSC::MacroAssemblerSH4::linkCall):

• assembler/MacroAssemblerX86.h:

(JSC::MacroAssemblerX86::linkCall):

• assembler/MacroAssemblerX86_64.h:

(JSC::MacroAssemblerX86_64::linkCall):

File:

• trunk/Source/JavaScriptCore/assembler/LinkBuffer.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/assembler/LinkBuffer.h

@@ -102 +102 @@
     {
         ASSERT(call.isFlagSet(Call::Linkable));
-        call.m_jmp = applyOffset(call.m_jmp);
+        call.m_label = applyOffset(call.m_label);
         MacroAssembler::linkCall(code(), call, function);
     }
@@ -108 +108 @@
     void link(Jump jump, CodeLocationLabel label)
     {
-        jump.m_jmp = applyOffset(jump.m_jmp);
+        jump.m_label = applyOffset(jump.m_label);
         MacroAssembler::linkJump(code(), jump, label);
     }
@@ -136 +136 @@
         ASSERT(call.isFlagSet(Call::Linkable));
         ASSERT(!call.isFlagSet(Call::Near));
-        return CodeLocationCall(MacroAssembler::getLinkerAddress(code(), applyOffset(call.m_jmp)));
+        return CodeLocationCall(MacroAssembler::getLinkerAddress(code(), applyOffset(call.m_label)));
     }
 
@@ -143 +143 @@
         ASSERT(call.isFlagSet(Call::Linkable));
         ASSERT(call.isFlagSet(Call::Near));
-        return CodeLocationNearCall(MacroAssembler::getLinkerAddress(code(), applyOffset(call.m_jmp)));
+        return CodeLocationNearCall(MacroAssembler::getLinkerAddress(code(), applyOffset(call.m_label)));
     }
 
@@ -170 +170 @@
     unsigned returnAddressOffset(Call call)
     {
-        call.m_jmp = applyOffset(call.m_jmp);
+        call.m_label = applyOffset(call.m_label);
         return MacroAssembler::getLinkerCallReturnOffset(call);
     }