[webkit-changes] [281717] trunk/Source/JavaScriptCore

Fri, 27 Aug 2021 12:53:48 -0700

Title: [281717] trunk/Source/_javascript_Core
Revision
281717
Author
sbar...@apple.com
Date
2021-08-27 12:53:12 -0700 (Fri, 27 Aug 2021)

Log Message

Update ARM64EHash
https://bugs.webkit.org/show_bug.cgi?id=228962
<rdar://79883337>

Reviewed by Mark Lam.

* assembler/AssemblerBuffer.h:
(JSC::ARM64EHash::ARM64EHash):
(JSC::ARM64EHash::update):
(JSC::ARM64EHash::makeDiversifier):
(JSC::ARM64EHash::nextValue):
(JSC::ARM64EHash::bitsForDiversifier):
(JSC::ARM64EHash::currentHash):
(JSC::ARM64EHash::setUpdatedHash):
(JSC::AssemblerBuffer::AssemblerBuffer):
(JSC::AssemblerBuffer::putIntegralUnchecked):
* assembler/LinkBuffer.cpp:
(JSC::LinkBuffer::copyCompactAndLinkCode):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (281716 => 281717)


--- trunk/Source/_javascript_Core/ChangeLog	2021-08-27 19:38:30 UTC (rev 281716)
+++ trunk/Source/_javascript_Core/ChangeLog	2021-08-27 19:53:12 UTC (rev 281717)
@@ -1,3 +1,24 @@
+2021-08-27  Saam Barati  <sbar...@apple.com>
+
+        Update ARM64EHash
+        https://bugs.webkit.org/show_bug.cgi?id=228962
+        <rdar://79883337>
+
+        Reviewed by Mark Lam.
+
+        * assembler/AssemblerBuffer.h:
+        (JSC::ARM64EHash::ARM64EHash):
+        (JSC::ARM64EHash::update):
+        (JSC::ARM64EHash::makeDiversifier):
+        (JSC::ARM64EHash::nextValue):
+        (JSC::ARM64EHash::bitsForDiversifier):
+        (JSC::ARM64EHash::currentHash):
+        (JSC::ARM64EHash::setUpdatedHash):
+        (JSC::AssemblerBuffer::AssemblerBuffer):
+        (JSC::AssemblerBuffer::putIntegralUnchecked):
+        * assembler/LinkBuffer.cpp:
+        (JSC::LinkBuffer::copyCompactAndLinkCode):
+
 2021-08-27  Mikhail R. Gadelha  <mikh...@igalia.com>
 
         Avoid increasing required alignment of target type warning on ARM 32 bits

Modified: trunk/Source/_javascript_Core/assembler/AssemblerBuffer.h (281716 => 281717)


--- trunk/Source/_javascript_Core/assembler/AssemblerBuffer.h	2021-08-27 19:38:30 UTC (rev 281716)
+++ trunk/Source/_javascript_Core/assembler/AssemblerBuffer.h	2021-08-27 19:53:12 UTC (rev 281717)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -203,14 +203,15 @@
     };
 
 #if CPU(ARM64E)
