Changeset 176031 in webkit


Ignore:
Timestamp:
Nov 12, 2014 12:09:42 PM (9 years ago)
Author:
mark.lam@apple.com
Message:

Rename USE(MASM_PROBE) to ENABLE(MASM_PROBE).
<​https://webkit.org/b/138661>

Reviewed by Michael Saboff.

Also move the switch for enabling the use of MASM_PROBE from JavaScriptCore's
config.h to WTF's Platform.h. This ensures that the setting is consistently
applied even when building WebCore parts as well.

Source/JavaScriptCore:

  • assembler/ARMAssembler.h:
  • assembler/ARMv7Assembler.h:
  • assembler/MacroAssemblerARM.cpp:
  • assembler/MacroAssemblerARM.h:
  • assembler/MacroAssemblerARMv7.cpp:
  • assembler/MacroAssemblerARMv7.h:
  • assembler/MacroAssemblerX86.h:
  • assembler/MacroAssemblerX86Common.cpp:
  • assembler/MacroAssemblerX86Common.h:
  • assembler/MacroAssemblerX86_64.h:
  • assembler/X86Assembler.h:
  • config.h:
  • jit/JITStubs.h:
  • jit/JITStubsARM.h:
  • jit/JITStubsARMv7.h:
  • jit/JITStubsX86.h:
  • jit/JITStubsX86Common.h:
  • jit/JITStubsX86_64.h:

Source/WTF:

  • wtf/Platform.h:
