<!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>[213397] 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/213397">213397</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2017-03-03 16:55:45 -0800 (Fri, 03 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add load / store exclusive instruction group to ARM64 disassembler
https://bugs.webkit.org/show_bug.cgi?id=169152
Reviewed by Filip Pizlo.
* disassembler/ARM64/A64DOpcode.cpp:
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::format):
* disassembler/ARM64/A64DOpcode.h:
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::opName):
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::rs):
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::rt2):
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::o0):
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::o1):
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::o2):
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::loadBit):
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::opNumber):
(JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::isPairOp):</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 (213396 => 213397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-04 00:48:41 UTC (rev 213396)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-04 00:55:45 UTC (rev 213397)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-03 Michael Saboff <msaboff@apple.com>
+
+ Add load / store exclusive instruction group to ARM64 disassembler
+ https://bugs.webkit.org/show_bug.cgi?id=169152
+
+ Reviewed by Filip Pizlo.
+
+ * disassembler/ARM64/A64DOpcode.cpp:
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::format):
+ * disassembler/ARM64/A64DOpcode.h:
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::opName):
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::rs):
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::rt2):
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::o0):
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::o1):
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::o2):
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::loadBit):
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::opNumber):
+ (JSC::ARM64Disassembler::A64DOpcodeLoadStoreExclusive::isPairOp):
+
</ins><span class="cx"> 2017-03-03 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> WASM should support faster loads.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp (213396 => 213397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp 2017-03-04 00:48:41 UTC (rev 213396)
+++ trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp 2017-03-04 00:55:45 UTC (rev 213397)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx">
</span><span class="cx"> static OpcodeGroupInitializer opcodeGroupList[] = {
</span><span class="cx"> OPCODE_GROUP_ENTRY(0x08, A64DOpcodeLoadStoreRegisterPair),
</span><ins>+ OPCODE_GROUP_ENTRY(0x08, A64DOpcodeLoadStoreExclusive),
</ins><span class="cx"> OPCODE_GROUP_ENTRY(0x09, A64DOpcodeLoadStoreRegisterPair),
</span><span class="cx"> OPCODE_GROUP_ENTRY(0x0a, A64DOpcodeLogicalShiftedRegister),
</span><span class="cx"> OPCODE_GROUP_ENTRY(0x0b, A64DOpcodeAddSubtractExtendedRegister),
</span><span class="lines">@@ -910,6 +911,59 @@
</span><span class="cx"> return m_formatBuffer;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const char* const A64DOpcodeLoadStoreExclusive::s_opNames[64] = {
+ "stxrb", "stlxrb", 0, 0, "ldxrb", "ldaxrb", 0, 0,
+ 0, "stlrb", 0, 0, 0, "ldarb", 0, 0,
+ "stxrh", "stlxrh", 0, 0, "ldxrh", "ldaxrh", 0, 0,
+ 0, "stlrh", 0, 0, 0, "ldarh", 0, 0,
+ "stxr", "stlxr", "stxp", "stlxp", "ldxr", "ldaxr", "ldxp", "ldaxp",
+ 0, "stlr", 0, 0, 0, "ldar", 0, 0,
+ "stxr", "stlxr", "stxp", "stlxp", "ldxr", "ldaxr", "ldxp", "ldaxp",
+ 0, "stlr", 0, 0, 0, "ldar", 0, 0
+};
+
+const char* A64DOpcodeLoadStoreExclusive::format()
+{
+ if (o2() && !o1() && !o0())
+ return A64DOpcode::format();
+
+ if (o2() && o1())
+ return A64DOpcode::format();
+
+ if ((size() < 2) && o1())
+ return A64DOpcode::format();
+
+ if (loadBit() && (rs() != 0x1f))
+ return A64DOpcode::format();
+
+ if (!isPairOp() && (rt2() != 0x1f))
+ return A64DOpcode::format();
+
+ const char* thisOpName = opName();
+
+ if (!thisOpName)
+ return A64DOpcode::format();
+
+ appendInstructionName(thisOpName);
+
+ if (!loadBit()) {
+ appendZROrRegisterName(rs(), size() == 0x3);
+ appendSeparator();
+ }
+
+ appendZROrRegisterName(rt(), size() == 0x3);
+ appendSeparator();
+ if (isPairOp()) {
+ appendZROrRegisterName(rt2(), size() == 0x3);
+ appendSeparator();
+ }
+ appendCharacter('[');
+ appendSPOrRegisterName(rn());
+ appendCharacter(']');
+
+ return m_formatBuffer;
+}
+
</ins><span class="cx"> // A zero in an entry of the table means the instruction is Unallocated
</span><span class="cx"> const char* const A64DOpcodeLoadStore::s_opNames[32] = {
</span><span class="cx"> "strb", "ldrb", "ldrsb", "ldrsb", "str", "ldr", "str", "ldr",
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h (213396 => 213397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h 2017-03-04 00:48:41 UTC (rev 213396)
+++ trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h 2017-03-04 00:55:45 UTC (rev 213397)
</span><span class="lines">@@ -585,6 +585,33 @@
</span><span class="cx"> bool is64BitRT() { return ((opNumber() & 0x17) == 0x02) || ((opNumber() & 0x1e) == 0x18); }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class A64DOpcodeLoadStoreExclusive : public A64DOpcodeLoadStore {
+private:
+ static const char* const s_opNames[64];
+
+public:
+ static const uint32_t mask = 0x3f000000;
+ static const uint32_t pattern = 0x08000000;
+
+ DEFINE_STATIC_FORMAT(A64DOpcodeLoadStoreExclusive, thisObj);
+
+ const char* format();
+
+ const char* opName()
+ {
+ return s_opNames[opNumber()];
+ }
+
+ unsigned rs() { return rm(); }
+ unsigned rt2() { return (m_opcode >> 10) & 0x1f; }
+ unsigned o0() { return (m_opcode >> 15) & 0x1; }
+ unsigned o1() { return (m_opcode >> 21) & 0x1; }
+ unsigned o2() { return (m_opcode >> 23) & 0x1; }
+ unsigned loadBit() { return (m_opcode >> 22) & 0x1; }
+ unsigned opNumber() { return (size() << 4 ) | (o2() << 3) | (loadBit() << 2) | (o1() << 1) | o0(); }
+ bool isPairOp() { return (size() & 0x10) && o1(); }
+};
+
</ins><span class="cx"> class A64DOpcodeLoadStoreImmediate : public A64DOpcodeLoadStore {
</span><span class="cx"> private:
</span><span class="cx"> static const char* const s_unprivilegedOpNames[32];
</span></span></pre>
</div>
</div>
</body>
</html>