Attachment 358748 Details for Bug 193300 – proposed patch.

[patch] proposed patch.

bug-193300.patch (text/plain), 2.40 KB, created by Mark Lam on 2019-01-09 14:54:34 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Lam

Created: 2019-01-09 14:54:34 PST

Size: 2.40 KB

patch

obsolete

>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 239787)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2019-01-09  Mark Lam  <mark.lam@apple.com>
>+
>+        Restore byte code dumper's ability to dump jump target as offset#(->targetBytecodeIndex#).
>+        Need the bug URL (OOPS!).https://bugs.webkit.org/show_bug.cgi?id=193300
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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>
> 
>         Gigacage disabling checks should handle the GIGACAGE_ALLOCATION_CAN_FAIL case properly.
>Index: Source/JavaScriptCore/bytecode/BytecodeDumper.cpp
>===================================================================
>--- Source/JavaScriptCore/bytecode/BytecodeDumper.cpp	(revision 239786)
>+++ Source/JavaScriptCore/bytecode/BytecodeDumper.cpp	(working copy)
>@@ -79,6 +79,7 @@ CString BytecodeDumper<Block>::constantN
> template<class Block>
> void BytecodeDumper<Block>::printLocationAndOp(InstructionStream::Offset location, const char* op)
> {
>+    m_currentLocation = location;
>     m_out.printf("[%4u] %-18s ", location, op);
> }
> 
>Index: Source/JavaScriptCore/bytecode/BytecodeDumper.h
>===================================================================
>--- Source/JavaScriptCore/bytecode/BytecodeDumper.h	(revision 239786)
>+++ Source/JavaScriptCore/bytecode/BytecodeDumper.h	(working copy)
>@@ -53,7 +53,11 @@ public:
>     }
> 
>     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); }
> 
>@@ -83,6 +87,7 @@ private:
> 
>     Block* m_block;
>     PrintStream& m_out;
>+    InstructionStream::Offset m_currentLocation { 0 };
> };
> 
> }

Flags:

saam: review+
commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 193300: 358748