Changeset 37316 in webkit for trunk/JavaScriptCore

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:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CTI.h (modified) (3 diffs)
• VM/SamplingTool.h (modified) (2 diffs)
• kjs/Shell.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+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:
+
 2008-10-04  Mark Rowe  <[email protected]>
 

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);
         }
 

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)

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -28 +28 @@
 #include "JSLock.h"
 #include "PrototypeFunction.h"
+#include "SamplingTool.h"
 #include "completion.h"
 #include "interpreter.h"