Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 11 insertions, 12 deletions

diff --git a/Source/JavaScriptCore/assembler/LinkBuffer.cpp b/Source/JavaScriptCore/assembler/LinkBuffer.cpp
index 0176e4307..c269157ba 100644
--- a/Source/JavaScriptCore/assembler/LinkBuffer.cpp
+++ b/Source/JavaScriptCore/assembler/LinkBuffer.cpp
@@ -45,16 +45,15 @@ LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithDisassembly(const char* format,
     
     CodeRef result = finalizeCodeWithoutDisassembly();
     
-    dataLog("Generated JIT code for ");
+    dataLogF("Generated JIT code for ");
     va_list argList;
     va_start(argList, format);
-    WTF::dataLogV(format, argList);
+    WTF::dataLogFV(format, argList);
     va_end(argList);
-    dataLog(":\n");
+    dataLogF(":\n");
     
-    dataLog("    Code at [%p, %p):\n", result.code().executableAddress(), static_cast<char*>(result.code().executableAddress()) + result.size());
-    if (!tryToDisassemble(result.code(), m_size, "    ", WTF::dataFile()))
-        dataLog("        <no disassembly available>\n");
+    dataLogF("    Code at [%p, %p):\n", result.code().executableAddress(), static_cast<char*>(result.code().executableAddress()) + result.size());
+    disassemble(result.code(), m_size, "    ", WTF::dataFile());
     
     return result;
 }
@@ -169,11 +168,11 @@ void LinkBuffer::dumpLinkStatistics(void* code, size_t initializeSize, size_t fi
     linkCount++;
     totalInitialSize += initialSize;
     totalFinalSize += finalSize;
-    dataLog("link %p: orig %u, compact %u (delta %u, %.2f%%)\n", 
+    dataLogF("link %p: orig %u, compact %u (delta %u, %.2f%%)\n", 
             code, static_cast<unsigned>(initialSize), static_cast<unsigned>(finalSize),
             static_cast<unsigned>(initialSize - finalSize),
             100.0 * (initialSize - finalSize) / initialSize);
-    dataLog("\ttotal %u: orig %u, compact %u (delta %u, %.2f%%)\n", 
+    dataLogF("\ttotal %u: orig %u, compact %u (delta %u, %.2f%%)\n", 
             linkCount, totalInitialSize, totalFinalSize, totalInitialSize - totalFinalSize,
             100.0 * (totalInitialSize - totalFinalSize) / totalInitialSize);
 }
@@ -192,7 +191,7 @@ void LinkBuffer::dumpCode(void* code, size_t size)
     size_t tsize = size / sizeof(short);
     char nameBuf[128];
     snprintf(nameBuf, sizeof(nameBuf), "_jsc_jit%u", codeCount++);
-    dataLog("\t.syntax unified\n"
+    dataLogF("\t.syntax unified\n"
             "\t.section\t__TEXT,__text,regular,pure_instructions\n"
             "\t.globl\t%s\n"
             "\t.align 2\n"
@@ -202,7 +201,7 @@ void LinkBuffer::dumpCode(void* code, size_t size)
             "%s:\n", nameBuf, nameBuf, code, nameBuf);
         
     for (unsigned i = 0; i < tsize; i++)
-        dataLog("\t.short\t0x%x\n", tcode[i]);
+        dataLogF("\t.short\t0x%x\n", tcode[i]);
 #elif CPU(ARM_TRADITIONAL)
     //   gcc -c jit.s
     //   objdump -D jit.o
@@ -211,7 +210,7 @@ void LinkBuffer::dumpCode(void* code, size_t size)
     size_t tsize = size / sizeof(unsigned int);
     char nameBuf[128];
     snprintf(nameBuf, sizeof(nameBuf), "_jsc_jit%u", codeCount++);
-    dataLog("\t.globl\t%s\n"
+    dataLogF("\t.globl\t%s\n"
             "\t.align 4\n"
             "\t.code 32\n"
             "\t.text\n"
@@ -219,7 +218,7 @@ void LinkBuffer::dumpCode(void* code, size_t size)
             "%s:\n", nameBuf, code, nameBuf);
 
     for (unsigned i = 0; i < tsize; i++)
-        dataLog("\t.long\t0x%x\n", tcode[i]);
+        dataLogF("\t.long\t0x%x\n", tcode[i]);
 #endif
 }
 #endif