Changeset 249184 in webkit

Timestamp:

Aug 27, 2019, 4:48:54 PM (7 years ago)

Author:

msaboff@apple.com

Message:

Update PACCage changes for builds without Gigacage, but with signed pointers
​https://bugs.webkit.org/show_bug.cgi?id=201202

Reviewed by Saam Barati.

Factored out the untagging of pointers and added that to both the Gigacage enabled
and disabled code paths. Did this for the LLInt as well as the JITs.

• JavaScriptCore.xcodeproj/project.pbxproj: Added arm64e.rb to offlineasm file list.
• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::cageTypedArrayStorage):

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::caged):

• llint/LowLevelInterpreter64.asm:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• dfg/DFGSpeculativeJIT.cpp (modified) (2 diffs)
• ftl/FTLLowerDFGToB3.cpp (modified) (4 diffs)
• llint/LowLevelInterpreter64.asm (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-27  Michael Saboff  <msaboff@apple.com>
+
+        Update PACCage changes for builds without Gigacage, but with signed pointers
+        https://bugs.webkit.org/show_bug.cgi?id=201202
+
+        Reviewed by Saam Barati.
+
+        Factored out the untagging of pointers and added that to both the Gigacage enabled
+        and disabled code paths.  Did this for the LLInt as well as the JITs.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Added arm64e.rb to offlineasm file list.
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::cageTypedArrayStorage):
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::caged):
+        * llint/LowLevelInterpreter64.asm:
+
 2019-08-27  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -3862 +3862 @@
                 65B8392C1BACA92A0044E824 /* CachedRecovery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedRecovery.h; sourceTree = "<group>"; };
                 65B8392D1BACA9D30044E824 /* CachedRecovery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedRecovery.cpp; sourceTree = "<group>"; };
+                65B898AD23146E9B00476358 /* arm64e.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = arm64e.rb; sourceTree = "<group>"; };
                 65C02FBB0637462A003E7EE6 /* Protect.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Protect.h; sourceTree = "<group>"; tabWidth = 8; };
                 65C6BEDF21128C3B006849C3 /* YarrDisassembler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YarrDisassembler.cpp; path = yarr/YarrDisassembler.cpp; sourceTree = "<group>"; };
@@ -8657 +8658 @@
                                 FEF3475520362B1C00B7C0EF /* arm.rb */,
                                 FEF3476220362B2200B7C0EF /* arm64.rb */,
+                                65B898AD23146E9B00476358 /* arm64e.rb */,
                                 FEF3475920362B1D00B7C0EF /* asm.rb */,
                                 FEF3475820362B1D00B7C0EF /* ast.rb */,

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -6785 +6785 @@
 void SpeculativeJIT::cageTypedArrayStorage(GPRReg baseReg, GPRReg storageReg)
 {
+    auto untagArrayPtr = [&]() {
 #if CPU(ARM64E)
-    m_jit.untagArrayPtr(MacroAssembler::Address(baseReg, JSArrayBufferView::offsetOfLength()), storageReg);
+        m_jit.untagArrayPtr(MacroAssembler::Address(baseReg, JSArrayBufferView::offsetOfLength()), storageReg);
 #else
-    UNUSED_PARAM(baseReg);
-    UNUSED_PARAM(storageReg);
+        UNUSED_PARAM(baseReg);
+        UNUSED_PARAM(storageReg);
 #endif
+    };
 
 #if GIGACAGE_ENABLED
     UNUSED_PARAM(baseReg);
-    if (!Gigacage::shouldBeEnabled())
-        return;
+    if (!Gigacage::shouldBeEnabled()) {
+        untagArrayPtr();
+        return;
+    }
     
     if (Gigacage::canPrimitiveGigacageBeDisabled()) {
@@ -6801 +6805 @@
         if (vm.primitiveGigacageEnabled().isStillValid())
             m_jit.graph().watchpoints().addLazily(vm.primitiveGigacageEnabled());
-        else
+        else {
+            untagArrayPtr();
             return;
+        }
     }
     
     m_jit.cageWithoutUntagging(Gigacage::Primitive, storageReg);
 #endif
+    untagArrayPtr();
 }
 

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

@@ -14191 +14191 @@
     LValue caged(Gigacage::Kind kind, LValue ptr, LValue base)
     {
+        auto doUntagArrayPtr = [&](LValue taggedPtr) {
+#if CPU(ARM64E)
+            if (kind == Gigacage::Primitive) {
+                LValue size = m_out.load32(base, m_heaps.JSArrayBufferView_length);
+                return untagArrayPtr(taggedPtr, size);
+            }
+            return ptr;
+#else
+            UNUSED_PARAM(taggedPtr);
+            return ptr;
+#endif
+        };
+
 #if GIGACAGE_ENABLED
         if (!Gigacage::isEnabled(kind))
-            return ptr;
+            return doUntagArrayPtr(ptr);
         
         if (kind == Gigacage::Primitive && Gigacage::canPrimitiveGigacageBeDisabled()) {
@@ -14199 +14212 @@
                 m_graph.watchpoints().addLazily(vm().primitiveGigacageEnabled());
             else
-                return ptr;
+                return doUntagArrayPtr(ptr);
         }
         
@@ -14218 +14231 @@
             });
 
-            LValue size = m_out.load32(base, m_heaps.JSArrayBufferView_length);
-            result = untagArrayPtr(merge, size);
+            result = doUntagArrayPtr(merge);
         }
 #endif // CPU(ARM64E)
@@ -14239 +14251 @@
         UNUSED_PARAM(kind);
         UNUSED_PARAM(base);
-        return ptr;
+        return doUntagArrayPtr(ptr);
     }
     

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -445 +445 @@
             const numberOfPACBits = constexpr MacroAssembler::numberOfPACBits
             bfiq scratch2, 0, 64 - numberOfPACBits, ptr
-            untagArrayPtr length, ptr
         end
+    end
+    if ARM64E
+        untagArrayPtr length, ptr
     end
 end