<!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>[279029] trunk/Source</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/279029">279029</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2021-06-17 19:06:58 -0700 (Thu, 17 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Rename numberOfPACBits to maxNumberOfAllowedPACBits.
https://bugs.webkit.org/show_bug.cgi?id=227156

Reviewed by Saam Barati.

Source/JavaScriptCore:

Just renaming the constant to better describe what it represents.  There are no
behavior changes.

* assembler/MacroAssemblerARM64E.h:
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq):
* jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::cageWithoutUntagging):
(JSC::AssemblyHelpers::cageConditionallyAndUntag):
* llint/LowLevelInterpreter64.asm:

Source/WTF:

* wtf/CagedPtr.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64Eh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAssemblyHelperscpp">trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCagedPtrh">trunk/Source/WTF/wtf/CagedPtr.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (279028 => 279029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-06-18 01:44:42 UTC (rev 279028)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-06-18 02:06:58 UTC (rev 279029)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2021-06-17  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><ins>+        Rename numberOfPACBits to maxNumberOfAllowedPACBits.
+        https://bugs.webkit.org/show_bug.cgi?id=227156
+
+        Reviewed by Saam Barati.
+
+        Just renaming the constant to better describe what it represents.  There are no
+        behavior changes.
+
+        * assembler/MacroAssemblerARM64E.h:
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq):
+        * jit/AssemblyHelpers.cpp:
+        (JSC::AssemblyHelpers::cageWithoutUntagging):
+        (JSC::AssemblyHelpers::cageConditionallyAndUntag):
+        * llint/LowLevelInterpreter64.asm:
+
+2021-06-17  Mark Lam  <mark.lam@apple.com>
+
</ins><span class="cx">         Define MacroAssemblerARM64E::numberOfPACBits based on OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH).
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=227147
</span><span class="cx">         rdar://78785309
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64Eh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h (279028 => 279029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h     2021-06-18 01:44:42 UTC (rev 279028)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h        2021-06-18 02:06:58 UTC (rev 279029)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> class MacroAssemblerARM64E : public MacroAssemblerARM64 {
</span><span class="cx"> public:
</span><span class="cx">     static constexpr unsigned numberOfPointerBits = sizeof(void*) * CHAR_BIT;
</span><del>-    static constexpr unsigned numberOfPACBits = numberOfPointerBits - OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
-    static constexpr uintptr_t nonPACBitsMask = (1ull << (numberOfPointerBits - numberOfPACBits)) - 1;
</del><ins>+    static constexpr unsigned maxNumberOfAllowedPACBits = numberOfPointerBits - OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
+    static constexpr uintptr_t nonPACBitsMask = (1ull << (numberOfPointerBits - maxNumberOfAllowedPACBits)) - 1;
</ins><span class="cx"> 
</span><span class="cx">     ALWAYS_INLINE void tagReturnAddress()
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (279028 => 279029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp      2021-06-18 01:44:42 UTC (rev 279028)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2021-06-18 02:06:58 UTC (rev 279029)
</span><span class="lines">@@ -16742,7 +16742,7 @@
</span><span class="cx">             merge->appendSomeRegister(ptr);
</span><span class="cx">             merge->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
</span><span class="cx">                 jit.move(params[2].gpr(), params[0].gpr());
</span><del>-                jit.bitFieldInsert64(params[1].gpr(), 0, 64 - MacroAssembler::numberOfPACBits, params[0].gpr());
</del><ins>+                jit.bitFieldInsert64(params[1].gpr(), 0, 64 - MacroAssembler::maxNumberOfAllowedPACBits, params[0].gpr());
</ins><span class="cx">             });
</span><span class="cx"> 
</span><span class="cx">             result = doUntagArrayPtr(merge);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAssemblyHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp (279028 => 279029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp      2021-06-18 01:44:42 UTC (rev 279028)
+++ trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp 2021-06-18 02:06:58 UTC (rev 279029)
</span><span class="lines">@@ -1045,7 +1045,7 @@
</span><span class="cx">     addPtr(TrustedImmPtr(Gigacage::basePtr(kind)), storage);
</span><span class="cx"> #if CPU(ARM64E)
</span><span class="cx">     if (kind == Gigacage::Primitive)
</span><del>-        bitFieldInsert64(storage, 0, 64 - numberOfPACBits, tempReg);
</del><ins>+        bitFieldInsert64(storage, 0, 64 - maxNumberOfAllowedPACBits, tempReg);
</ins><span class="cx">     if (skip.isSet())
</span><span class="cx">         skip.link(this);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1082,7 +1082,7 @@
</span><span class="cx">             ASSERT(LogicalImmediate::create64(Gigacage::mask(kind)).isValid());
</span><span class="cx">             andPtr(TrustedImmPtr(Gigacage::mask(kind)), tempReg);
</span><span class="cx">             addPtr(scratch, tempReg);
</span><del>-            bitFieldInsert64(tempReg, 0, 64 - numberOfPACBits, storage);
</del><ins>+            bitFieldInsert64(tempReg, 0, 64 - maxNumberOfAllowedPACBits, storage);
</ins><span class="cx"> #else
</span><span class="cx">             andPtr(TrustedImmPtr(Gigacage::mask(kind)), storage);
</span><span class="cx">             addPtr(scratch, storage);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (279028 => 279029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm      2021-06-18 01:44:42 UTC (rev 279028)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2021-06-18 02:06:58 UTC (rev 279029)
</span><span class="lines">@@ -488,8 +488,8 @@
</span><span class="cx">     if GIGACAGE_ENABLED
</span><span class="cx">         cagePrimitive(GigacageConfig + Gigacage::Config::basePtrs + GigacagePrimitiveBasePtrOffset, constexpr Gigacage::primitiveGigacageMask, source, scratch)
</span><span class="cx">         if ARM64E
</span><del>-            const numberOfPACBits = constexpr MacroAssembler::numberOfPACBits
-            bfiq scratch2, 0, 64 - numberOfPACBits, ptr
</del><ins>+            const maxNumberOfAllowedPACBits = constexpr MacroAssembler::maxNumberOfAllowedPACBits
+            bfiq scratch2, 0, 64 - maxNumberOfAllowedPACBits, ptr
</ins><span class="cx">         end
</span><span class="cx">     end
</span><span class="cx">     if ARM64E
</span><span class="lines">@@ -512,8 +512,8 @@
</span><span class="cx">     if GIGACAGE_ENABLED
</span><span class="cx">         cagePrimitive(GigacageConfig + Gigacage::Config::basePtrs + GigacagePrimitiveBasePtrOffset, constexpr Gigacage::primitiveGigacageMask, source, scratch)
</span><span class="cx">         if ARM64E
</span><del>-            const numberOfPACBits = constexpr MacroAssembler::numberOfPACBits
-            bfiq scratch2, 0, 64 - numberOfPACBits, ptr
</del><ins>+            const maxNumberOfAllowedPACBits = constexpr MacroAssembler::maxNumberOfAllowedPACBits
+            bfiq scratch2, 0, 64 - maxNumberOfAllowedPACBits, ptr
</ins><span class="cx">         end
</span><span class="cx">     end
</span><span class="cx">     if ARM64E
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (279028 => 279029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-06-18 01:44:42 UTC (rev 279028)
+++ trunk/Source/WTF/ChangeLog  2021-06-18 02:06:58 UTC (rev 279029)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2021-06-17  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><ins>+        Rename numberOfPACBits to maxNumberOfAllowedPACBits.
+        https://bugs.webkit.org/show_bug.cgi?id=227156
+
+        Reviewed by Saam Barati.
+
+        * wtf/CagedPtr.h:
+
+2021-06-17  Mark Lam  <mark.lam@apple.com>
+
</ins><span class="cx">         Define MacroAssemblerARM64E::numberOfPACBits based on OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH).
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=227147
</span><span class="cx">         rdar://78785309
</span></span></pre></div>
<a id="trunkSourceWTFwtfCagedPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CagedPtr.h (279028 => 279029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CagedPtr.h  2021-06-18 01:44:42 UTC (rev 279028)
+++ trunk/Source/WTF/wtf/CagedPtr.h     2021-06-18 02:06:58 UTC (rev 279029)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> public:
</span><span class="cx">     static constexpr Gigacage::Kind kind = passedKind;
</span><span class="cx">     static constexpr unsigned numberOfPointerBits = sizeof(T*) * CHAR_BIT;
</span><del>-    static constexpr unsigned numberOfPACBits = numberOfPointerBits - OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
-    static constexpr uintptr_t nonPACBitsMask = (1ull << (numberOfPointerBits - numberOfPACBits)) - 1;
</del><ins>+    static constexpr unsigned maxNumberOfAllowedPACBits = numberOfPointerBits - OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
+    static constexpr uintptr_t nonPACBitsMask = (1ull << (numberOfPointerBits - maxNumberOfAllowedPACBits)) - 1;
</ins><span class="cx"> 
</span><span class="cx">     CagedPtr() : CagedPtr(nullptr) { }
</span><span class="cx">     CagedPtr(std::nullptr_t)
</span></span></pre>
</div>
</div>

</body>
</html>