<!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>[281040] branches/safari-612.1.27.3-branch/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/281040">281040</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-08-13 15:08:43 -0700 (Fri, 13 Aug 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/280984">r280984</a>. rdar://problem/81901248
Update ARM64EHash
https://bugs.webkit.org/show_bug.cgi?id=228962
<rdar://79883337>
Reviewed by Mark Lam.
* assembler/AssemblerBuffer.h:
(JSC::ARM64EHash::makeDiversifier):
(JSC::ARM64EHash::nextValue):
(JSC::ARM64EHash::bitsForDiversifier):
(JSC::ARM64EHash::currentHash):
(JSC::ARM64EHash::setUpdatedHash):
(JSC::ARM64EHash::ARM64EHash):
(JSC::ARM64EHash::update):
(JSC::ARM64EHash::finalize):
(JSC::AssemblerBuffer::AssemblerBuffer):
(JSC::AssemblerBuffer::putIntegralUnchecked):
(JSC::AssemblerBuffer::hash const):
* assembler/LinkBuffer.cpp:
(JSC::LinkBuffer::copyCompactAndLinkCode):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280984 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6121273branchSourceJavaScriptCoreChangeLog">branches/safari-612.1.27.3-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6121273branchSourceJavaScriptCoreassemblerAssemblerBufferh">branches/safari-612.1.27.3-branch/Source/JavaScriptCore/assembler/AssemblerBuffer.h</a></li>
<li><a href="#branchessafari6121273branchSourceJavaScriptCoreassemblerLinkBuffercpp">branches/safari-612.1.27.3-branch/Source/JavaScriptCore/assembler/LinkBuffer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6121273branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.3-branch/Source/JavaScriptCore/ChangeLog (281039 => 281040)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.3-branch/Source/JavaScriptCore/ChangeLog 2021-08-13 22:05:15 UTC (rev 281039)
+++ branches/safari-612.1.27.3-branch/Source/JavaScriptCore/ChangeLog 2021-08-13 22:08:43 UTC (rev 281040)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2021-08-13 Alan Coon <alancoon@apple.com>
+
+ Cherry-pick r280984. rdar://problem/81901248
+
+ Update ARM64EHash
+ https://bugs.webkit.org/show_bug.cgi?id=228962
+ <rdar://79883337>
+
+ Reviewed by Mark Lam.
+
+ * assembler/AssemblerBuffer.h:
+ (JSC::ARM64EHash::makeDiversifier):
+ (JSC::ARM64EHash::nextValue):
+ (JSC::ARM64EHash::bitsForDiversifier):
+ (JSC::ARM64EHash::currentHash):
+ (JSC::ARM64EHash::setUpdatedHash):
+ (JSC::ARM64EHash::ARM64EHash):
+ (JSC::ARM64EHash::update):
+ (JSC::ARM64EHash::finalize):
+ (JSC::AssemblerBuffer::AssemblerBuffer):
+ (JSC::AssemblerBuffer::putIntegralUnchecked):
+ (JSC::AssemblerBuffer::hash const):
+ * assembler/LinkBuffer.cpp:
+ (JSC::LinkBuffer::copyCompactAndLinkCode):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280984 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-12 Saam Barati <sbarati@apple.com>
+
+ Update ARM64EHash
+ https://bugs.webkit.org/show_bug.cgi?id=228962
+ <rdar://79883337>
+
+ Reviewed by Mark Lam.
+
+ * assembler/AssemblerBuffer.h:
+ (JSC::ARM64EHash::makeDiversifier):
+ (JSC::ARM64EHash::nextValue):
+ (JSC::ARM64EHash::bitsForDiversifier):
+ (JSC::ARM64EHash::currentHash):
+ (JSC::ARM64EHash::setUpdatedHash):
+ (JSC::ARM64EHash::ARM64EHash):
+ (JSC::ARM64EHash::update):
+ (JSC::ARM64EHash::finalize):
+ (JSC::AssemblerBuffer::AssemblerBuffer):
+ (JSC::AssemblerBuffer::putIntegralUnchecked):
+ (JSC::AssemblerBuffer::hash const):
+ * assembler/LinkBuffer.cpp:
+ (JSC::LinkBuffer::copyCompactAndLinkCode):
+
</ins><span class="cx"> 2021-08-05 Russell Epstein <repstein@apple.com>
</span><span class="cx">
</span><span class="cx"> Cherry-pick r280659. rdar://problem/81592180
</span></span></pre></div>
<a id="branchessafari6121273branchSourceJavaScriptCoreassemblerAssemblerBufferh"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.3-branch/Source/JavaScriptCore/assembler/AssemblerBuffer.h (281039 => 281040)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.3-branch/Source/JavaScriptCore/assembler/AssemblerBuffer.h 2021-08-13 22:05:15 UTC (rev 281039)
+++ branches/safari-612.1.27.3-branch/Source/JavaScriptCore/assembler/AssemblerBuffer.h 2021-08-13 22:08:43 UTC (rev 281040)
</span><span class="lines">@@ -205,22 +205,62 @@
</span><span class="cx"> #if CPU(ARM64E)
</span><span class="cx"> class ARM64EHash {
</span><span class="cx"> public:
</span><del>- ARM64EHash(uint32_t initialHash)
- : m_hash(initialHash)
</del><ins>+ static constexpr uint8_t initializationNamespace = 0x11;
+
+ static ALWAYS_INLINE PtrTag makeDiversifier(uint8_t namespaceTag, uint64_t index, uint32_t value)
</ins><span class="cx"> {
</span><ins>+ // <namespaceTag:8><index:24><value:32>
+ return static_cast<PtrTag>((static_cast<uint64_t>(namespaceTag) << 56) + ((index & 0xFFFFFF) << 32) + static_cast<uint64_t>(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- ALWAYS_INLINE uint32_t update(uint32_t value)
</del><ins>+ static ALWAYS_INLINE uint32_t nextValue(uint64_t instruction, uint64_t index, uint32_t currentValue)
</ins><span class="cx"> {
</span><del>- uint64_t input = value ^ m_hash;
- uint64_t a = static_cast<uint32_t>(tagInt(input, static_cast<PtrTag>(0)) >> 39);
- uint64_t b = tagInt(input, static_cast<PtrTag>(0xb7e151628aed2a6a)) >> 23;
- m_hash = a ^ b;
- return m_hash;
</del><ins>+ uint64_t a = tagInt(instruction, makeDiversifier(0x12, index, currentValue));
+ uint64_t b = tagInt(instruction, makeDiversifier(0x13, index, currentValue));
+ return static_cast<uint32_t>((a >> 39) ^ (b >> 23));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ static ALWAYS_INLINE uint32_t bitsForDiversifier(void* diversifier)
+ {
+ return static_cast<uint32_t>(bitwise_cast<uintptr_t>(diversifier));
+ }
+
+ ALWAYS_INLINE uint32_t currentHash(uint32_t index, void* diversifier)
+ {
+ uint64_t result;
+ bool hashFieldIsTagged = index == 0;
+ if (hashFieldIsTagged)
+ result = untagInt(m_hash, makeDiversifier(initializationNamespace, index, bitsForDiversifier(diversifier)));
+ else
+ result = m_hash;
+ return static_cast<uint32_t>(result);
+ }
+
+ ALWAYS_INLINE void setUpdatedHash(uint32_t value, uint32_t index, void* diversifier)
+ {
+ bool shouldTagHashField = index == 0;
+ if (shouldTagHashField)
+ m_hash = tagInt(static_cast<uint64_t>(value), makeDiversifier(initializationNamespace, index, bitsForDiversifier(diversifier)));
+ else
+ m_hash = value;
+ }
+
+ ARM64EHash(void* diversifier)
+ {
+ setUpdatedHash(0, 0, diversifier);
+ }
+
+ ALWAYS_INLINE uint32_t update(uint32_t instruction, uint32_t index, void* diversifier)
+ {
+ uint32_t currentHash = this->currentHash(index, diversifier);
+ uint64_t nextIndex = index + 1;
+ uint32_t output = nextValue(instruction, nextIndex, currentHash);
+ setUpdatedHash(output, nextIndex, diversifier);
+ return output;
+ }
+
</ins><span class="cx"> private:
</span><del>- uint32_t m_hash;
</del><ins>+ uint64_t m_hash;
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -230,7 +270,7 @@
</span><span class="cx"> : m_storage()
</span><span class="cx"> , m_index(0)
</span><span class="cx"> #if CPU(ARM64E)
</span><del>- , m_hash(static_cast<uint32_t>(bitwise_cast<uint64_t>(this)))
</del><ins>+ , m_hash(this)
</ins><span class="cx"> , m_hashes()
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -388,7 +428,7 @@
</span><span class="cx"> #if CPU(ARM64)
</span><span class="cx"> static_assert(sizeof(value) == 4, "");
</span><span class="cx"> #if CPU(ARM64E)
</span><del>- uint32_t hash = m_hash.update(value);
</del><ins>+ uint32_t hash = m_hash.update(value, m_index / sizeof(IntegralType), this);
</ins><span class="cx"> WTF::unalignedStore<uint32_t>(m_hashes.buffer() + m_index, hash);
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6121273branchSourceJavaScriptCoreassemblerLinkBuffercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.3-branch/Source/JavaScriptCore/assembler/LinkBuffer.cpp (281039 => 281040)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.3-branch/Source/JavaScriptCore/assembler/LinkBuffer.cpp 2021-08-13 22:05:15 UTC (rev 281039)
+++ branches/safari-612.1.27.3-branch/Source/JavaScriptCore/assembler/LinkBuffer.cpp 2021-08-13 22:08:43 UTC (rev 281040)
</span><span class="lines">@@ -245,7 +245,8 @@
</span><span class="cx"> m_assemblerStorage = macroAssembler.m_assembler.buffer().releaseAssemblerData();
</span><span class="cx"> uint8_t* inData = bitwise_cast<uint8_t*>(m_assemblerStorage.buffer());
</span><span class="cx"> #if CPU(ARM64E)
</span><del>- ARM64EHash verifyUncompactedHash { static_cast<uint32_t>(bitwise_cast<uint64_t>(¯oAssembler.m_assembler.buffer())) };
</del><ins>+ void* bufferPtr = ¯oAssembler.m_assembler.buffer();
+ ARM64EHash verifyUncompactedHash { bufferPtr };
</ins><span class="cx"> m_assemblerHashesStorage = macroAssembler.m_assembler.buffer().releaseAssemblerHashes();
</span><span class="cx"> uint32_t* inHashes = bitwise_cast<uint32_t*>(m_assemblerHashesStorage.buffer());
</span><span class="cx"> #endif
</span><span class="lines">@@ -267,8 +268,8 @@
</span><span class="cx"> auto read = [&](const InstructionType* ptr) -> InstructionType {
</span><span class="cx"> InstructionType value = *ptr;
</span><span class="cx"> #if CPU(ARM64E)
</span><del>- uint32_t hash = verifyUncompactedHash.update(value);
</del><span class="cx"> unsigned index = (bitwise_cast<uint8_t*>(ptr) - inData) / 4;
</span><ins>+ uint32_t hash = verifyUncompactedHash.update(value, index, bufferPtr);
</ins><span class="cx"> RELEASE_ASSERT(inHashes[index] == hash);
</span><span class="cx"> #endif
</span><span class="cx"> return value;
</span></span></pre>
</div>
</div>
</body>
</html>