+#if PLATFORM(MAC)
     class ARM64EHash {
     public:
-        ARM64EHash(uint32_t initialHash)
-            : m_hash(initialHash)
+        ARM64EHash(void* initialHash)
+            : m_hash(static_cast<uint32_t>(bitwise_cast<uintptr_t>(initialHash)))
         {
         }
 
-        ALWAYS_INLINE uint32_t update(uint32_t value)
+        ALWAYS_INLINE uint32_t update(uint32_t value, uint32_t, void*)
         {
             uint64_t input = value ^ m_hash;
             uint64_t a = static_cast<uint32_t>(tagInt(input, static_cast<PtrTag>(0)) >> 39);
@@ -222,8 +223,66 @@
     private:
         uint32_t m_hash;
     };
-#endif
+#else
+    class ARM64EHash {
+    public:
+        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;
+        }
+
+    private:
+        static constexpr uint8_t initializationNamespace = 0x11;
+
+        static ALWAYS_INLINE PtrTag makeDiversifier(uint8_t namespaceTag, uint64_t index, uint32_t value)
+        {
+            // <namespaceTag:8><index:24><value:32>
+            return static_cast<PtrTag>((static_cast<uint64_t>(namespaceTag) << 56) + ((index & 0xFFFFFF) << 32) + value);
+        }
+
+        static ALWAYS_INLINE uint32_t nextValue(uint64_t instruction, uint64_t index, uint32_t currentValue)
+        {
+            uint64_t a = tagInt(instruction, makeDiversifier(0x12, index, currentValue));
+            uint64_t b = tagInt(instruction, makeDiversifier(0x13, index, currentValue));
+            return (a >> 39) ^ (b >> 23);
+        }
+
+        static ALWAYS_INLINE uint32_t bitsForDiversifier(void* diversifier)
+        {
+            return bitwise_cast<uintptr_t>(diversifier);
+        }
+
+        ALWAYS_INLINE uint32_t currentHash(uint32_t index, void* diversifier)
+        {
+            bool hashFieldIsTagged = index == 0;
+            if (hashFieldIsTagged)
+                return untagInt(m_hash, makeDiversifier(initializationNamespace, index, bitsForDiversifier(diversifier)));
+            return m_hash;
+        }
+
+        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;
+        }
+
+        uint64_t m_hash;
+    };
+#endif // PLATFORM(MAC)
+#endif // CPU(ARM64E)
+
     class AssemblerBuffer {
     public:
         AssemblerBuffer()
@@ -230,7 +289,7 @@
             : m_storage()
             , m_index(0)
 #if CPU(ARM64E)
-            , m_hash(static_cast<uint32_t>(bitwise_cast<uint64_t>(this)))
+            , m_hash(this)
             , m_hashes()
 #endif
         {
@@ -388,7 +447,7 @@
 #if CPU(ARM64)
             static_assert(sizeof(value) == 4, "");
 #if CPU(ARM64E)
-            uint32_t hash = m_hash.update(value);
+            uint32_t hash = m_hash.update(value, m_index / sizeof(IntegralType), this);
             WTF::unalignedStore<uint32_t>(m_hashes.buffer() + m_index, hash);
 #endif
 #endif

Modified: trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp (281716 => 281717)


--- trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp	2021-08-27 19:38:30 UTC (rev 281716)
+++ trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp	2021-08-27 19:53:12 UTC (rev 281717)
@@ -245,7 +245,8 @@
     m_assemblerStorage = macroAssembler.m_assembler.buffer().releaseAssemblerData();
     uint8_t* inData = bitwise_cast<uint8_t*>(m_assemblerStorage.buffer());
 #if CPU(ARM64E)
-    ARM64EHash verifyUncompactedHash { static_cast<uint32_t>(bitwise_cast<uint64_t>(&macroAssembler.m_assembler.buffer())) };
+    void* bufferPtr = &macroAssembler.m_assembler.buffer();
+    ARM64EHash verifyUncompactedHash { bufferPtr };
     m_assemblerHashesStorage = macroAssembler.m_assembler.buffer().releaseAssemblerHashes();
     uint32_t* inHashes = bitwise_cast<uint32_t*>(m_assemblerHashesStorage.buffer());
 #endif
@@ -267,8 +268,8 @@
     auto read = [&](const InstructionType* ptr) -> InstructionType {
         InstructionType value = *ptr;
 #if CPU(ARM64E)
-        uint32_t hash = verifyUncompactedHash.update(value);
         unsigned index = (bitwise_cast<uint8_t*>(ptr) - inData) / 4;
+        uint32_t hash = verifyUncompactedHash.update(value, index, bufferPtr);
         RELEASE_ASSERT(inHashes[index] == hash);
 #endif
         return value;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to