Title: [271027] branches/safari-610-branch/Source/_javascript_Core
Revision
271027
Author
[email protected]
Date
2020-12-21 10:47:52 -0800 (Mon, 21 Dec 2020)

Log Message

Cherry-pick r270988. rdar://problem/72552973

    Fix MacroAssemblerARM64E::validateUntaggedPtr() to account for TBI.
    https://bugs.webkit.org/show_bug.cgi?id=220021
    <rdar://problem/72474809>

    Reviewed by Saam Barati.

    * assembler/AbstractMacroAssembler.h:
    * assembler/DisallowMacroScratchRegisterUsage.h:
    - templatized the DisallowMacroScratchRegisterUsage class so that we can #include
      it in MacroAssembler implementations.
    * assembler/MacroAssemblerARM64E.h:
    (JSC::MacroAssemblerARM64E::validateUntaggedPtr):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/_javascript_Core/ChangeLog (271026 => 271027)


--- branches/safari-610-branch/Source/_javascript_Core/ChangeLog	2020-12-21 18:47:32 UTC (rev 271026)
+++ branches/safari-610-branch/Source/_javascript_Core/ChangeLog	2020-12-21 18:47:52 UTC (rev 271027)
@@ -1,3 +1,39 @@
+2020-12-21  Alan Coon  <[email protected]>
+
+        Cherry-pick r270988. rdar://problem/72552973
+
+    Fix MacroAssemblerARM64E::validateUntaggedPtr() to account for TBI.
+    https://bugs.webkit.org/show_bug.cgi?id=220021
+    <rdar://problem/72474809>
+    
+    Reviewed by Saam Barati.
+    
+    * assembler/AbstractMacroAssembler.h:
+    * assembler/DisallowMacroScratchRegisterUsage.h:
+    - templatized the DisallowMacroScratchRegisterUsage class so that we can #include
+      it in MacroAssembler implementations.
+    * assembler/MacroAssemblerARM64E.h:
+    (JSC::MacroAssemblerARM64E::validateUntaggedPtr):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270988 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-12-18  Mark Lam  <[email protected]>
+
+            Fix MacroAssemblerARM64E::validateUntaggedPtr() to account for TBI.
+            https://bugs.webkit.org/show_bug.cgi?id=220021
+            <rdar://problem/72474809>
+
+            Reviewed by Saam Barati.
+
+            * assembler/AbstractMacroAssembler.h:
+            * assembler/DisallowMacroScratchRegisterUsage.h:
+            - templatized the DisallowMacroScratchRegisterUsage class so that we can #include
+              it in MacroAssembler implementations.
+            * assembler/MacroAssemblerARM64E.h:
+            (JSC::MacroAssemblerARM64E::validateUntaggedPtr):
+
 2020-12-16  Mark Lam  <[email protected]>
 
         Cherry-pick r270686. rdar://problem/72321615

Modified: branches/safari-610-branch/Source/_javascript_Core/assembler/AbstractMacroAssembler.h (271026 => 271027)


--- branches/safari-610-branch/Source/_javascript_Core/assembler/AbstractMacroAssembler.h	2020-12-21 18:47:32 UTC (rev 271026)
+++ branches/safari-610-branch/Source/_javascript_Core/assembler/AbstractMacroAssembler.h	2020-12-21 18:47:52 UTC (rev 271027)
@@ -46,9 +46,11 @@
 #if ENABLE(ASSEMBLER)
 
 class AllowMacroScratchRegisterUsage;
-class DisallowMacroScratchRegisterUsage;
 class LinkBuffer;
 class Watchpoint;
+
+template<typename T> class DisallowMacroScratchRegisterUsage;
+
 namespace DFG {
 struct OSRExit;
 }
@@ -1109,7 +1111,7 @@
 
     friend class AllowMacroScratchRegisterUsage;
     friend class AllowMacroScratchRegisterUsageIf;
-    friend class DisallowMacroScratchRegisterUsage;
+    template<typename T> friend class DisallowMacroScratchRegisterUsage;
     unsigned m_tempRegistersValidBits;
     bool m_allowScratchRegister { true };
 

Modified: branches/safari-610-branch/Source/_javascript_Core/assembler/DisallowMacroScratchRegisterUsage.h (271026 => 271027)


--- branches/safari-610-branch/Source/_javascript_Core/assembler/DisallowMacroScratchRegisterUsage.h	2020-12-21 18:47:32 UTC (rev 271026)
+++ branches/safari-610-branch/Source/_javascript_Core/assembler/DisallowMacroScratchRegisterUsage.h	2020-12-21 18:47:52 UTC (rev 271027)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,10 +27,9 @@
 
 #if ENABLE(ASSEMBLER)
 
-#include "MacroAssembler.h"
-
 namespace JSC {
 
+template<typename MacroAssembler>
 class DisallowMacroScratchRegisterUsage {
 public:
     DisallowMacroScratchRegisterUsage(MacroAssembler& masm)

Modified: branches/safari-610-branch/Source/_javascript_Core/assembler/MacroAssemblerARM64E.h (271026 => 271027)


--- branches/safari-610-branch/Source/_javascript_Core/assembler/MacroAssemblerARM64E.h	2020-12-21 18:47:32 UTC (rev 271026)
+++ branches/safari-610-branch/Source/_javascript_Core/assembler/MacroAssemblerARM64E.h	2020-12-21 18:47:52 UTC (rev 271027)
@@ -27,6 +27,8 @@
 
 #if ENABLE(ASSEMBLER) && CPU(ARM64E)
 
+#include "DisallowMacroScratchRegisterUsage.h"
+
 // We need to include this before MacroAssemblerARM64.h because MacroAssemblerARM64
 // will be defined in terms of ARM64EAssembler for ARM64E.
 #include "ARM64EAssembler.h"
@@ -80,7 +82,12 @@
     {
         if (scratch == InvalidGPR)
             scratch = getCachedDataTempRegisterIDAndInvalidate();
-        load8(Address(target), scratch);
+
+        DisallowMacroScratchRegisterUsage disallowScope(*this);
+        rshift64(target, TrustedImm32(8), scratch);
+        and64(TrustedImm64(0xff000000000000), scratch, scratch);
+        or64(target, scratch, scratch);
+        load8(Address(scratch), scratch);
     }
 
     ALWAYS_INLINE void untagPtr(RegisterID tag, RegisterID target)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to