Location:
trunk/Source
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r176021 r176031  
     12014-11-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Rename USE(MASM_PROBE) to ENABLE(MASM_PROBE).
     4        <https://webkit.org/b/138661>
     5
     6        Reviewed by Michael Saboff.
     7
     8        Also move the switch for enabling the use of MASM_PROBE from JavaScriptCore's
     9        config.h to WTF's Platform.h.  This ensures that the setting is consistently
     10        applied even when building WebCore parts as well.
     11
     12        * assembler/ARMAssembler.h:
     13        * assembler/ARMv7Assembler.h:
     14        * assembler/MacroAssemblerARM.cpp:
     15        * assembler/MacroAssemblerARM.h:
     16        * assembler/MacroAssemblerARMv7.cpp:
     17        * assembler/MacroAssemblerARMv7.h:
     18        * assembler/MacroAssemblerX86.h:
     19        * assembler/MacroAssemblerX86Common.cpp:
     20        * assembler/MacroAssemblerX86Common.h:
     21        * assembler/MacroAssemblerX86_64.h:
     22        * assembler/X86Assembler.h:
     23        * config.h:
     24        * jit/JITStubs.h:
     25        * jit/JITStubsARM.h:
     26        * jit/JITStubsARMv7.h:
     27        * jit/JITStubsX86.h:
     28        * jit/JITStubsX86Common.h:
     29        * jit/JITStubsX86_64.h:
     30
    1312014-11-12  peavo@outlook.com  <peavo@outlook.com>
    232

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

    r173949 r176031  
    9292        } FPRegisterID;
    9393
    94 #if USE(MASM_PROBE)
     94#if ENABLE(MASM_PROBE)
    9595    #define FOR_EACH_CPU_REGISTER(V) \
    9696        FOR_EACH_CPU_GPREGISTER(V) \
    … …  
    137137        V(double, d14) \
    138138        V(double, d15)
    139 #endif // USE(MASM_PROBE)
     139#endif // ENABLE(MASM_PROBE)
    140140    } // namespace ARMRegisters
    141141

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

    r173949 r176031  
    175175    }
    176176
    177 #if USE(MASM_PROBE)
     177#if ENABLE(MASM_PROBE)
    178178    #define FOR_EACH_CPU_REGISTER(V) \
    179179        FOR_EACH_CPU_GPREGISTER(V) \
    … …  
    244244#endif // CPU(APPLE_ARMV7S)
    245245
    246 #endif // USE(MASM_PROBE)
     246#endif // ENABLE(MASM_PROBE)
    247247}
    248248

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

    r172113 r176031  
    3232#include "MacroAssemblerARM.h"
    3333
    34 #if USE(MASM_PROBE)
     34#if ENABLE(MASM_PROBE)
    3535#include <wtf/StdLibExtras.h>
    3636#endif
    … …  
    100100#endif // CPU(ARMV5_OR_LOWER)
    101101
    102 #if USE(MASM_PROBE)
     102#if ENABLE(MASM_PROBE)
    103103
    104104void MacroAssemblerARM::ProbeContext::dumpCPURegisters(const char* indentation)
    … …  
    161161
    162162}
    163 #endif // USE(MASM_PROBE)
     163#endif // ENABLE(MASM_PROBE)
    164164
    165165} // namespace JSC

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

    r173179 r176031  
    14331433    }
    14341434
    1435 #if USE(MASM_PROBE)
     1435#if ENABLE(MASM_PROBE)
    14361436    struct CPUState {
    14371437        #define DECLARE_REGISTER(_type, _regName) \
    … …  
    14571457    // For details about probe(), see comment in MacroAssemblerX86_64.h.
    14581458    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
    1459 #endif // USE(MASM_PROBE)
     1459#endif // ENABLE(MASM_PROBE)
    14601460
    14611461protected:
    … …  
    15141514    }
    15151515
    1516 #if USE(MASM_PROBE)
     1516#if ENABLE(MASM_PROBE)
    15171517    inline TrustedImm32 trustedImm32FromPtr(void* ptr)
    15181518    {

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

    r166732 r176031  
    2929#include "MacroAssemblerARMv7.h"
    3030
    31 #if USE(MASM_PROBE)
     31#if ENABLE(MASM_PROBE)
    3232#include <wtf/StdLibExtras.h>
    3333#endif
    … …  
    3535namespace JSC {
    3636
    37 #if USE(MASM_PROBE)
     37#if ENABLE(MASM_PROBE)
    3838
    3939void MacroAssemblerARMv7::ProbeContext::dumpCPURegisters(const char* indentation)
    … …  
    9797    m_assembler.blx(RegisterID::ip);
    9898}
    99 #endif // USE(MASM_PROBE)
     99#endif // ENABLE(MASM_PROBE)
    100100
    101101} // namespace JSC

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

    r171123 r176031  
    19021902    }
    19031903
    1904 #if USE(MASM_PROBE)
     1904#if ENABLE(MASM_PROBE)
    19051905    struct CPUState {
    19061906        #define DECLARE_REGISTER(_type, _regName) \
    … …  
    19261926    // For details about probe(), see comment in MacroAssemblerX86_64.h.
    19271927    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
    1928 #endif // USE(MASM_PROBE)
     1928#endif // ENABLE(MASM_PROBE)
    19291929
    19301930protected:
    … …  
    20382038    }
    20392039
    2040 #if USE(MASM_PROBE)
     2040#if ENABLE(MASM_PROBE)
    20412041    inline TrustedImm32 trustedImm32FromPtr(void* ptr)
    20422042    {

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

    r174890 r176031  
    3131#include "MacroAssemblerX86Common.h"
    3232
    33 #if USE(MASM_PROBE)
     33#if ENABLE(MASM_PROBE)
    3434#include <wtf/StdLibExtras.h>
    3535#endif
    … …  
    350350    }
    351351
    352 #if USE(MASM_PROBE)
     352#if ENABLE(MASM_PROBE)
    353353    // For details about probe(), see comment in MacroAssemblerX86_64.h.
    354354    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
    355 #endif // USE(MASM_PROBE)
     355#endif // ENABLE(MASM_PROBE)
    356356
    357357private:
    … …  
    374374    }
    375375
    376 #if USE(MASM_PROBE)
     376#if ENABLE(MASM_PROBE)
    377377    inline TrustedImm32 trustedImm32FromPtr(void* ptr)
    378378    {
    … …  
    392392};
    393393
    394 #if USE(MASM_PROBE)
     394#if ENABLE(MASM_PROBE)
    395395
    396396extern "C" void ctiMasmProbeTrampoline();
    … …  
    411411    call(RegisterID::eax);
    412412}
    413 #endif // USE(MASM_PROBE)
     413#endif // ENABLE(MASM_PROBE)
    414414
    415415} // namespace JSC

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

    r174933 r176031  
    3131namespace JSC {
    3232
    33 #if USE(MASM_PROBE)
     33#if ENABLE(MASM_PROBE)
    3434
    3535void MacroAssemblerX86Common::ProbeContext::dumpCPURegisters(const char* indentation)
    … …  
    7777}
    7878
    79 #endif // USE(MASM_PROBE)
     79#endif // ENABLE(MASM_PROBE)
    8080
    8181#if CPU(X86) && !OS(MAC_OS_X)

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

    r168729 r176031  
    14701470    }
    14711471
    1472 #if USE(MASM_PROBE)
     1472#if ENABLE(MASM_PROBE)
    14731473    struct CPUState {
    14741474        #define DECLARE_REGISTER(_type, _regName) \
    … …  
    14911491        void dumpCPURegisters(const char* indentation);
    14921492    };
    1493 #endif // USE(MASM_PROBE)
     1493#endif // ENABLE(MASM_PROBE)
    14941494
    14951495protected:

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

    r174890 r176031  
    3131#include "MacroAssemblerX86Common.h"
    3232
    33 #if USE(MASM_PROBE)
     33#if ENABLE(MASM_PROBE)
    3434#include <wtf/StdLibExtras.h>
    3535#endif
    … …  
    841841    }
    842842
    843 #if USE(MASM_PROBE)
     843#if ENABLE(MASM_PROBE)
    844844    // This function emits code to preserve the CPUState (e.g. registers),
    845845    // call a user supplied probe function, and restore the CPUState before
    … …  
    859859
    860860    void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
    861 #endif // USE(MASM_PROBE)
     861#endif // ENABLE(MASM_PROBE)
    862862
    863863private:
    … …  
    883883    }
    884884
    885 #if USE(MASM_PROBE)
     885#if ENABLE(MASM_PROBE)
    886886    inline TrustedImm64 trustedImm64FromPtr(void* ptr)
    887887    {
    … …  
    901901};
    902902
    903 #if USE(MASM_PROBE)
     903#if ENABLE(MASM_PROBE)
    904904
    905905extern "C" void ctiMasmProbeTrampoline();
    … …  
    943943    call(RegisterID::eax);
    944944}
    945 #endif // USE(MASM_PROBE)
     945#endif // ENABLE(MASM_PROBE)
    946946
    947947} // namespace JSC

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

    r168461 r176031  
    3636#include <wtf/Vector.h>
    3737
    38 #if USE(MASM_PROBE)
     38#if ENABLE(MASM_PROBE)
    3939#include <xmmintrin.h>
    4040#endif
    … …  
    8989    } XMMRegisterID;
    9090
    91 #if USE(MASM_PROBE)
     91#if ENABLE(MASM_PROBE)
    9292    #define FOR_EACH_CPU_REGISTER(V) \
    9393        FOR_EACH_CPU_GPREGISTER(V) \
    … …  
    133133        V(void*, r15)
    134134#endif // CPU(X86_64)
    135 #endif // USE(MASM_PROBE)
     135#endif // ENABLE(MASM_PROBE)
    136136}
    137137

  • trunk/Source/JavaScriptCore/config.h

    r173949 r176031  
    6565#endif
    6666
    67 // Enable the following if you want to use the MacroAssembler::probe() facility
    68 // to do JIT debugging.
    69 #define WTF_USE_MASM_PROBE 0
    70 

  • trunk/Source/JavaScriptCore/jit/JITStubs.h

    r172665 r176031  
    4747#endif
    4848
    49 #if USE(MASM_PROBE)
     49#if ENABLE(MASM_PROBE)
    5050extern "C" void ctiMasmProbeTrampoline();
    5151#endif

  • trunk/Source/JavaScriptCore/jit/JITStubsARM.h

    r165676 r176031  
    4444#if COMPILER(GCC)
    4545
    46 #if USE(MASM_PROBE)
     46#if ENABLE(MASM_PROBE)
    4747// The following are offsets for MacroAssembler::ProbeContext fields accessed
    4848// by the ctiMasmProbeTrampoline stub.
    … …  
    144144#undef PROBE_OFFSETOF
    145145
    146 #endif // USE(MASM_PROBE)
    147 
    148 
    149 #if USE(MASM_PROBE)
     146#endif // ENABLE(MASM_PROBE)
     147
     148
     149#if ENABLE(MASM_PROBE)
    150150asm (
    151151".text" "\n"
    … …  
    292292    "pop       { pc }" "\n"
    293293);
    294 #endif // USE(MASM_PROBE)
     294#endif // ENABLE(MASM_PROBE)
    295295
    296296

  • trunk/Source/JavaScriptCore/jit/JITStubsARMv7.h

    r166732 r176031  
    4444#if COMPILER(GCC)
    4545
    46 #if USE(MASM_PROBE)
     46#if ENABLE(MASM_PROBE)
    4747// The following are offsets for MacroAssembler::ProbeContext fields accessed
    4848// by the ctiMasmProbeTrampoline stub.
    … …  
    343343    "pop       { pc }" "\n"
    344344);
    345 #endif // USE(MASM_PROBE)
     345#endif // ENABLE(MASM_PROBE)
    346346
    347347#endif // COMPILER(GCC)

  • trunk/Source/JavaScriptCore/jit/JITStubsX86.h

    r165676 r176031  
    4646#if COMPILER(GCC)
    4747
    48 #if USE(MASM_PROBE)
     48#if ENABLE(MASM_PROBE)
    4949asm (
    5050".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
    … …  
    197197    "ret" "\n"
    198198);
    199 #endif // USE(MASM_PROBE)
     199#endif // ENABLE(MASM_PROBE)
    200200
    201201#endif // COMPILER(GCC)

  • trunk/Source/JavaScriptCore/jit/JITStubsX86Common.h

    r157571 r176031  
    3737#if COMPILER(GCC)
    3838
    39 #if USE(MASM_PROBE)
     39#if ENABLE(MASM_PROBE)
    4040// The following are offsets for MacroAssembler::ProbeContext fields accessed
    4141// by the ctiMasmProbeTrampoline stub.
    … …  
    140140#undef PROBE_OFFSETOF
    141141
    142 #endif // USE(MASM_PROBE)
     142#endif // ENABLE(MASM_PROBE)
    143143
    144144#endif // COMPILER(GCC)

  • trunk/Source/JavaScriptCore/jit/JITStubsX86_64.h

    r165676 r176031  
    4646#if COMPILER(GCC)
    4747
    48 #if USE(MASM_PROBE)
     48#if ENABLE(MASM_PROBE)
    4949asm (
    5050".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
    … …  
    210210    "ret" "\n"
    211211);
    212 #endif // USE(MASM_PROBE)
     212#endif // ENABLE(MASM_PROBE)
    213213
    214214#endif // COMPILER(GCC)

  • trunk/Source/WTF/ChangeLog

    r175810 r176031  
     12014-11-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Rename USE(MASM_PROBE) to ENABLE(MASM_PROBE).
     4        <https://webkit.org/b/138661>
     5
     6        Reviewed by Michael Saboff.
     7
     8        Also move the switch for enabling the use of MASM_PROBE from JavaScriptCore's
     9        config.h to WTF's Platform.h.  This ensures that the setting is consistently
     10        applied even when building WebCore parts as well.
     11
     12        * wtf/Platform.h:
     13
    1142014-11-09  Antti Koivisto  <antti@apple.com>
    215

  • trunk/Source/WTF/wtf/Platform.h

    r175624 r176031  
    840840#endif
    841841
     842#if ENABLE(JIT)
     843/* Enable the following if you want to use the MacroAssembler::probe() facility
     844   to do JIT debugging. */
     845#define ENABLE_MASM_PROBE 0
     846#endif
     847
    842848/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
    843849   On non-Windows x86-64, iOS, and ARM64 we use a single fixed mmap, on other platforms we mmap on demand. */
Note: See TracChangeset for help on using the changeset viewer.