Changeset 192535 in webkit

Timestamp:

Nov 17, 2015, 2:09:07 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Refactoring: move branchMul32's imm arg to the 3rd argument to be consistent.
​https://bugs.webkit.org/show_bug.cgi?id=151358

Reviewed by Saam Barati.

branch32, branchAdd32, and branchSub32 all have it as the 3rd argument.
branchMul32 is the odd man out. This patch makes branchMul32 consistent with
the others.

• assembler/MacroAssembler.h:

(JSC::MacroAssembler::branchAdd32):
(JSC::MacroAssembler::branchMul32):

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::branchMul32):

• assembler/MacroAssemblerARM64.h:

(JSC::MacroAssemblerARM64::branchMul32):

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::branchMul32):

• assembler/MacroAssemblerMIPS.h:

(JSC::MacroAssemblerMIPS::branchMul32):

• assembler/MacroAssemblerSH4.h:

(JSC::MacroAssemblerSH4::branchNeg32):
(JSC::MacroAssemblerSH4::branchMul32):

• assembler/MacroAssemblerX86Common.h:

(JSC::MacroAssemblerX86Common::branchMul32):

• jit/JITArithmetic.cpp:

(JSC::JIT::emit_op_mul):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssembler.h (modified) (2 diffs)
• assembler/MacroAssemblerARM.h (modified) (1 diff)
• assembler/MacroAssemblerARM64.h (modified) (1 diff)
• assembler/MacroAssemblerARMv7.h (modified) (1 diff)
• assembler/MacroAssemblerMIPS.h (modified) (1 diff)
• assembler/MacroAssemblerSH4.h (modified) (2 diffs)
• assembler/MacroAssemblerX86Common.h (modified) (1 diff)
• jit/JITArithmetic.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog ¶

@@ +1 @@
+2015-11-17  Mark Lam  <mark.lam@apple.com>
+
+        Refactoring: move branchMul32's imm arg to the 3rd argument to be consistent.
+        https://bugs.webkit.org/show_bug.cgi?id=151358
+
+        Reviewed by Saam Barati.
+
+        branch32, branchAdd32, and branchSub32 all have it as the 3rd argument.
+        branchMul32 is the odd man out.  This patch makes branchMul32 consistent with
+        the others.
+
+        * assembler/MacroAssembler.h:
+        (JSC::MacroAssembler::branchAdd32):
+        (JSC::MacroAssembler::branchMul32):
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::branchMul32):
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::branchMul32):
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::branchMul32):
+        * assembler/MacroAssemblerMIPS.h:
+        (JSC::MacroAssemblerMIPS::branchMul32):
+        * assembler/MacroAssemblerSH4.h:
+        (JSC::MacroAssemblerSH4::branchNeg32):
+        (JSC::MacroAssemblerSH4::branchMul32):
+        * assembler/MacroAssemblerX86Common.h:
+        (JSC::MacroAssemblerX86Common::branchMul32):
+        * jit/JITArithmetic.cpp:
+        (JSC::JIT::emit_op_mul):
+
 2015-11-17  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssembler.h ¶

@@ -1606 +1606 @@
     }
     
-    Jump branchMul32(ResultCondition cond, Imm32 imm, RegisterID src, RegisterID dest)
+    Jump branchMul32(ResultCondition cond, RegisterID src, Imm32 imm, RegisterID dest)
     {
         if (src == dest)
@@ -1619 +1619 @@
             return branchMul32(cond, src, dest);  
         }
-        return branchMul32(cond, imm.asTrustedImm32(), src, dest);
+        return branchMul32(cond, src, imm.asTrustedImm32(), dest);
     }
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h ¶

@@ -826 +826 @@
     }
 
-    Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
+    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
     {
         ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h ¶

@@ -2076 +2076 @@
     }
 
-    Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
+    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
     {
         move(imm, getCachedDataTempRegisterIDAndInvalidate());

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h ¶

@@ -1616 +1616 @@
     }
 
-    Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
+    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
     {
         move(imm, dataTempRegister);

trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h ¶

@@ -1820 +1820 @@
     }
 
-    Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
+    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
     {
         move(imm, immTempRegister);

trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h ¶

@@ -2041 +2041 @@
 
         if (cond == Overflow)
-            return branchMul32(cond, TrustedImm32(-1), srcDest, srcDest);
+            return branchMul32(cond, srcDest, TrustedImm32(-1), srcDest);
 
         neg32(srcDest);
@@ -2245 +2245 @@
     }
 
-    Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
+    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
     {
         ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));

trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h ¶

@@ -1459 +1459 @@
     }
     
-    Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
+    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
     {
         mul32(imm, src, dest);

trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp ¶

@@ -786 +786 @@
         emitGetVirtualRegister(op2, regT0);
         emitJumpSlowCaseIfNotInt(regT0);
-        addSlowCase(branchMul32(Overflow, Imm32(value), regT0, regT1));
+        addSlowCase(branchMul32(Overflow, regT0, Imm32(value), regT1));
         emitTagInt(regT1, regT0);
     } else if (isOperandConstantInt(op2) && ((value = getOperandConstantInt(op2)) > 0)) {
         emitGetVirtualRegister(op1, regT0);
         emitJumpSlowCaseIfNotInt(regT0);
-        addSlowCase(branchMul32(Overflow, Imm32(value), regT0, regT1));
+        addSlowCase(branchMul32(Overflow, regT0, Imm32(value), regT1));
         emitTagInt(regT1, regT0);
     } else