Changeset 168649 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h

Timestamp:

May 12, 2014, 3:21:16 PM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r168642.
​https://bugs.webkit.org/show_bug.cgi?id=132839

Broke ARM build (Requested by jpfau on #webkit).

Reverted changeset:

"[Win] Enum type with value zero is compatible with void*,
potential cause of crashes."
​https://bugs.webkit.org/show_bug.cgi?id=132772
​http://trac.webkit.org/changeset/168642

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h

@@ -1156 +1156 @@
     }
 
-    void loadDouble(TrustedImmPtr address, FPRegisterID dest)
-    {
-        RegisterID scr = claimScratch();
-        move(address, scr);
+    void loadDouble(const void* address, FPRegisterID dest)
+    {
+        RegisterID scr = claimScratch();
+        move(TrustedImmPtr(address), scr);
         m_assembler.fmovsReadrminc(scr, (FPRegisterID)(dest + 1));
         m_assembler.fmovsReadrm(scr, dest);
@@ -1205 +1205 @@
     }
 
-    void storeDouble(FPRegisterID src, TrustedImmPtr address)
-    {
-        RegisterID scr = claimScratch();
-        m_assembler.loadConstant(reinterpret_cast<uint32_t>(const_cast<void*>(address.m_value)) + 8, scr);
+    void storeDouble(FPRegisterID src, const void* address)
+    {
+        RegisterID scr = claimScratch();
+        m_assembler.loadConstant(reinterpret_cast<uint32_t>(const_cast<void*>(address)) + 8, scr);
         m_assembler.fmovsWriterndec(src, scr);
         m_assembler.fmovsWriterndec((FPRegisterID)(src + 1), scr);