Changeset 37191 in webkit for trunk/JavaScriptCore/VM

Timestamp:

Oct 2, 2008, 9:22:58 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-02 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Fixed ​https://bugs.webkit.org/show_bug.cgi?id=21283.
Profiler Crashes When Started

• VM/Machine.cpp:
• VM/Machine.h: (JSC::makeHostCallFramePointer): (JSC::isHostCallFrame): (JSC::stripHostCallFrameBit): Moved some things to the header so JSGlobalObject could use them.

• kjs/JSGlobalObject.h: (JSC::JSGlobalObject::JSGlobalObjectData::JSGlobalObjectData): Call the new makeHostCallFramePointer API, since 0 no longer indicates a host call frame.

Location:

trunk/JavaScriptCore/VM

Files:

• Machine.cpp (modified) (1 diff)
• Machine.h (modified) (2 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -105 +105 @@
 
 #endif // #ENABLE(CTI)
-
-static const intptr_t HostCallFrameMask = 1;
-
-static inline Register* makeHostCallFramePointer(Register* callFrame)
-{
-    return reinterpret_cast<Register*>(reinterpret_cast<intptr_t>(callFrame) | HostCallFrameMask);
-}
-
-static inline bool isHostCallFrame(Register* callFrame)
-{
-    return reinterpret_cast<intptr_t>(callFrame) & HostCallFrameMask;
-}
-
-static inline Register* stripHostCallFrameBit(Register* callFrame)
-{
-    return reinterpret_cast<Register*>(reinterpret_cast<intptr_t>(callFrame) & ~HostCallFrameMask);
-}
 
 // Returns the depth of the scope chain within a given call frame.

trunk/JavaScriptCore/VM/Machine.h

@@ -315 +315 @@
     ALWAYS_INLINE void Machine::initializeCallFrame(Register* callFrame, CodeBlock* codeBlock, Instruction* vPC, ScopeChainNode* scopeChain, Register* r, int returnValueRegister, int argc, JSValue* function)
     {
+        ASSERT(r); // use makeHostCallFramePointer(0) to create a host call frame sentinel.
         callFrame[RegisterFile::CodeBlock] = codeBlock;
         callFrame[RegisterFile::ScopeChain] = scopeChain;
@@ -326 +327 @@
     }
 
+    static const intptr_t HostCallFrameMask = 1;
+
+    static inline Register* makeHostCallFramePointer(Register* callFrame)
+    {
+        return reinterpret_cast<Register*>(reinterpret_cast<intptr_t>(callFrame) | HostCallFrameMask);
+    }
+
+    static inline bool isHostCallFrame(Register* callFrame)
+    {
+        return reinterpret_cast<intptr_t>(callFrame) & HostCallFrameMask;
+    }
+
+    static inline Register* stripHostCallFrameBit(Register* callFrame)
+    {
+        return reinterpret_cast<Register*>(reinterpret_cast<intptr_t>(callFrame) & ~HostCallFrameMask);
+    }
+
 } // namespace JSC