Changeset 159571 in webkit


Ignore:
Timestamp:
Nov 20, 2013 10:32:37 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Fix CPU(ARM_TRADITIONAL) build after r159545.
https://bugs.webkit.org/show_bug.cgi?id=124649

Patch by Julien Brianceau <jbriance@cisco.com> on 2013-11-20
Reviewed by Michael Saboff.

Add missing memoryFence, load8 and store8 implementations in macro assembler.

  • assembler/ARMAssembler.h:

(JSC::ARMAssembler::dmbSY):

  • assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::load8):
(JSC::MacroAssemblerARM::store8):
(JSC::MacroAssemblerARM::memoryFence):

Location:
trunk/Source/JavaScriptCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r159564 r159571  
     12013-11-20  Julien Brianceau  <jbriance@cisco.com>
     2
     3        Fix CPU(ARM_TRADITIONAL) build after r159545.
     4        https://bugs.webkit.org/show_bug.cgi?id=124649
     5
     6        Reviewed by Michael Saboff.
     7
     8        Add missing memoryFence, load8 and store8 implementations in macro assembler.
     9
     10        * assembler/ARMAssembler.h:
     11        (JSC::ARMAssembler::dmbSY):
     12        * assembler/MacroAssemblerARM.h:
     13        (JSC::MacroAssemblerARM::load8):
     14        (JSC::MacroAssemblerARM::store8):
     15        (JSC::MacroAssemblerARM::memoryFence):
     16
    1172013-11-20  Julien Brianceau  <jbriance@cisco.com>
    218
  • trunk/Source/JavaScriptCore/assembler/ARMAssembler.h

    r159055 r159571  
    231231#endif
    232232            NOP = 0xe1a00000,
     233            DMB_SY = 0xf57ff05f,
    233234        };
    234235
     
    697698        }
    698699
     700        void dmbSY()
     701        {
     702            m_buffer.putInt(DMB_SY);
     703        }
     704
    699705        void bx(int rm, Condition cc = AL)
    700706        {
  • trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h

    r159415 r159571  
    365365    }
    366366
     367    void load8(const void* address, RegisterID dest)
     368    {
     369        move(TrustedImmPtr(address), ARMRegisters::S0);
     370        m_assembler.dataTransfer32(ARMAssembler::LoadUint8, dest, ARMRegisters::S0, 0);
     371    }
     372
    367373    void load8Signed(BaseIndex address, RegisterID dest)
    368374    {
     
    452458    {
    453459        m_assembler.baseIndexTransfer32(ARMAssembler::StoreUint8, src, address.base, address.index, static_cast<int>(address.scale), address.offset);
     460    }
     461
     462    void store8(RegisterID src, const void* address)
     463    {
     464        move(TrustedImmPtr(address), ARMRegisters::S0);
     465        m_assembler.dtrUp(ARMAssembler::StoreUint8, src, ARMRegisters::S0, 0);
    454466    }
    455467
     
    13031315    }
    13041316
     1317    void memoryFence()
     1318    {
     1319        m_assembler.dmbSY();
     1320    }
     1321
    13051322    static FunctionPtr readCallTarget(CodeLocationCall call)
    13061323    {
Note: See TracChangeset for help on using the changeset viewer.