<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214416] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214416">214416</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2017-03-27 09:39:47 -0700 (Mon, 27 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ARM64 system instructions to disassembler
https://bugs.webkit.org/show_bug.cgi?id=170084
Reviewed by Saam Barati.
This changes adds support for MRS and MSR instructions, and refactors the DMB
disassembly to handle all of the barrier instructions.
* disassembler/ARM64/A64DOpcode.cpp:
(JSC::ARM64Disassembler::A64DOpcodeMSRImmediate::format):
(JSC::ARM64Disassembler::A64DOpcodeMSROrMRSRegister::format):
(JSC::ARM64Disassembler::A64DOpcodeSystemSync::format):
(JSC::ARM64Disassembler::A64DOpcodeDmb::format): Deleted.
* disassembler/ARM64/A64DOpcode.h:
(JSC::ARM64Disassembler::A64DOpcodeSystem::lBit):
(JSC::ARM64Disassembler::A64DOpcodeSystem::op0):
(JSC::ARM64Disassembler::A64DOpcodeSystem::op1):
(JSC::ARM64Disassembler::A64DOpcodeSystem::crN):
(JSC::ARM64Disassembler::A64DOpcodeSystem::crM):
(JSC::ARM64Disassembler::A64DOpcodeSystem::op2):
(JSC::ARM64Disassembler::A64DOpcodeMSROrMRSRegister::opName):
(JSC::ARM64Disassembler::A64DOpcodeMSROrMRSRegister::systemRegister):
(JSC::ARM64Disassembler::A64DOpcodeSystemSync::opName):
(JSC::ARM64Disassembler::A64DOpcodeSystemSync::option):
(JSC::ARM64Disassembler::A64DOpcodeDmb::opName): Deleted.
(JSC::ARM64Disassembler::A64DOpcodeDmb::option): Deleted.
(JSC::ARM64Disassembler::A64DOpcodeDmb::crM): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodecpp">trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodeh">trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214415 => 214416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-27 16:18:33 UTC (rev 214415)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-27 16:39:47 UTC (rev 214416)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2017-03-27 Michael Saboff <msaboff@apple.com>
+
+ Add ARM64 system instructions to disassembler
+ https://bugs.webkit.org/show_bug.cgi?id=170084
+
+ Reviewed by Saam Barati.
+
+ This changes adds support for MRS and MSR instructions, and refactors the DMB
+ disassembly to handle all of the barrier instructions.
+
+ * disassembler/ARM64/A64DOpcode.cpp:
+ (JSC::ARM64Disassembler::A64DOpcodeMSRImmediate::format):
+ (JSC::ARM64Disassembler::A64DOpcodeMSROrMRSRegister::format):
+ (JSC::ARM64Disassembler::A64DOpcodeSystemSync::format):
+ (JSC::ARM64Disassembler::A64DOpcodeDmb::format): Deleted.
+ * disassembler/ARM64/A64DOpcode.h:
+ (JSC::ARM64Disassembler::A64DOpcodeSystem::lBit):
+ (JSC::ARM64Disassembler::A64DOpcodeSystem::op0):
+ (JSC::ARM64Disassembler::A64DOpcodeSystem::op1):
+ (JSC::ARM64Disassembler::A64DOpcodeSystem::crN):
+ (JSC::ARM64Disassembler::A64DOpcodeSystem::crM):
+ (JSC::ARM64Disassembler::A64DOpcodeSystem::op2):
+ (JSC::ARM64Disassembler::A64DOpcodeMSROrMRSRegister::opName):
+ (JSC::ARM64Disassembler::A64DOpcodeMSROrMRSRegister::systemRegister):
+ (JSC::ARM64Disassembler::A64DOpcodeSystemSync::opName):
+ (JSC::ARM64Disassembler::A64DOpcodeSystemSync::option):
+ (JSC::ARM64Disassembler::A64DOpcodeDmb::opName): Deleted.
+ (JSC::ARM64Disassembler::A64DOpcodeDmb::option): Deleted.
+ (JSC::ARM64Disassembler::A64DOpcodeDmb::crM): Deleted.
+
</ins><span class="cx"> 2017-03-26 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3::fixSSA should do liveness pruning
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp (214415 => 214416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp 2017-03-27 16:18:33 UTC (rev 214415)
+++ trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp 2017-03-27 16:39:47 UTC (rev 214416)
</span><span class="lines">@@ -84,7 +84,9 @@
</span><span class="cx"> OPCODE_GROUP_ENTRY(0x15, A64DOpcodeConditionalBranchImmediate),
</span><span class="cx"> OPCODE_GROUP_ENTRY(0x15, A64DOpcodeCompareAndBranchImmediate),
</span><span class="cx"> OPCODE_GROUP_ENTRY(0x15, A64DOpcodeHint),
</span><del>- OPCODE_GROUP_ENTRY(0x15, A64DOpcodeDmb),
</del><ins>+ OPCODE_GROUP_ENTRY(0x15, A64DOpcodeSystemSync),
+ OPCODE_GROUP_ENTRY(0x15, A64DOpcodeMSRImmediate),
+ OPCODE_GROUP_ENTRY(0x15, A64DOpcodeMSROrMRSRegister),
</ins><span class="cx"> OPCODE_GROUP_ENTRY(0x16, A64DOpcodeUnconditionalBranchImmediate),
</span><span class="cx"> OPCODE_GROUP_ENTRY(0x16, A64DOpcodeUnconditionalBranchRegister),
</span><span class="cx"> OPCODE_GROUP_ENTRY(0x16, A64DOpcodeTestAndBranchImmediate),
</span><span class="lines">@@ -880,6 +882,82 @@
</span><span class="cx"> return m_formatBuffer;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const char* A64DOpcodeMSRImmediate::format()
+{
+ const char* pstateField = nullptr;
+
+ if (!op1() && (op2() == 0x5))
+ pstateField = "spsel";
+
+ if ((op1() == 0x3) && (op2() == 0x6))
+ pstateField = "daifset";
+
+ if ((op1() == 0x3) && (op2() == 0x7))
+ pstateField = "daifclr";
+
+ if (!!op1() && !(op2() & 0x4))
+ return A64DOpcode::format();
+
+ if (!pstateField)
+ return A64DOpcode::format();
+
+ appendInstructionName("msr");
+ appendString(pstateField);
+ appendSeparator();
+ appendUnsignedImmediate(crM());
+
+ return m_formatBuffer;
+}
+
+const char* A64DOpcodeMSROrMRSRegister::format()
+{
+ appendInstructionName(opName());
+
+ if (lBit()) {
+ appendZROrRegisterName(rt());
+ appendSeparator();
+ }
+
+ bufferPrintf("S%u_%u_C%u_C%u_%u", op0(), op1(), crN(), crM(), op2());
+
+ if (!lBit()) {
+ appendSeparator();
+ appendZROrRegisterName(rt());
+ }
+
+ const char* systemRegisterName = nullptr;
+
+ switch (systemRegister()) {
+ case 0b1101100000000001:
+ systemRegisterName = "ctr_el0";
+ break;
+ case 0b1101101000010000:
+ systemRegisterName = "nzcv";
+ break;
+ case 0b1101101000010001:
+ systemRegisterName = "daif";
+ break;
+ case 0b1101101000100000:
+ systemRegisterName = "fpcr";
+ break;
+ case 0b1101101000100001:
+ systemRegisterName = "fpsr";
+ break;
+ case 0b1101111010000010:
+ systemRegisterName = "tpidr_el0";
+ break;
+ case 0b1101111010000011:
+ systemRegisterName = "tpidrr0_el0";
+ break;
+ }
+
+ if (systemRegisterName) {
+ appendString(" ; ");
+ appendString(systemRegisterName);
+ }
+ return m_formatBuffer;
+}
+
</ins><span class="cx"> const char* const A64DOpcodeHint::s_opNames[6] = {
</span><span class="cx"> "nop", "yield", "wfe", "wfi", "sev", "sevl"
</span><span class="cx"> };
</span><span class="lines">@@ -894,20 +972,37 @@
</span><span class="cx"> return m_formatBuffer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const char* const A64DOpcodeDmb::s_optionNames[16] = {
</del><ins>+const char* const A64DOpcodeSystemSync::s_opNames[8] = {
+ 0, 0, "clrex", 0, "dsb", "dmb", "isb", 0
+};
+
+const char* const A64DOpcodeSystemSync::s_optionNames[16] = {
</ins><span class="cx"> 0, "oshld", "oshst", "osh", 0, "nshld", "nshst", "nsh",
</span><span class="cx"> 0, "ishld", "ishst", "ish", 0, "ld", "st", "sy"
</span><span class="cx"> };
</span><span class="cx">
</span><del>-const char* A64DOpcodeDmb::format()
</del><ins>+const char* A64DOpcodeSystemSync::format()
</ins><span class="cx"> {
</span><del>- appendInstructionName(opName());
- const char* thisOption = option();
- if (thisOption)
- appendString(thisOption);
- else
- appendUnsignedImmediate(crM());
</del><ins>+ const char* thisOpName = opName();
</ins><span class="cx">
</span><ins>+ if (!thisOpName)
+ return A64DOpcode::format();
+
+ appendInstructionName(thisOpName);
+
+ if (op2() & 0x2) {
+ if (crM() != 0xf) {
+ appendCharacter('#');
+ appendUnsignedImmediate(crM());
+ }
+ } else {
+ const char* thisOption = option();
+ if (thisOption)
+ appendString(thisOption);
+ else
+ appendUnsignedImmediate(crM());
+ }
+
</ins><span class="cx"> return m_formatBuffer;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h (214415 => 214416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h 2017-03-27 16:18:33 UTC (rev 214415)
+++ trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h 2017-03-27 16:39:47 UTC (rev 214416)
</span><span class="lines">@@ -536,7 +536,40 @@
</span><span class="cx"> unsigned opNum() { return (m_opcode >> 16) & 0x1f; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class A64DOpcodeHint : public A64DOpcode {
</del><ins>+class A64DOpcodeSystem : public A64DOpcode {
+public:
+ unsigned lBit() { return (m_opcode >> 21) & 0x1; }
+ unsigned op0() { return (m_opcode >> 19) & 0x3; }
+ unsigned op1() { return (m_opcode >> 16) & 0x7; }
+ unsigned crN() { return (m_opcode >> 12) & 0xf; }
+ unsigned crM() { return (m_opcode >> 8) & 0xf; }
+ unsigned op2() { return (m_opcode >> 5) & 0x7; }
+};
+
+class A64DOpcodeMSRImmediate : public A64DOpcodeSystem {
+public:
+ static const uint32_t mask = 0xfff8f01f;
+ static const uint32_t pattern = 0xd500401f;
+
+ DEFINE_STATIC_FORMAT(A64DOpcodeMSRImmediate, thisObj);
+
+ const char* format();
+};
+
+class A64DOpcodeMSROrMRSRegister : public A64DOpcodeSystem {
+public:
+ static const uint32_t mask = 0xffd00000;
+ static const uint32_t pattern = 0xd5100000;
+
+ DEFINE_STATIC_FORMAT(A64DOpcodeMSROrMRSRegister, thisObj);
+
+ const char* format();
+
+ const char* opName() { return lBit() ? "mrs" : "msr"; }
+ unsigned systemRegister() { return ((op0() << 14) | (op1() << 11) | (crN() << 7) | (crM() << 3) | op2()); }
+};
+
+class A64DOpcodeHint : public A64DOpcodeSystem {
</ins><span class="cx"> private:
</span><span class="cx"> static const char* const s_opNames[6];
</span><span class="cx">
</span><span class="lines">@@ -552,20 +585,20 @@
</span><span class="cx"> unsigned immediate7() { return (m_opcode >> 5) & 0x7f; }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class A64DOpcodeDmb : public A64DOpcode {
</del><ins>+class A64DOpcodeSystemSync : public A64DOpcodeSystem {
+ static const char* const s_opNames[8];
</ins><span class="cx"> static const char* const s_optionNames[16];
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- static const uint32_t mask = 0xfffff0ff;
- static const uint32_t pattern = 0xd50330bf;
</del><ins>+ static const uint32_t mask = 0xfffff01f;
+ static const uint32_t pattern = 0xd503301f;
</ins><span class="cx">
</span><del>- DEFINE_STATIC_FORMAT(A64DOpcodeDmb, thisObj);
</del><ins>+ DEFINE_STATIC_FORMAT(A64DOpcodeSystemSync, thisObj);
</ins><span class="cx">
</span><span class="cx"> const char* format();
</span><span class="cx">
</span><del>- const char* opName() { return "dmb"; }
</del><ins>+ const char* opName() { return s_opNames[op2()]; }
</ins><span class="cx"> const char* option() { return s_optionNames[crM()]; }
</span><del>- unsigned crM() { return (m_opcode >> 8) & 0xf; }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class A64DOpcodeLoadStore : public A64DOpcode {
</span></span></pre>
</div>
</div>
</body>
</html>