Changeset 37316 in webkit for trunk/JavaScriptCore/VM/CTI.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/CTI.h (modified) (3 diffs)

trunk/JavaScriptCore/VM/CTI.h

@@ -37 +37 @@
 #include <wtf/AlwaysInline.h>
 #include <wtf/Vector.h>
-
-#if ENABLE(SAMPLING_TOOL)
-#include "SamplingTool.h"
-#endif
 
 #if COMPILER(MSVC)
@@ -260 +256 @@
         static const int repatchOffsetGetByIdBranchToSlowCase = 25;
         static const int repatchOffsetGetByIdPropertyMapOffset = 34;
+#if ENABLE(SAMPLING_TOOL)
+        static const int repatchOffsetGetByIdSlowCaseCall = 27 + ctiArgumentInitSize;
+#else
         static const int repatchOffsetGetByIdSlowCaseCall = 17 + ctiArgumentInitSize;
+#endif
 
     public:
@@ -326 +326 @@
         inline static JSValue* execute(void* code, RegisterFile* registerFile, Register* r, JSGlobalData* globalData, JSValue** exception)
         {
-            JSValue* value = ctiTrampoline(code, registerFile, r, exception, Profiler::enabledProfilerReference(), globalData);
-#if ENABLE(SAMPLING_TOOL)
-            currentOpcodeID = static_cast<OpcodeID>(-1);
-#endif
-            return value;
+            return ctiTrampoline(code, registerFile, r, exception, Profiler::enabledProfilerReference(), globalData);
         }