Changeset 136069 in webkit for trunk/Source/JavaScriptCore/jit/JITDisassembler.cpp

Timestamp:

Nov 28, 2012, 3:37:24 PM (12 years ago)

Author:

[email protected]

Message:

Disassembly methods should be able to disassemble to any PrintStream& rather than always using WTF::dataFile()
​https://bugs.webkit.org/show_bug.cgi?id=103492

Reviewed by Mark Hahnenberg.

Switched disassembly code to use PrintStream&, and to use print() rather than printf().

• dfg/DFGDisassembler.cpp:

(JSC::DFG::Disassembler::dump):
(DFG):
(JSC::DFG::Disassembler::dumpDisassembly):

• dfg/DFGDisassembler.h:

(Disassembler):

• dfg/DFGGraph.cpp:

(JSC::DFG::printWhiteSpace):
(JSC::DFG::Graph::dumpCodeOrigin):
(JSC::DFG::Graph::printNodeWhiteSpace):
(JSC::DFG::Graph::dump):
(DFG):
(JSC::DFG::Graph::dumpBlockHeader):

• dfg/DFGGraph.h:

(Graph):

• jit/JITDisassembler.cpp:

(JSC::JITDisassembler::dump):
(JSC::JITDisassembler::dumpForInstructions):
(JSC::JITDisassembler::dumpDisassembly):

• jit/JITDisassembler.h:

(JITDisassembler):

File:

• trunk/Source/JavaScriptCore/jit/JITDisassembler.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/jit/JITDisassembler.cpp

@@ -45 +45 @@
 }
 
-void JITDisassembler::dump(LinkBuffer& linkBuffer)
+void JITDisassembler::dump(PrintStream& out, LinkBuffer& linkBuffer)
 {
-    dataLogF("Baseline JIT code for CodeBlock %p, instruction count = %u:\n", m_codeBlock, m_codeBlock->instructionCount());
-    dataLogF("    Code at [%p, %p):\n", linkBuffer.debugAddress(), static_cast<char*>(linkBuffer.debugAddress()) + linkBuffer.debugSize());
-    dumpDisassembly(linkBuffer, m_startOfCode, m_labelForBytecodeIndexInMainPath[0]);
+    out.print("Baseline JIT code for CodeBlock ", RawPointer(m_codeBlock), ", instruction count = ", m_codeBlock->instructionCount(), "\n");
+    out.print("   Code at [", RawPointer(linkBuffer.debugAddress()), ", ", RawPointer(static_cast<char*>(linkBuffer.debugAddress()) + linkBuffer.debugSize()), "):\n");
+    dumpDisassembly(out, linkBuffer, m_startOfCode, m_labelForBytecodeIndexInMainPath[0]);
     
     MacroAssembler::Label firstSlowLabel;
@@ -58 +58 @@
         }
     }
-    dumpForInstructions(linkBuffer, "    ", m_labelForBytecodeIndexInMainPath, firstSlowLabel.isSet() ? firstSlowLabel : m_endOfSlowPath);
-    dataLogF("    (End Of Main Path)\n");
-    dumpForInstructions(linkBuffer, "    (S) ", m_labelForBytecodeIndexInSlowPath, m_endOfSlowPath);
-    dataLogF("    (End Of Slow Path)\n");
+    dumpForInstructions(out, linkBuffer, "    ", m_labelForBytecodeIndexInMainPath, firstSlowLabel.isSet() ? firstSlowLabel : m_endOfSlowPath);
+    out.print("    (End Of Main Path)\n");
+    dumpForInstructions(out, linkBuffer, "    (S) ", m_labelForBytecodeIndexInSlowPath, m_endOfSlowPath);
+    out.print("    (End Of Slow Path)\n");
 
-    dumpDisassembly(linkBuffer, m_endOfSlowPath, m_endOfCode);
+    dumpDisassembly(out, linkBuffer, m_endOfSlowPath, m_endOfCode);
 }
 
-void JITDisassembler::dumpForInstructions(LinkBuffer& linkBuffer, const char* prefix, Vector<MacroAssembler::Label>& labels, MacroAssembler::Label endLabel)
+void JITDisassembler::dump(LinkBuffer& linkBuffer)
+{
+    dump(WTF::dataFile(), linkBuffer);
+}
+
+void JITDisassembler::dumpForInstructions(PrintStream& out, LinkBuffer& linkBuffer, const char* prefix, Vector<MacroAssembler::Label>& labels, MacroAssembler::Label endLabel)
 {
     for (unsigned i = 0 ; i < labels.size();) {
@@ -73 +78 @@
             continue;
         }
-        dataLogF("%s", prefix);
+        out.print(prefix);
         m_codeBlock->dump(i);
         for (unsigned nextIndex = i + 1; ; nextIndex++) {
             if (nextIndex >= labels.size()) {
-                dumpDisassembly(linkBuffer, labels[i], endLabel);
+                dumpDisassembly(out, linkBuffer, labels[i], endLabel);
                 return;
             }
             if (labels[nextIndex].isSet()) {
-                dumpDisassembly(linkBuffer, labels[i], labels[nextIndex]);
+                dumpDisassembly(out, linkBuffer, labels[i], labels[nextIndex]);
                 i = nextIndex;
                 break;
@@ -89 +94 @@
 }
 
-void JITDisassembler::dumpDisassembly(LinkBuffer& linkBuffer, MacroAssembler::Label from, MacroAssembler::Label to)
+void JITDisassembler::dumpDisassembly(PrintStream& out, LinkBuffer& linkBuffer, MacroAssembler::Label from, MacroAssembler::Label to)
 {
     CodeLocationLabel fromLocation = linkBuffer.locationOf(from);
     CodeLocationLabel toLocation = linkBuffer.locationOf(to);
-    disassemble(fromLocation, bitwise_cast<uintptr_t>(toLocation.executableAddress()) - bitwise_cast<uintptr_t>(fromLocation.executableAddress()), "        ", WTF::dataFile());
+    disassemble(fromLocation, bitwise_cast<uintptr_t>(toLocation.executableAddress()) - bitwise_cast<uintptr_t>(fromLocation.executableAddress()), "        ", out);
 }