From 470286ecfe79d59df14944e5b5d34630fc739391 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 22 Nov 2012 09:09:45 +0100 Subject: Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485) Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66 Reviewed-by: Simon Hausmann --- Source/JavaScriptCore/dfg/DFGDisassembler.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'Source/JavaScriptCore/dfg/DFGDisassembler.cpp') diff --git a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp index cfbb936b8..654824196 100644 --- a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp +++ b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp @@ -43,8 +43,8 @@ void Disassembler::dump(LinkBuffer& linkBuffer) { m_graph.m_dominators.computeIfNecessary(m_graph); - dataLog("Generated JIT code for DFG CodeBlock %p, instruction count = %u:\n", m_graph.m_codeBlock, m_graph.m_codeBlock->instructionCount()); - dataLog(" Code at [%p, %p):\n", linkBuffer.debugAddress(), static_cast(linkBuffer.debugAddress()) + linkBuffer.debugSize()); + dataLogF("Generated JIT code for DFG CodeBlock %p, instruction count = %u:\n", m_graph.m_codeBlock, m_graph.m_codeBlock->instructionCount()); + dataLogF(" Code at [%p, %p):\n", linkBuffer.debugAddress(), static_cast(linkBuffer.debugAddress()) + linkBuffer.debugSize()); const char* prefix = " "; const char* disassemblyPrefix = " "; @@ -82,7 +82,7 @@ void Disassembler::dump(LinkBuffer& linkBuffer) } } dumpDisassembly(disassemblyPrefix, linkBuffer, previousLabel, m_endOfMainPath, lastNodeIndex); - dataLog("%s(End Of Main Path)\n", prefix); + dataLogF("%s(End Of Main Path)\n", prefix); dumpDisassembly(disassemblyPrefix, linkBuffer, previousLabel, m_endOfCode, NoNode); } @@ -104,10 +104,7 @@ void Disassembler::dumpDisassembly(const char* prefix, LinkBuffer& linkBuffer, M CodeLocationLabel end = linkBuffer.locationOf(currentLabel); previousLabel = currentLabel; ASSERT(bitwise_cast(end.executableAddress()) >= bitwise_cast(start.executableAddress())); - if (tryToDisassemble(start, bitwise_cast(end.executableAddress()) - bitwise_cast(start.executableAddress()), prefixBuffer.get(), WTF::dataFile())) - return; - - dataLog("%s disassembly not available for range %p...%p\n", prefixBuffer.get(), start.executableAddress(), end.executableAddress()); + disassemble(start, bitwise_cast(end.executableAddress()) - bitwise_cast(start.executableAddress()), prefixBuffer.get(), WTF::dataFile()); } } } // namespace JSC::DFG -- cgit v1.2.1