Changeset 34067 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

May 23, 2008, 2:07:06 AM (17 years ago)

Author:

[email protected]

Message:

Remove JAVASCRIPT_PROFILER define

RS=Kevin McCullough

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (19 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -440 +440 @@
 static NEVER_INLINE JSValue* callEval(ExecState* exec, JSObject* thisObj, ScopeChainNode* scopeChain, RegisterFile* registerFile, Register* r, int argv, int argc, JSValue*& exceptionValue)
 {
-#if JAVASCRIPT_PROFILING
     Profiler** profiler = Profiler::enabledProfilerReference();
     JSObject* evalFunction = scopeChain->globalObject()->evalFunction();
     if (*profiler)
         (*profiler)->willExecute(exec, evalFunction);
-#endif
 
     JSValue* x = argc >= 2 ? r[argv + 1].u.jsValue : jsUndefined();
@@ -469 +467 @@
     }
 
-#if JAVASCRIPT_PROFILING
     JSValue* result = machine().execute(evalNode.get(), exec, thisObj, registerFile, r - (*registerFile->basePointer()) + argv + argc, scopeChain, &exceptionValue);
 
@@ -476 +473 @@
 
     return result;
-#else
-    return machine().execute(evalNode.get(), exec, thisObj, registerFile, r - (*registerFile->basePointer()) + argv + argc, scopeChain, &exceptionValue);
-#endif
 }
 
@@ -608 +602 @@
     vPC = callFrame[ReturnVPC].u.vPC;
 
-#if JAVASCRIPT_PROFILING
     if (Profiler* profiler = *Profiler::enabledProfilerReference())
         profiler->didExecute(exec, callFrame[Callee].u.jsObject);
-#endif
     return true;
 }
@@ -673 +665 @@
         scopeChain = scopeChain->copy();
 
-#if JAVASCRIPT_PROFILING
     Profiler** profiler = Profiler::enabledProfilerReference();
     if (*profiler)
         (*profiler)->willExecute(exec, programNode->sourceURL(), programNode->lineNo());
-#endif
 
     ExecState newExec(exec, this, registerFile, scopeChain, -1);
@@ -687 +677 @@
     registerFileStack->popGlobalRegisterFile();
 
-#if JAVASCRIPT_PROFILING
     if (*profiler)
         (*profiler)->didExecute(exec, programNode->sourceURL(), programNode->lineNo());
-#endif
 
     return result;
@@ -740 +728 @@
     ExecState newExec(exec, this, registerFile, scopeChain, callFrameOffset);
     
-#if JAVASCRIPT_PROFILING
     Profiler** profiler = Profiler::enabledProfilerReference();
     if (*profiler)
         (*profiler)->willExecute(exec, function);
-#endif
 
     m_reentryDepth++;
@@ -750 +736 @@
     m_reentryDepth--;
 
-#if JAVASCRIPT_PROFILING
     if (*profiler)
         (*profiler)->didExecute(exec, function);
-#endif
+
     registerFile->shrink(oldSize);
     return result;
@@ -805 +790 @@
         scopeChain = scopeChain->copy();
 
-#if JAVASCRIPT_PROFILING
     Profiler** profiler = Profiler::enabledProfilerReference();
     if (*profiler)
         (*profiler)->willExecute(exec, evalNode->sourceURL(), evalNode->lineNo());
-#endif
 
     ExecState newExec(exec, this, registerFile, scopeChain, -1);
@@ -819 +802 @@
     registerFile->shrink(oldSize);
 
-#if JAVASCRIPT_PROFILING
     if (*profiler)
         (*profiler)->didExecute(exec, evalNode->sourceURL(), evalNode->lineNo());
-#endif
 
     return result;
@@ -898 +879 @@
     Instruction* vPC = codeBlock->instructions.begin();
     JSValue** k = codeBlock->jsValues.data();
-#if JAVASCRIPT_PROFILING
     Profiler** enabledProfilerReference = Profiler::enabledProfilerReference();
     
@@ -908 +888 @@
     profilerFetchHack:
 #endif
-    
-#endif
-    
+
     registerFile->setSafeForReentry(false);
 #define VM_CHECK_EXCEPTION() \
@@ -1924 +1902 @@
         
         if (callType == CallTypeJS) {
-#if JAVASCRIPT_PROFILING
             if (*enabledProfilerReference)
                 (*enabledProfilerReference)->willExecute(exec, static_cast<JSObject*>(v));
-#endif
             int registerOffset = r - (*registerBase);
             Register* callFrame = r + argv - CallFrameHeaderSize;
@@ -1953 +1929 @@
 
         if (callType == CallTypeNative) {
-#if JAVASCRIPT_PROFILING
             if (*enabledProfilerReference)
                 (*enabledProfilerReference)->willExecute(exec, static_cast<JSObject*>(v));
-#endif
             int registerOffset = r - (*registerBase);
 
@@ -1971 +1945 @@
             r[dst].u.jsValue = returnValue;
 
-#if JAVASCRIPT_PROFILING
             if (*enabledProfilerReference)
                 (*enabledProfilerReference)->didExecute(exec, static_cast<JSObject*>(v));
-#endif
             VM_CHECK_EXCEPTION();
 
@@ -2020 +1992 @@
         int r0 = callFrame[ReturnValueRegister].u.i;
         r[r0].u.jsValue = returnValue;
-        
-#if JAVASCRIPT_PROFILING
+
         if (*enabledProfilerReference)
             (*enabledProfilerReference)->didExecute(exec, callFrame[Callee].u.jsObject);
-#endif
+
         NEXT_OPCODE;
     }
@@ -2042 +2013 @@
 
         if (constructType == ConstructTypeJS) {
-#if JAVASCRIPT_PROFILING
             if (*enabledProfilerReference)
                 (*enabledProfilerReference)->willExecute(exec, constructor);
-#endif
+
             int registerOffset = r - (*registerBase);
             Register* callFrame = r + argv - CallFrameHeaderSize;
@@ -2079 +2049 @@
 
         if (constructType == ConstructTypeNative) {
-#if JAVASCRIPT_PROFILING
             if (*enabledProfilerReference)
                 (*enabledProfilerReference)->willExecute(exec, constructor);
-#endif
+
             int registerOffset = r - (*registerBase);
 
@@ -2094 +2063 @@
             r[dst].u.jsValue = returnValue;
 
-#if JAVASCRIPT_PROFILING
             if (*enabledProfilerReference)
                 (*enabledProfilerReference)->didExecute(exec, constructor);
-#endif
+
             ++vPC;
             NEXT_OPCODE;