Changeset 37316 in webkit for trunk/JavaScriptCore/VM/SamplingTool.h

Timestamp:

Oct 5, 2008, 10:38:32 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-05 Gavin Barraclough <​[email protected]>

Reviewed by Cameron Zwarich.

Fix for bug #21387 - using SamplingTool with CTI.

(1) A repatch offset offset changes due to an additional instruction to update SamplingTool state.
(2) Fix an incusion order problem due to ExecState changes.
(3) Change to a MACHINE_SAMPLING macro, use of exec should now be accessing global data.

• VM/CTI.h: (JSC::CTI::execute):
• VM/SamplingTool.h: (JSC::SamplingTool::privateExecuteReturned):
• kjs/Shell.cpp:

File:

• trunk/JavaScriptCore/VM/SamplingTool.h (modified) (2 diffs)

trunk/JavaScriptCore/VM/SamplingTool.h

@@ -108 +108 @@
             m_recordedCodeBlock = 0;
             m_recordedVPC = 0;
+#if ENABLE(SAMPLING_TOOL)
+            currentOpcodeID = static_cast<OpcodeID>(-1);
+#endif
         }
         
@@ -143 +146 @@
 #define MACHINE_SAMPLING_privateExecuteReturned() m_sampler->privateExecuteReturned()
 #define MACHINE_SAMPLING_callingHostFunction() m_sampler->callingHostFunction()
-#define CTI_MACHINE_SAMPLING_callingHostFunction() machine->m_sampler->callingHostFunction()
+#define CTI_MACHINE_SAMPLING_callingHostFunction() ARG_globalData->machine->m_sampler->callingHostFunction()
 #else
 #define SCOPENODE_SAMPLING_notifyOfScope(sampler)