Title: [157619] trunk/Source/_javascript_Core
Revision
157619
Author
fpi...@apple.com
Date
2013-10-17 20:47:08 -0700 (Thu, 17 Oct 2013)

Log Message

Unreviewed, speculative ARM64 build fix.
        
move(ImmPtr, blah) is only available in MacroAssembler since that's where blinding is
implemented. So, you have to use TrustedImmPtr in the superclasses.

* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::store8):
(JSC::MacroAssemblerARM64::branchTest8):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (157618 => 157619)


--- trunk/Source/_javascript_Core/ChangeLog	2013-10-18 02:43:44 UTC (rev 157618)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-10-18 03:47:08 UTC (rev 157619)
@@ -1,5 +1,16 @@
 2013-10-17  Filip Pizlo  <fpi...@apple.com>
 
+        Unreviewed, speculative ARM64 build fix.
+        
+        move(ImmPtr, blah) is only available in MacroAssembler since that's where blinding is
+        implemented. So, you have to use TrustedImmPtr in the superclasses.
+
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::store8):
+        (JSC::MacroAssemblerARM64::branchTest8):
+
+2013-10-17  Filip Pizlo  <fpi...@apple.com>
+
         Unreviewed, speculative ARM build fix.
         https://bugs.webkit.org/show_bug.cgi?id=122890
         <rdar://problem/15258624>

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (157618 => 157619)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h	2013-10-18 02:43:44 UTC (rev 157618)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h	2013-10-18 03:47:08 UTC (rev 157619)
@@ -1012,7 +1012,7 @@
 
     void store8(RegisterID src, void* address)
     {
-        move(ImmPtr(address), getCachedMemoryTempRegisterIDAndInvalidate());
+        move(TrustedImmPtr(address), getCachedMemoryTempRegisterIDAndInvalidate());
         m_assembler.strb(src, memoryTempRegister, 0);
     }
 
@@ -1694,7 +1694,7 @@
 
     Jump branchTest8(ResultCondition cond, ExtendedAddress address, TrustedImm32 mask = TrustedImm32(-1))
     {
-        move(ImmPtr(reinterpret_cast<void*>(address.offset)), getCachedDataTempRegisterIDAndInvalidate());
+        move(TrustedImmPtr(reinterpret_cast<void*>(address.offset)), getCachedDataTempRegisterIDAndInvalidate());
         m_assembler.ldrb(dataTempRegister, address.base, dataTempRegister);
         return branchTest32(cond, dataTempRegister, mask);
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to