Changeset 279029 in webkit

Timestamp:

Jun 17, 2021 7:06:58 PM (3 years ago)

Author:

mark.lam@apple.com

Message:

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:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/assembler/MacroAssemblerARM64E.h (modified) (1 diff)
• JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (modified) (1 diff)
• JavaScriptCore/jit/AssemblyHelpers.cpp (modified) (2 diffs)
• JavaScriptCore/llint/LowLevelInterpreter64.asm (modified) (2 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/CagedPtr.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-06-17  Mark Lam  <mark.lam@apple.com>
+
+        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>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64E.h

@@ -51 +51 @@
 public:
     static constexpr unsigned numberOfPointerBits = sizeof(void*) * CHAR_BIT;
-    static constexpr unsigned numberOfPACBits = numberOfPointerBits - OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
-    static constexpr uintptr_t nonPACBitsMask = (1ull << (numberOfPointerBits - numberOfPACBits)) - 1;
+    static constexpr unsigned maxNumberOfAllowedPACBits = numberOfPointerBits - OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
+    static constexpr uintptr_t nonPACBitsMask = (1ull << (numberOfPointerBits - maxNumberOfAllowedPACBits)) - 1;
 
     ALWAYS_INLINE void tagReturnAddress()

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

@@ -16743 +16743 @@
             merge->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
                 jit.move(params[2].gpr(), params[0].gpr());
-                jit.bitFieldInsert64(params[1].gpr(), 0, 64 - MacroAssembler::numberOfPACBits, params[0].gpr());
+                jit.bitFieldInsert64(params[1].gpr(), 0, 64 - MacroAssembler::maxNumberOfAllowedPACBits, params[0].gpr());
             });
 

trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp

@@ -1046 +1046 @@
 #if CPU(ARM64E)
     if (kind == Gigacage::Primitive)
-        bitFieldInsert64(storage, 0, 64 - numberOfPACBits, tempReg);
+        bitFieldInsert64(storage, 0, 64 - maxNumberOfAllowedPACBits, tempReg);
     if (skip.isSet())
         skip.link(this);
@@ -1083 +1083 @@
             andPtr(TrustedImmPtr(Gigacage::mask(kind)), tempReg);
             addPtr(scratch, tempReg);
-            bitFieldInsert64(tempReg, 0, 64 - numberOfPACBits, storage);
+            bitFieldInsert64(tempReg, 0, 64 - maxNumberOfAllowedPACBits, storage);
 #else
             andPtr(TrustedImmPtr(Gigacage::mask(kind)), storage);

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -489 +489 @@
         cagePrimitive(GigacageConfig + Gigacage::Config::basePtrs + GigacagePrimitiveBasePtrOffset, constexpr Gigacage::primitiveGigacageMask, source, scratch)
         if ARM64E
-            const numberOfPACBits = constexpr MacroAssembler::numberOfPACBits
-            bfiq scratch2, 0, 64 - numberOfPACBits, ptr
+            const maxNumberOfAllowedPACBits = constexpr MacroAssembler::maxNumberOfAllowedPACBits
+            bfiq scratch2, 0, 64 - maxNumberOfAllowedPACBits, ptr
         end
     end
@@ -513 +513 @@
         cagePrimitive(GigacageConfig + Gigacage::Config::basePtrs + GigacagePrimitiveBasePtrOffset, constexpr Gigacage::primitiveGigacageMask, source, scratch)
         if ARM64E
-            const numberOfPACBits = constexpr MacroAssembler::numberOfPACBits
-            bfiq scratch2, 0, 64 - numberOfPACBits, ptr
+            const maxNumberOfAllowedPACBits = constexpr MacroAssembler::maxNumberOfAllowedPACBits
+            bfiq scratch2, 0, 64 - maxNumberOfAllowedPACBits, ptr
         end
     end

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-06-17  Mark Lam  <mark.lam@apple.com>
+
+        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>
 

trunk/Source/WTF/wtf/CagedPtr.h

@@ -46 +46 @@
     static constexpr Gigacage::Kind kind = passedKind;
     static constexpr unsigned numberOfPointerBits = sizeof(T*) * CHAR_BIT;
-    static constexpr unsigned numberOfPACBits = numberOfPointerBits - OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
-    static constexpr uintptr_t nonPACBitsMask = (1ull << (numberOfPointerBits - numberOfPACBits)) - 1;
+    static constexpr unsigned maxNumberOfAllowedPACBits = numberOfPointerBits - OS_CONSTANT(EFFECTIVE_ADDRESS_WIDTH);
+    static constexpr uintptr_t nonPACBitsMask = (1ull << (numberOfPointerBits - maxNumberOfAllowedPACBits)) - 1;
 
     CagedPtr() : CagedPtr(nullptr) { }