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

Timestamp:

Sep 6, 2008, 10:44:58 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish-extreme to trunk.

File:

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

trunk/JavaScriptCore/VM/SamplingTool.h

@@ -43 +43 @@
     class CodeBlock;
     struct Instruction;
+
+#if ENABLE(SAMPLING_TOOL)
+extern OpcodeID what;
+#endif
 
     struct ScopeSampleRecord {
@@ -109 +113 @@
             m_recordedCodeBlock = 0;
             m_recordedVPC = 0;
+#if ENABLE(SAMPLING_TOOL)
+            what=(OpcodeID)-1;
+#endif
         }
         
@@ -135 +142 @@
 #define MACHINE_SAMPLING_privateExecuteReturned() m_sampler->privateExecuteReturned()
 #define MACHINE_SAMPLING_callingHostFunction() m_sampler->callingHostFunction()
+#define CTI_MACHINE_SAMPLING_callingHostFunction() machine->m_sampler->callingHostFunction()
 #else
 #define SCOPENODE_SAMPLING_notifyOfScope(sampler)
@@ -140 +148 @@
 #define MACHINE_SAMPLING_privateExecuteReturned()
 #define MACHINE_SAMPLING_callingHostFunction()
+#define CTI_MACHINE_SAMPLING_callingHostFunction()
 #endif