Changeset 232290 in webkit

Timestamp:

May 30, 2018 7:13:22 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[MIPS] Fix build on MIPS32r1
​https://bugs.webkit.org/show_bug.cgi?id=185944

Patch by Dominik Infuehr <​dinfuehr@igalia.com> on 2018-05-30
Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

Only use instructions on MIPS32r2 or later. mthc1 and mfhc1 are not supported
on MIPS32r1.

• offlineasm/mips.rb:

Source/WTF:

Added WTF_MIPS_ISA_REV_AT_LEAST to test for certain release or later.

• wtf/Platform.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/offlineasm/mips.rb (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-05-30  Dominik Infuehr  <dinfuehr@igalia.com>
+
+        [MIPS] Fix build on MIPS32r1
+        https://bugs.webkit.org/show_bug.cgi?id=185944
+
+        Reviewed by Yusuke Suzuki.
+
+        Only use instructions on MIPS32r2 or later. mthc1 and mfhc1 are not supported
+        on MIPS32r1.
+
+        * offlineasm/mips.rb:
+
 2018-05-29  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/offlineasm/mips.rb

@@ -1015 +1015 @@
         when "fii2d"
             $asm.puts "mtc1 #{operands[0].mipsOperand}, #{operands[2].mipsSingleLo}"
+            $asm.putStr("#if WTF_MIPS_ISA_REV_AT_LEAST(2)")
             $asm.puts "mthc1 #{operands[1].mipsOperand}, #{operands[2].mipsSingleLo}"
+            $asm.putStr("#else")
+            $asm.puts "mtc1 #{operands[1].mipsOperand}, #{operands[2].mipsSingleHi}"
+            $asm.putStr("#endif")
         when "fd2ii"
             $asm.puts "mfc1 #{operands[1].mipsOperand}, #{operands[0].mipsSingleLo}"
+            $asm.putStr("#if WTF_MIPS_ISA_REV_AT_LEAST(2)")
             $asm.puts "mfhc1 #{operands[2].mipsOperand}, #{operands[0].mipsSingleLo}"
+            $asm.putStr("#else")
+            $asm.puts "mfc1 #{operands[2].mipsOperand}, #{operands[0].mipsSingleHi}"
+            $asm.putStr("#endif")
         when /^bo/
             $asm.puts "bgt #{operands[0].mipsOperand}, #{operands[1].mipsOperand}, #{operands[2].asmLabel}"

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-05-30  Dominik Infuehr  <dinfuehr@igalia.com>
+
+        [MIPS] Fix build on MIPS32r1
+        https://bugs.webkit.org/show_bug.cgi?id=185944
+
+        Reviewed by Yusuke Suzuki.
+
+        Added WTF_MIPS_ISA_REV_AT_LEAST to test for certain release or later.
+
+        * wtf/Platform.h:
+
 2018-05-29  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -75 +75 @@
 #define WTF_MIPS_ARCH_REV __mips_isa_rev
 #define WTF_MIPS_ISA_REV(v) (defined WTF_MIPS_ARCH_REV && WTF_MIPS_ARCH_REV == v)
+#define WTF_MIPS_ISA_REV_AT_LEAST(v) (defined WTF_MIPS_ARCH_REV && WTF_MIPS_ARCH_REV >= v)
 #define WTF_MIPS_DOUBLE_FLOAT (defined __mips_hard_float && !defined __mips_single_float)
 #define WTF_MIPS_FP64 (defined __mips_fpr && __mips_fpr == 64)