Changeset 239788 in webkit

Timestamp:

Jan 9, 2019, 3:03:23 PM (6 years ago)

Author:

mark.lam@apple.com

Message:

Restore bytecode dumper's ability to dump jump target as offset#(->targetBytecodeIndex#).
​https://bugs.webkit.org/show_bug.cgi?id=193300

Reviewed by Saam Barati.

For example, instead of:

[ 95] jtrue loc11, 9

We can now again (as before the bytecode format rewrite) have:

[ 95] jtrue loc11, 9(->104)

• bytecode/BytecodeDumper.cpp:

(JSC::BytecodeDumper<Block>::printLocationAndOp):

• bytecode/BytecodeDumper.h:

(JSC::BytecodeDumper::dumpValue):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/BytecodeDumper.cpp (modified) (1 diff)
• bytecode/BytecodeDumper.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-01-09  Mark Lam  <mark.lam@apple.com>
+
+        Restore bytecode dumper's ability to dump jump target as offset#(->targetBytecodeIndex#).
+        https://bugs.webkit.org/show_bug.cgi?id=193300
+
+        Reviewed by Saam Barati.
+
+        For example, instead of:
+            [  95] jtrue              loc11, 9
+        We can now again (as before the bytecode format rewrite) have:
+            [  95] jtrue              loc11, 9(->104)
+
+        * bytecode/BytecodeDumper.cpp:
+        (JSC::BytecodeDumper<Block>::printLocationAndOp):
+        * bytecode/BytecodeDumper.h:
+        (JSC::BytecodeDumper::dumpValue):
+
 2019-01-09  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/BytecodeDumper.cpp

@@ -80 +80 @@
 void BytecodeDumper<Block>::printLocationAndOp(InstructionStream::Offset location, const char* op)
 {
+    m_currentLocation = location;
     m_out.printf("[%4u] %-18s ", location, op);
 }

trunk/Source/JavaScriptCore/bytecode/BytecodeDumper.h

@@ -54 +54 @@
 
     void dumpValue(VirtualRegister reg) { m_out.printf("%s", registerName(reg.offset()).data()); }
-    void dumpValue(BoundLabel label) { m_out.print(label.target()); }
+    void dumpValue(BoundLabel label)
+    {
+        InstructionStream::Offset targetOffset = label.target() + m_currentLocation;
+        m_out.print(label.target(), "(->", targetOffset, ")");
+    }
     template<typename T>
     void dumpValue(T v) { m_out.print(v); }
@@ -84 +88 @@
     Block* m_block;
     PrintStream& m_out;
+    InstructionStream::Offset m_currentLocation { 0 };
 };