Changeset 192535 in webkit


Ignore:
Timestamp:
Nov 17, 2015 2:09:07 PM (8 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:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r192531 r192535  
     12015-11-17  Mark Lam  <mark.lam@apple.com>
     2
     3        Refactoring: move branchMul32's imm arg to the 3rd argument to be consistent.
     4        https://bugs.webkit.org/show_bug.cgi?id=151358
     5
     6        Reviewed by Saam Barati.
     7
     8        branch32, branchAdd32, and branchSub32 all have it as the 3rd argument.
     9        branchMul32 is the odd man out.  This patch makes branchMul32 consistent with
     10        the others.
     11
     12        * assembler/MacroAssembler.h:
     13        (JSC::MacroAssembler::branchAdd32):
     14        (JSC::MacroAssembler::branchMul32):
     15        * assembler/MacroAssemblerARM.h:
     16        (JSC::MacroAssemblerARM::branchMul32):
     17        * assembler/MacroAssemblerARM64.h:
     18        (JSC::MacroAssemblerARM64::branchMul32):
     19        * assembler/MacroAssemblerARMv7.h:
     20        (JSC::MacroAssemblerARMv7::branchMul32):
     21        * assembler/MacroAssemblerMIPS.h:
     22        (JSC::MacroAssemblerMIPS::branchMul32):
     23        * assembler/MacroAssemblerSH4.h:
     24        (JSC::MacroAssemblerSH4::branchNeg32):
     25        (JSC::MacroAssemblerSH4::branchMul32):
     26        * assembler/MacroAssemblerX86Common.h:
     27        (JSC::MacroAssemblerX86Common::branchMul32):
     28        * jit/JITArithmetic.cpp:
     29        (JSC::JIT::emit_op_mul):
     30
    1312015-11-17  Mark Lam  <mark.lam@apple.com>
    232

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

    r192121 r192535  
    16061606    }
    16071607   
    1608     Jump branchMul32(ResultCondition cond, Imm32 imm, RegisterID src, RegisterID dest)
     1608    Jump branchMul32(ResultCondition cond, RegisterID src, Imm32 imm, RegisterID dest)
    16091609    {
    16101610        if (src == dest)
    … …  
    16191619            return branchMul32(cond, src, dest); 
    16201620        }
    1621         return branchMul32(cond, imm.asTrustedImm32(), src, dest);
     1621        return branchMul32(cond, src, imm.asTrustedImm32(), dest);
    16221622    }
    16231623

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

    r191700 r192535  
    826826    }
    827827
    828     Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
     828    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
    829829    {
    830830        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));

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

    r192409 r192535  
    20762076    }
    20772077
    2078     Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
     2078    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
    20792079    {
    20802080        move(imm, getCachedDataTempRegisterIDAndInvalidate());

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

    r192409 r192535  
    16161616    }
    16171617
    1618     Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
     1618    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
    16191619    {
    16201620        move(imm, dataTempRegister);

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

    r190718 r192535  
    18201820    }
    18211821
    1822     Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
     1822    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
    18231823    {
    18241824        move(imm, immTempRegister);

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

    r190718 r192535  
    20412041
    20422042        if (cond == Overflow)
    2043             return branchMul32(cond, TrustedImm32(-1), srcDest, srcDest);
     2043            return branchMul32(cond, srcDest, TrustedImm32(-1), srcDest);
    20442044
    20452045        neg32(srcDest);
    … …  
    22452245    }
    22462246
    2247     Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
     2247    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
    22482248    {
    22492249        ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero));

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

    r192409 r192535  
    14591459    }
    14601460   
    1461     Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
     1461    Jump branchMul32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
    14621462    {
    14631463        mul32(imm, src, dest);

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

    r192531 r192535  
    786786        emitGetVirtualRegister(op2, regT0);
    787787        emitJumpSlowCaseIfNotInt(regT0);
    788         addSlowCase(branchMul32(Overflow, Imm32(value), regT0, regT1));
     788        addSlowCase(branchMul32(Overflow, regT0, Imm32(value), regT1));
    789789        emitTagInt(regT1, regT0);
    790790    } else if (isOperandConstantInt(op2) && ((value = getOperandConstantInt(op2)) > 0)) {
    791791        emitGetVirtualRegister(op1, regT0);
    792792        emitJumpSlowCaseIfNotInt(regT0);
    793         addSlowCase(branchMul32(Overflow, Imm32(value), regT0, regT1));
     793        addSlowCase(branchMul32(Overflow, regT0, Imm32(value), regT1));
    794794        emitTagInt(regT1, regT0);
    795795    } else
Note: See TracChangeset for help on using the changeset viewer.