JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / tools / CodeProfile.cpp

diff --git a/tools/CodeProfile.cpp b/tools/CodeProfile.cpp
index beed4b2d5a4f31c9156fb6657cc116481f99d0a0..c64f1d5a6da9fb9f863b37916050ad3f37624a73 100644 (file)
--- a/tools/CodeProfile.cpp
+++ b/tools/CodeProfile.cpp
@@ -33,7 +33,7 @@
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 

-#if PLATFORM(MAC)
+#if OS(DARWIN)

 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <execinfo.h>
 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <execinfo.h>


@@ -56,7 +56,7 @@ const char* CodeProfile::s_codeTypeNames[CodeProfile::NumberOfCodeTypes] = {
 // Helper function, find the symbol name for a pc in JSC.
 static const char* symbolName(void* address)
 {
 // Helper function, find the symbol name for a pc in JSC.
 static const char* symbolName(void* address)
 {

-#if PLATFORM(MAC)
+#if OS(DARWIN)

     Dl_info info;
     if (!dladdr(address, &info) || !info.dli_sname)
         return "<unknown>";
     Dl_info info;
     if (!dladdr(address, &info) || !info.dli_sname)
         return "<unknown>";


@@ -74,7 +74,7 @@ static const char* symbolName(void* address)
 static bool truncateTrace(const char* symbolName)
 {
     return !strcmp(symbolName, "JSC::BytecodeGenerator::generate()")
 static bool truncateTrace(const char* symbolName)
 {
     return !strcmp(symbolName, "JSC::BytecodeGenerator::generate()")

-        || !strcmp(symbolName, "JSC::Parser<JSC::Lexer<unsigned char> >::parseInner()")
+        || !strcmp(symbolName, "JSC::Parser<JSC::Lexer<unsigned char>>::parseInner()")

         || !strcmp(symbolName, "WTF::fastMalloc(unsigned long)")
         || !strcmp(symbolName, "WTF::calculateUTCOffset()")
         || !strcmp(symbolName, "JSC::DFG::ByteCodeParser::parseCodeBlock()");
         || !strcmp(symbolName, "WTF::fastMalloc(unsigned long)")
         || !strcmp(symbolName, "WTF::calculateUTCOffset()")
         || !strcmp(symbolName, "JSC::DFG::ByteCodeParser::parseCodeBlock()");


@@ -105,9 +105,9 @@ void CodeProfile::sample(void* pc, void** framePointer)
             type = RegExpCode;
         else {
             CodeBlock* codeBlock = static_cast<CodeBlock*>(ownerUID);
             type = RegExpCode;
         else {
             CodeBlock* codeBlock = static_cast<CodeBlock*>(ownerUID);

-            if (codeBlock->getJITType() == JITCode::DFGJIT)
+            if (codeBlock->jitType() == JITCode::DFGJIT)

                 type = DFGJIT;
                 type = DFGJIT;

-            else if (codeBlock->canCompileWithDFGState() == CodeBlock::CompileWithDFGFalse)
+            else if (!canCompile(codeBlock->capabilityLevelState()))

                 type = BaselineOnly;
             else if (codeBlock->replacement())
                 type = BaselineOSR;
                 type = BaselineOnly;
             else if (codeBlock->replacement())
                 type = BaselineOSR;


@@ -123,7 +123,7 @@ void CodeProfile::sample(void* pc, void** framePointer)
         if (type != EngineFrame)
             return;
 
         if (type != EngineFrame)
             return;
 

-#if PLATFORM(MAC) && CPU(X86_64)
+#if OS(DARWIN) && CPU(X86_64)

         // Walk up the stack.
         pc = framePointer[1];
         framePointer = reinterpret_cast<void**>(*framePointer);
         // Walk up the stack.
         pc = framePointer[1];
         framePointer = reinterpret_cast<void**>(*framePointer);


@@ -133,7 +133,7 @@ void CodeProfile::sample(void* pc, void** framePointer)
         framePointer = 0;
 #else
         // This platform is not yet supported!
         framePointer = 0;
 #else
         // This platform is not yet supported!

-        ASSERT_NOT_REACHED();
+        RELEASE_ASSERT_NOT_REACHED();

 #endif
     }
 
 #endif
     }
 


@@ -143,7 +143,7 @@ void CodeProfile::sample(void* pc, void** framePointer)
 
 void CodeProfile::report()
 {
 
 void CodeProfile::report()
 {

-    dataLog("<CodeProfiling %s:%d>\n", m_file.data(), m_lineNo);
+    dataLogF("<CodeProfiling %s:%d>\n", m_file.data(), m_lineNumber);

 
     // How many frames of C-code to print - 0, if not verbose, 1 if verbose, up to 1024 if very verbose.
     unsigned recursionLimit = CodeProfiling::beVeryVerbose() ? 1024 : CodeProfiling::beVerbose();
 
     // How many frames of C-code to print - 0, if not verbose, 1 if verbose, up to 1024 if very verbose.
     unsigned recursionLimit = CodeProfiling::beVeryVerbose() ? 1024 : CodeProfiling::beVerbose();


@@ -180,13 +180,13 @@ void CodeProfile::report()
     }
 
     // Output the profile tree.
     }
 
     // Output the profile tree.

-    dataLog("Total samples: %lld\n", static_cast<long long>(profile.childCount()));
+    dataLogF("Total samples: %lld\n", static_cast<long long>(profile.childCount()));

     profile.dump();
     
     for (size_t i = 0 ; i < m_children.size(); ++i)
         m_children[i]->report();
 
     profile.dump();
     
     for (size_t i = 0 ; i < m_children.size(); ++i)
         m_children[i]->report();
 

-    dataLog("</CodeProfiling %s:%d>\n", m_file.data(), m_lineNo);
+    dataLogF("</CodeProfiling %s:%d>\n", m_file.data(), m_lineNumber);

 }
 
 }
 }
 
 }