Changeset 195226 in webkit

Timestamp:

Jan 18, 2016, 5:39:11 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r194764 - [mips] Max value of immediate arg of logical ops is 0xffff
​https://bugs.webkit.org/show_bug.cgi?id=152884

Patch by Konstantin Tokarev <Konstantin Tokarev> on 2016-01-08
Reviewed by Michael Saboff.

Replaced imm.m_value < 65535 checks with imm.m_value <= 65535

• assembler/MacroAssemblerMIPS.h:

(JSC::MacroAssemblerMIPS::and32):
(JSC::MacroAssemblerMIPS::or32):

Location:

releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerMIPS.h (modified) (4 diffs)

releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-01-08  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [mips] Max value of immediate arg of logical ops is 0xffff
+        https://bugs.webkit.org/show_bug.cgi?id=152884
+
+        Reviewed by Michael Saboff.
+
+        Replaced imm.m_value < 65535 checks with imm.m_value <= 65535
+
+        * assembler/MacroAssemblerMIPS.h:
+        (JSC::MacroAssemblerMIPS::and32):
+        (JSC::MacroAssemblerMIPS::or32):
+
 2016-01-07  Konstantin Tokarev  <annulen@yandex.ru>
 

releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h

@@ -290 +290 @@
         if (!imm.m_value && !m_fixedWidth)
             move(MIPSRegisters::zero, dest);
-        else if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth)
+        else if (imm.m_value > 0 && imm.m_value <= 65535 && !m_fixedWidth)
             m_assembler.andi(dest, dest, imm.m_value);
         else {
@@ -306 +306 @@
         if (!imm.m_value && !m_fixedWidth)
             move(MIPSRegisters::zero, dest);
-        else if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth)
+        else if (imm.m_value > 0 && imm.m_value <= 65535 && !m_fixedWidth)
             m_assembler.andi(dest, src, imm.m_value);
         else {
@@ -382 +382 @@
             return;
 
-        if (imm.m_value > 0 && imm.m_value < 65535
+        if (imm.m_value > 0 && imm.m_value <= 65535
             && !m_fixedWidth) {
             m_assembler.ori(dest, dest, imm.m_value);
@@ -403 +403 @@
         }
 
-        if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth) {
+        if (imm.m_value > 0 && imm.m_value <= 65535 && !m_fixedWidth) {
             m_assembler.ori(dest, src, imm.m_value);
             return;