Changeset 199160 in webkit


Ignore:
Timestamp:
Apr 7, 2016 10:31:06 AM (8 years ago)
Author:
peavo@outlook.com
Message:

[Win] Fix for JSC stress test failures.
https://bugs.webkit.org/show_bug.cgi?id=156343

Reviewed by Filip Pizlo.

We need to make it clear to MSVC that the method loadPtr(ImplicitAddress address, RegisterID dest)
should be used, and not loadPtr(const void* address, RegisterID dest).

  • jit/CCallHelpers.cpp:

(JSC::CCallHelpers::setupShadowChickenPacket):

Location:
trunk/Source/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r199148 r199160  
     12016-04-07  Per Arne Vollan  <peavo@outlook.com>
     2
     3        [Win] Fix for JSC stress test failures.
     4        https://bugs.webkit.org/show_bug.cgi?id=156343
     5
     6        Reviewed by Filip Pizlo.
     7
     8        We need to make it clear to MSVC that the method loadPtr(ImplicitAddress address, RegisterID dest)
     9        should be used, and not loadPtr(const void* address, RegisterID dest).
     10
     11        * jit/CCallHelpers.cpp:
     12        (JSC::CCallHelpers::setupShadowChickenPacket):
     13
    1142016-04-06  Benjamin Poulain  <bpoulain@apple.com>
    215
  • trunk/Source/JavaScriptCore/jit/CCallHelpers.cpp

    r199079 r199160  
    5353{
    5454    move(TrustedImmPtr(vm()->shadowChicken().addressOfLogCursor()), GPRInfo::regT0);
    55     loadPtr(GPRInfo::regT0, GPRInfo::regT1);
     55    loadPtr(Address(GPRInfo::regT0), GPRInfo::regT1);
    5656    Jump ok = branchPtr(Below, GPRInfo::regT1, TrustedImmPtr(vm()->shadowChicken().logEnd()));
    5757    setupArgumentsExecState();
     
    5959    call(GPRInfo::nonArgGPR0);
    6060    move(TrustedImmPtr(vm()->shadowChicken().addressOfLogCursor()), GPRInfo::regT0);
    61     loadPtr(GPRInfo::regT0, GPRInfo::regT1);
     61    loadPtr(Address(GPRInfo::regT0), GPRInfo::regT1);
    6262    ok.link(this);
    6363    addPtr(TrustedImm32(sizeof(ShadowChicken::Packet)), GPRInfo::regT1, GPRInfo::regT2);
    64     storePtr(GPRInfo::regT2, GPRInfo::regT0);
     64    storePtr(GPRInfo::regT2, Address(GPRInfo::regT0));
    6565}
    6666
Note: See TracChangeset for help on using the changeset viewer.