Title: [231290] trunk/Source/_javascript_Core
Revision
231290
Author
utatane....@gmail.com
Date
2018-05-02 18:03:26 -0700 (Wed, 02 May 2018)

Log Message

Unreviewed, fix build failure in ARM, ARMv7 and MIPS
https://bugs.webkit.org/show_bug.cgi?id=185192

compareDouble relies on MacroAssembler::invert function.

* assembler/MacroAssembler.h:
(JSC::MacroAssembler::compareDouble):
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::compareDouble): Deleted.
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::compareDouble): Deleted.
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::compareDouble): Deleted.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (231289 => 231290)


--- trunk/Source/_javascript_Core/ChangeLog	2018-05-03 00:53:41 UTC (rev 231289)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-05-03 01:03:26 UTC (rev 231290)
@@ -1,5 +1,21 @@
 2018-05-02  Yusuke Suzuki  <utatane....@gmail.com>
 
+        Unreviewed, fix build failure in ARM, ARMv7 and MIPS
+        https://bugs.webkit.org/show_bug.cgi?id=185192
+
+        compareDouble relies on MacroAssembler::invert function.
+
+        * assembler/MacroAssembler.h:
+        (JSC::MacroAssembler::compareDouble):
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::compareDouble): Deleted.
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::compareDouble): Deleted.
+        * assembler/MacroAssemblerMIPS.h:
+        (JSC::MacroAssemblerMIPS::compareDouble): Deleted.
+
+2018-05-02  Yusuke Suzuki  <utatane....@gmail.com>
+
         [JSC] Add MacroAssembler::and16 and store16
         https://bugs.webkit.org/show_bug.cgi?id=185188
 

Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (231289 => 231290)


--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h	2018-05-03 00:53:41 UTC (rev 231289)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h	2018-05-03 01:03:26 UTC (rev 231290)
@@ -1459,8 +1459,17 @@
 
 #endif // !CPU(X86_64)
 
+#if !CPU(X86) && !CPU(X86_64) && !CPU(ARM64)
     // We should implement this the right way eventually, but for now, it's fine because it arises so
     // infrequently.
+    void compareDouble(DoubleCondition cond, FPRegisterID left, FPRegisterID right, RegisterID dest)
+    {
+        move(TrustedImm32(0), dest);
+        Jump falseCase = branchDouble(invert(cond), left, right);
+        move(TrustedImm32(1), dest);
+        falseCase.link(this);
+    }
+#endif
 
     void lea32(Address address, RegisterID dest)
     {

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (231289 => 231290)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h	2018-05-03 00:53:41 UTC (rev 231289)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h	2018-05-03 01:03:26 UTC (rev 231290)
@@ -1443,14 +1443,6 @@
         return Jump(m_assembler.jmp(static_cast<ARMAssembler::Condition>(cond & ~DoubleConditionMask)));
     }
 
-    void compareDouble(DoubleCondition cond, FPRegisterID left, FPRegisterID right, RegisterID dest)
-    {
-        move(TrustedImm32(0), dest);
-        Jump falseCase = branchDouble(invert(cond), left, right);
-        move(TrustedImm32(1), dest);
-        falseCase.link(this);
-    }
-
     // Truncates 'src' to an integer, and places the resulting 'dest'.
     // If the result is not representable as a 32 bit value, branch.
     // May also branch for some values that are representable in 32 bits

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (231289 => 231290)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h	2018-05-03 00:53:41 UTC (rev 231289)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h	2018-05-03 01:03:26 UTC (rev 231290)
@@ -1197,14 +1197,6 @@
         return makeBranch(cond);
     }
 
-    void compareDouble(DoubleCondition cond, FPRegisterID left, FPRegisterID right, RegisterID dest)
-    {
-        move(TrustedImm32(0), dest);
-        Jump falseCase = branchDouble(invert(cond), left, right);
-        move(TrustedImm32(1), dest);
-        falseCase.link(this);
-    }
-
     enum BranchTruncateType { BranchIfTruncateFailed, BranchIfTruncateSuccessful };
     Jump branchTruncateDoubleToInt32(FPRegisterID src, RegisterID dest, BranchTruncateType branchType = BranchIfTruncateFailed)
     {

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (231289 => 231290)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h	2018-05-03 00:53:41 UTC (rev 231289)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h	2018-05-03 01:03:26 UTC (rev 231290)
@@ -3307,14 +3307,6 @@
         return Jump();
     }
 
-    void compareDouble(DoubleCondition cond, FPRegisterID left, FPRegisterID right, RegisterID dest)
-    {
-        move(TrustedImm32(0), dest);
-        Jump falseCase = branchDouble(invert(cond), left, right);
-        move(TrustedImm32(1), dest);
-        falseCase.link(this);
-    }
-
     // Truncates 'src' to an integer, and places the resulting 'dest'.
     // If the result is not representable as a 32 bit value, branch.
     enum BranchTruncateType { BranchIfTruncateFailed, BranchIfTruncateSuccessful };
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to