Changeset 229772 in webkit


Ignore:
Timestamp:
Mar 20, 2018 1:37:46 PM (6 years ago)
Author:
guijemont@igalia.com
Message:

MIPS+Armv7 builds are broken since r229391
https://bugs.webkit.org/show_bug.cgi?id=183474

Reviewed by Yusuke Suzuki.

Add missing armv7 and mips operations and fix arguments to a call to
operationGetByValCell. This should fix compilation on MIPS and Armv7
(though it does not implement the missing setupArguments stuff in
CCallHelpers).

  • assembler/MacroAssembler.h:
  • assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::swap):

  • assembler/MacroAssemblerMIPS.h:

(JSC::MacroAssemblerMIPS::swap):

  • dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

  • jit/FPRInfo.h:
Location:
trunk/Source/JavaScriptCore
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r229768 r229772  
     12018-03-20  Guillaume Emont  <guijemont@igalia.com>
     2
     3        MIPS+Armv7 builds are broken since r229391
     4        https://bugs.webkit.org/show_bug.cgi?id=183474
     5
     6        Reviewed by Yusuke Suzuki.
     7
     8        Add missing armv7 and mips operations and fix arguments to a call to
     9        operationGetByValCell. This should fix compilation on MIPS and Armv7
     10        (though it does not implement the missing setupArguments stuff in
     11        CCallHelpers).
     12
     13        * assembler/MacroAssembler.h:
     14        * assembler/MacroAssemblerARMv7.h:
     15        (JSC::MacroAssemblerARMv7::swap):
     16        * assembler/MacroAssemblerMIPS.h:
     17        (JSC::MacroAssemblerMIPS::swap):
     18        * dfg/DFGSpeculativeJIT32_64.cpp:
     19        (JSC::DFG::SpeculativeJIT::compile):
     20        * jit/FPRInfo.h:
     21
    1222018-03-20  Tim Horton  <timothy_horton@apple.com>
    223
  • trunk/Source/JavaScriptCore/assembler/MacroAssembler.h

    r229482 r229772  
    354354    {
    355355        store64(src, addressForPoke(index));
    356     }
    357 #endif
    358    
    359 #if CPU(MIPS)
    360     void poke(FPRegisterID src, int index = 0)
    361     {
    362         ASSERT(!(index & 1));
    363         storeDouble(src, addressForPoke(index));
    364356    }
    365357#endif
  • trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

    r229767 r229772  
    13401340    }
    13411341
     1342    void swap(FPRegisterID fr1, FPRegisterID fr2)
     1343    {
     1344        moveDouble(fr1, fpTempRegister);
     1345        moveDouble(fr2, fr1);
     1346        moveDouble(fpTempRegister, fr2);
     1347    }
     1348
    13421349    void signExtend32ToPtr(RegisterID src, RegisterID dest)
    13431350    {
  • trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h

    r229767 r229772  
    29182918    }
    29192919
    2920     void swapDouble(FPRegisterID fr1, FPRegisterID fr2)
     2920    void swap(FPRegisterID fr1, FPRegisterID fr2)
    29212921    {
    29222922        moveDouble(fr1, fpTempRegister);
  • trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp

    r229514 r229772  
    49774977        done.link(&m_jit);
    49784978
    4979         addSlowPathGenerator(slowPathCall(slowPath, this, operationGetByValCell, resultRegs, baseGPR, propertyGPR));
     4979        addSlowPathGenerator(slowPathCall(slowPath, this, operationGetByValCell, resultRegs, baseGPR, JSValue::JSCellType, propertyGPR));
    49804980#endif
    49814981
  • trunk/Source/JavaScriptCore/jit/FPRInfo.h

    r229391 r229772  
    257257    typedef FPRReg RegisterType;
    258258    static const unsigned numberOfRegisters = 7;
     259    static const unsigned numberOfArgumentRegisters = 2;
    259260
    260261    // Temporary registers.
Note: See TracChangeset for help on using the changeset viewer.