Changeset 44705 in webkit for trunk/JavaScriptCore/assembler

Timestamp:

Jun 15, 2009, 8:01:12 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-15 Gavin Barraclough <​[email protected]>

Reviewed by Sam Weinig.

Having introduced the RepatchBuffer, ProcessorReturnAddress is now a do-nothing
wrapper around ReturnAddressPtr. Remove it. In tugging on this piece of string
it made sense to roll out the use of ReturnAddressPtr a little further into
JITStubs (which had always been the intention).

No performance impact.

• assembler/AbstractMacroAssembler.h: (JSC::AbstractMacroAssembler::RepatchBuffer::relinkCallerToTrampoline): (JSC::AbstractMacroAssembler::RepatchBuffer::relinkCallerToFunction): (JSC::AbstractMacroAssembler::RepatchBuffer::relinkNearCallerToTrampoline):
• assembler/MacroAssemblerCodeRef.h: (JSC::ReturnAddressPtr::ReturnAddressPtr):
• bytecode/CodeBlock.h: (JSC::CodeBlock::getStubInfo): (JSC::CodeBlock::getCallLinkInfo): (JSC::CodeBlock::getMethodCallLinkInfo): (JSC::CodeBlock::getBytecodeIndex):
• interpreter/Interpreter.cpp: (JSC::bytecodeOffsetForPC):
• jit/JIT.cpp: (JSC::ctiPatchNearCallByReturnAddress): (JSC::ctiPatchCallByReturnAddress):
• jit/JIT.h: (JSC::JIT::compileGetByIdProto): (JSC::JIT::compileGetByIdChain): (JSC::JIT::compilePutByIdTransition): (JSC::JIT::compilePatchGetArrayLength):
• jit/JITPropertyAccess.cpp: (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::patchGetByIdSelf): (JSC::JIT::patchPutByIdReplace): (JSC::JIT::privateCompilePatchGetArrayLength): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdChain):
• jit/JITStubs.cpp: (JSC::JITThunks::tryCachePutByID): (JSC::JITThunks::tryCacheGetByID): (JSC::StackHack::StackHack): (JSC::returnToThrowTrampoline): (JSC::throwStackOverflowError): (JSC::JITStubs::DEFINE_STUB_FUNCTION):
• jit/JITStubs.h: (JSC::): (JSC::JITStackFrame::returnAddressSlot):
• runtime/JSGlobalData.h:

Location:

trunk/JavaScriptCore/assembler

Files:

• AbstractMacroAssembler.h (modified) (4 diffs)
• MacroAssemblerCodeRef.h (modified) (1 diff)

trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -58 +58 @@
     class CodeLocationDataLabel32;
     class CodeLocationDataLabelPtr;
-    class ProcessorReturnAddress;
 
     typedef typename AssemblerType::RegisterID RegisterID;
@@ -493 +492 @@
         friend class PatchBuffer;
         friend class RepatchBuffer;
-        friend class ProcessorReturnAddress;
 
     public:
@@ -628 +626 @@
         {
         }
-    };
-
-    // ProcessorReturnAddress:
-    //
-    // This class can be used to relink a call identified by its return address.
-    class ProcessorReturnAddress {
-    public:
-        ProcessorReturnAddress(void* location)
-            : m_location(location)
-        {
-        }
-
-        void* addressForLookup()
-        {
-            return m_location.value();
-        }
-
-        ReturnAddressPtr m_location;
     };
 
@@ -863 +843 @@
         }
 
-        void relinkCallerToTrampoline(ProcessorReturnAddress returnAddress, CodeLocationLabel label)
-        {
-            relink(CodeLocationCall(CodePtr(returnAddress.m_location)), label);
-        }
-        
-        void relinkCallerToTrampoline(ProcessorReturnAddress returnAddress, CodePtr newCalleeFunction)
+        void relinkCallerToTrampoline(ReturnAddressPtr returnAddress, CodeLocationLabel label)
+        {
+            relink(CodeLocationCall(CodePtr(returnAddress)), label);
+        }
+        
+        void relinkCallerToTrampoline(ReturnAddressPtr returnAddress, CodePtr newCalleeFunction)
         {
             relinkCallerToTrampoline(returnAddress, CodeLocationLabel(newCalleeFunction));
         }
 
-        void relinkCallerToFunction(ProcessorReturnAddress returnAddress, FunctionPtr function)
-        {
-            relink(CodeLocationCall(CodePtr(returnAddress.m_location)), function);
-        }
-        
-        void relinkNearCallerToTrampoline(ProcessorReturnAddress returnAddress, CodeLocationLabel label)
-        {
-            relink(CodeLocationNearCall(CodePtr(returnAddress.m_location)), label);
-        }
-        
-        void relinkNearCallerToTrampoline(ProcessorReturnAddress returnAddress, CodePtr newCalleeFunction)
+        void relinkCallerToFunction(ReturnAddressPtr returnAddress, FunctionPtr function)
+        {
+            relink(CodeLocationCall(CodePtr(returnAddress)), function);
+        }
+        
+        void relinkNearCallerToTrampoline(ReturnAddressPtr returnAddress, CodeLocationLabel label)
+        {
+            relink(CodeLocationNearCall(CodePtr(returnAddress)), label);
+        }
+        
+        void relinkNearCallerToTrampoline(ReturnAddressPtr returnAddress, CodePtr newCalleeFunction)
         {
             relinkNearCallerToTrampoline(returnAddress, CodeLocationLabel(newCalleeFunction));

trunk/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -99 +99 @@
     }
 
+    explicit ReturnAddressPtr(FunctionPtr function)
+        : m_value(function.value())
+    {
+        ASSERT_VALID_CODE_POINTER(m_value);
+    }
+
     void* value() const { return m_value; }