Changeset 170147 in webkit


Ignore:
Timestamp:
Jun 19, 2014 9:32:31 AM (10 years ago)
Author:
Dániel Bátyai
Message:

Remove ENABLE(LLINT) and ENABLE(LLINT_C_LOOP) guards
https://bugs.webkit.org/show_bug.cgi?id=130389

Reviewed by Mark Lam.

Removed ENABLE(LLINT) since we always build with it, and changed ENABLE(LLINT_C_LOOP)
into !ENABLE(JIT) since they are mutually exclusive.

.:

  • Source/cmake/OptionsEfl.cmake:
  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/WebKitFeatures.cmake:
  • Source/cmakeconfig.h.cmake:

Source/JavaScriptCore:

  • CMakeLists.txt:
  • assembler/MacroAssemblerCodeRef.h:

(JSC::MacroAssemblerCodePtr::createLLIntCodePtr):
(JSC::MacroAssemblerCodeRef::createLLIntCodeRef):

  • assembler/MaxFrameExtentForSlowPathCall.h:
  • bytecode/CallLinkStatus.cpp:

(JSC::CallLinkStatus::computeFromLLInt):

  • bytecode/CodeBlock.cpp:

(JSC::dumpStructure):
(JSC::CodeBlock::printGetByIdCacheStatus):
(JSC::CodeBlock::printCallOp):
(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::~CodeBlock):
(JSC::CodeBlock::propagateTransitions):
(JSC::CodeBlock::finalizeUnconditionally):
(JSC::CodeBlock::unlinkCalls):
(JSC::CodeBlock::unlinkIncomingCalls):
(JSC::CodeBlock::linkIncomingCall):
(JSC::CodeBlock::frameRegisterCount):

  • bytecode/CodeBlock.h:
  • bytecode/GetByIdStatus.cpp:

(JSC::GetByIdStatus::computeFromLLInt):

  • bytecode/Opcode.h:

(JSC::padOpcodeName):

  • bytecode/PutByIdStatus.cpp:

(JSC::PutByIdStatus::computeFromLLInt):

  • bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitCall):
(JSC::BytecodeGenerator::emitConstruct):

  • heap/Heap.cpp:

(JSC::Heap::gatherJSStackRoots):

  • interpreter/Interpreter.cpp:

(JSC::Interpreter::initialize):
(JSC::Interpreter::isOpcode):

  • interpreter/Interpreter.h:

(JSC::Interpreter::getOpcodeID):

  • interpreter/JSStack.cpp:

(JSC::JSStack::JSStack):
(JSC::JSStack::committedByteCount):

  • interpreter/JSStack.h:
  • interpreter/JSStackInlines.h:

(JSC::JSStack::ensureCapacityFor):
(JSC::JSStack::topOfFrameFor):
(JSC::JSStack::setStackLimit):

  • jit/ExecutableAllocatorFixedVMPool.cpp:

(JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):

  • jit/JIT.h:

(JSC::JIT::compileCTINativeCall):

  • jit/JITExceptions.h:
  • jit/JITThunks.cpp:

(JSC::JITThunks::ctiNativeCall):
(JSC::JITThunks::ctiNativeConstruct):

  • llint/LLIntCLoop.cpp:
  • llint/LLIntCLoop.h:
  • llint/LLIntData.cpp:

(JSC::LLInt::initialize):
(JSC::LLInt::Data::performAssertions):

  • llint/LLIntData.h:

(JSC::LLInt::Data::performAssertions): Deleted.

  • llint/LLIntEntrypoint.cpp:
  • llint/LLIntEntrypoint.h:
  • llint/LLIntExceptions.cpp:
  • llint/LLIntExceptions.h:
  • llint/LLIntOfflineAsmConfig.h:
  • llint/LLIntOffsetsExtractor.cpp:

(JSC::LLIntOffsetsExtractor::dummy):

  • llint/LLIntOpcode.h:
  • llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

  • llint/LLIntSlowPaths.h:
  • llint/LLIntThunks.cpp:
  • llint/LLIntThunks.h:
  • llint/LowLevelInterpreter.cpp:
  • llint/LowLevelInterpreter.h:
  • runtime/CommonSlowPaths.cpp:
  • runtime/CommonSlowPaths.h:
  • runtime/ErrorHandlingScope.cpp:

(JSC::ErrorHandlingScope::ErrorHandlingScope):
(JSC::ErrorHandlingScope::~ErrorHandlingScope):

  • runtime/Executable.cpp:

(JSC::setupLLInt):

  • runtime/InitializeThreading.cpp:

(JSC::initializeThreading):

  • runtime/JSCJSValue.h:
  • runtime/JSCJSValueInlines.h:
  • runtime/Options.cpp:

(JSC::recomputeDependentOptions):

  • runtime/VM.cpp:

(JSC::VM::VM):
(JSC::sanitizeStackForVM):

  • runtime/VM.h:

(JSC::VM::canUseJIT): Deleted.

Source/WTF:

  • wtf/OSAllocatorPosix.cpp:

(WTF::OSAllocator::reserveAndCommit):

  • wtf/Platform.h:
Location:
trunk
Files:
56 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r170052 r170147  
     12014-06-19  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
     2
     3        Remove ENABLE(LLINT) and ENABLE(LLINT_C_LOOP) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=130389
     5
     6        Reviewed by Mark Lam.
     7
     8        Removed ENABLE(LLINT) since we always build with it, and changed ENABLE(LLINT_C_LOOP)
     9        into !ENABLE(JIT) since they are mutually exclusive.
     10
     11        * Source/cmake/OptionsEfl.cmake:
     12        * Source/cmake/OptionsGTK.cmake:
     13        * Source/cmake/WebKitFeatures.cmake:
     14        * Source/cmakeconfig.h.cmake:
     15
    1162014-06-17  Zan Dobersek  <zdobersek@igalia.com>
    217
  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r169703 r170147  
    569569endif ()
    570570
    571 if (ENABLE_LLINT)
    572     # We cannot check for RUBY_FOUND because it is set only when the full package is installed and
    573     # the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
    574     # for finding the only Ruby interpreter.
    575     if (NOT RUBY_EXECUTABLE)
    576         message(FATAL_ERROR "The Ruby interpreter is needed to generate LLInt files.")
    577     endif ()
    578 
    579     set(LLINT_ASM
    580         llint/LowLevelInterpreter.asm
    581         llint/LowLevelInterpreter32_64.asm
    582         llint/LowLevelInterpreter64.asm
    583     )
    584 
    585     set(OFFLINE_ASM
    586         offlineasm/arm.rb
    587         offlineasm/ast.rb
    588         offlineasm/backends.rb
    589         offlineasm/cloop.rb
    590         offlineasm/config.rb
    591         offlineasm/instructions.rb
    592         offlineasm/offsets.rb
    593         offlineasm/opt.rb
    594         offlineasm/parser.rb
    595         offlineasm/registers.rb
    596         offlineasm/risc.rb
    597         offlineasm/self_hash.rb
    598         offlineasm/settings.rb
    599         offlineasm/transform.rb
    600         offlineasm/x86.rb
    601     )
    602 
    603     add_custom_command(
    604         OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
    605         MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/generate-bytecode-files
    606         DEPENDS ${JAVASCRIPTCORE_DIR}/generate-bytecode-files bytecode/BytecodeList.json
    607         COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/generate-bytecode-files --bytecodes_h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h --init_bytecodes_asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm ${JAVASCRIPTCORE_DIR}/bytecode/BytecodeList.json
    608         VERBATIM)
    609 
    610     add_custom_command(
    611         OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
    612         MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb
    613         DEPENDS ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
    614         COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
    615         VERBATIM)
    616 
    617     # We add the header files directly to the ADD_EXECUTABLE call instead of setting the
    618     # OBJECT_DEPENDS property in LLIntOffsetsExtractor.cpp because generate_offset_extractor.rb and
    619     # generate-bytecode-files may not regenerate the .h files in case the hash it calculates does not change.
    620     # In this case, if some of the dependencies specified in the ADD_CUSTOM_COMMANDs above have
    621     # changed the command will always be called because the mtime of the .h files will
    622     # always be older than that of their dependencies.
    623     # Additionally, setting the OBJECT_DEPENDS property will make the .h files a Makefile
    624     # dependency of both LLIntOffsetsExtractor and LLIntOffsetsExtractor.cpp, so the command will
    625     # actually be run multiple times!
    626     add_executable(LLIntOffsetsExtractor
    627         ${JAVASCRIPTCORE_DIR}/llint/LLIntOffsetsExtractor.cpp
    628         ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
    629     )
    630     target_link_libraries(LLIntOffsetsExtractor WTF)
    631 
    632     # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
    633     # LLIntAssembly.h's mtime. The problem we have here is: asm.rb has some built-in optimization
    634     # that generates a checksum of the LLIntOffsetsExtractor binary, if the checksum of the new
    635     # LLIntOffsetsExtractor matches, no output is generated. To make this target consistent and avoid
    636     # running this command for every build, we artificially update LLIntAssembly.h's mtime (using touch)
    637     # after every asm.rb run.
    638     add_custom_command(
    639         OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
    640         MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb
    641         DEPENDS LLIntOffsetsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
    642         COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
    643         COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
    644         VERBATIM)
    645 
    646     # The explanation for not making LLIntAssembly.h part of the OBJECT_DEPENDS property of some of
    647     # the .cpp files below is similar to the one in the previous comment. However, since these .cpp
    648     # files are used to build JavaScriptCore itself, we can just add LLIntAssembly.h to JSC_HEADERS
    649     # since it is used in the add_library() call at the end of this file.
    650     list(APPEND JavaScriptCore_HEADERS
    651         ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
    652     )
    653     list(APPEND JavaScriptCore_SOURCES
    654         llint/LLIntCLoop.cpp
    655         llint/LLIntData.cpp
    656         llint/LLIntEntrypoint.cpp
    657         llint/LLIntExceptions.cpp
    658         llint/LLIntSlowPaths.cpp
    659         llint/LLIntThunks.cpp
    660         llint/LowLevelInterpreter.cpp
    661     )
     571# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
     572# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
     573# for finding the only Ruby interpreter.
     574if (NOT RUBY_EXECUTABLE)
     575    message(FATAL_ERROR "The Ruby interpreter is needed to generate LLInt files.")
    662576endif ()
     577
     578set(LLINT_ASM
     579    llint/LowLevelInterpreter.asm
     580    llint/LowLevelInterpreter32_64.asm
     581    llint/LowLevelInterpreter64.asm
     582)
     583
     584set(OFFLINE_ASM
     585    offlineasm/arm.rb
     586    offlineasm/ast.rb
     587    offlineasm/backends.rb
     588    offlineasm/cloop.rb
     589    offlineasm/config.rb
     590    offlineasm/instructions.rb
     591    offlineasm/offsets.rb
     592    offlineasm/opt.rb
     593    offlineasm/parser.rb
     594    offlineasm/registers.rb
     595    offlineasm/risc.rb
     596    offlineasm/self_hash.rb
     597    offlineasm/settings.rb
     598    offlineasm/transform.rb
     599    offlineasm/x86.rb
     600)
     601
     602add_custom_command(
     603    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
     604    MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/generate-bytecode-files
     605    DEPENDS ${JAVASCRIPTCORE_DIR}/generate-bytecode-files bytecode/BytecodeList.json
     606    COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/generate-bytecode-files --bytecodes_h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h --init_bytecodes_asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm ${JAVASCRIPTCORE_DIR}/bytecode/BytecodeList.json
     607    VERBATIM)
     608
     609add_custom_command(
     610    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
     611    MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb
     612    DEPENDS ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
     613    COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
     614    VERBATIM)
     615
     616# We add the header files directly to the ADD_EXECUTABLE call instead of setting the
     617# OBJECT_DEPENDS property in LLIntOffsetsExtractor.cpp because generate_offset_extractor.rb and
     618# generate-bytecode-files may not regenerate the .h files in case the hash it calculates does not change.
     619# In this case, if some of the dependencies specified in the ADD_CUSTOM_COMMANDs above have
     620# changed the command will always be called because the mtime of the .h files will
     621# always be older than that of their dependencies.
     622# Additionally, setting the OBJECT_DEPENDS property will make the .h files a Makefile
     623# dependency of both LLIntOffsetsExtractor and LLIntOffsetsExtractor.cpp, so the command will
     624# actually be run multiple times!
     625add_executable(LLIntOffsetsExtractor
     626    ${JAVASCRIPTCORE_DIR}/llint/LLIntOffsetsExtractor.cpp
     627    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
     628)
     629target_link_libraries(LLIntOffsetsExtractor WTF)
     630
     631# The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
     632# LLIntAssembly.h's mtime. The problem we have here is: asm.rb has some built-in optimization
     633# that generates a checksum of the LLIntOffsetsExtractor binary, if the checksum of the new
     634# LLIntOffsetsExtractor matches, no output is generated. To make this target consistent and avoid
     635# running this command for every build, we artificially update LLIntAssembly.h's mtime (using touch)
     636# after every asm.rb run.
     637add_custom_command(
     638    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
     639    MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb
     640    DEPENDS LLIntOffsetsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
     641    COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
     642    COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
     643    VERBATIM)
     644
     645# The explanation for not making LLIntAssembly.h part of the OBJECT_DEPENDS property of some of
     646# the .cpp files below is similar to the one in the previous comment. However, since these .cpp
     647# files are used to build JavaScriptCore itself, we can just add LLIntAssembly.h to JSC_HEADERS
     648# since it is used in the add_library() call at the end of this file.
     649list(APPEND JavaScriptCore_HEADERS
     650    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
     651)
     652list(APPEND JavaScriptCore_SOURCES
     653    llint/LLIntCLoop.cpp
     654    llint/LLIntData.cpp
     655    llint/LLIntEntrypoint.cpp
     656    llint/LLIntExceptions.cpp
     657    llint/LLIntSlowPaths.cpp
     658    llint/LLIntThunks.cpp
     659    llint/LowLevelInterpreter.cpp
     660)
     661
    663662
    664663if (ENABLE_FTL_JIT)
     
    695694
    696695    list(APPEND JavaScriptCore_SOURCES
    697         llvm/InitializeLLVM.cpp
    698         llvm/InitializeLLVMPOSIX.cpp
    699         llvm/InitializeLLVMLinux.cpp
    700         llvm/LLVMAPI.cpp
    701 
    702696        dfg/DFGToFTLDeferredCompilationCallback.cpp
    703697        dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
     
    712706        ftl/FTLCommonValues.cpp
    713707        ftl/FTLCompile.cpp
    714         ftl/FTLDataSection.cpp
    715708        ftl/FTLDWARFDebugLineInfo.cpp
    716709        ftl/FTLDWARFRegister.cpp
     710        ftl/FTLDataSection.cpp
    717711        ftl/FTLExitArgument.cpp
    718712        ftl/FTLExitArgumentForOperand.cpp
     
    744738        ftl/FTLValueFormat.cpp
    745739        ftl/FTLValueRange.cpp
     740
     741        llvm/InitializeLLVM.cpp
     742        llvm/InitializeLLVMLinux.cpp
     743        llvm/InitializeLLVMPOSIX.cpp
     744        llvm/LLVMAPI.cpp
    746745    )
    747746endif ()
  • trunk/Source/JavaScriptCore/ChangeLog

    r170130 r170147  
     12014-06-19  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
     2
     3        Remove ENABLE(LLINT) and ENABLE(LLINT_C_LOOP) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=130389
     5
     6        Reviewed by Mark Lam.
     7
     8        Removed ENABLE(LLINT) since we always build with it, and changed ENABLE(LLINT_C_LOOP)
     9        into !ENABLE(JIT) since they are mutually exclusive.
     10
     11        * CMakeLists.txt:
     12        * assembler/MacroAssemblerCodeRef.h:
     13        (JSC::MacroAssemblerCodePtr::createLLIntCodePtr):
     14        (JSC::MacroAssemblerCodeRef::createLLIntCodeRef):
     15        * assembler/MaxFrameExtentForSlowPathCall.h:
     16        * bytecode/CallLinkStatus.cpp:
     17        (JSC::CallLinkStatus::computeFromLLInt):
     18        * bytecode/CodeBlock.cpp:
     19        (JSC::dumpStructure):
     20        (JSC::CodeBlock::printGetByIdCacheStatus):
     21        (JSC::CodeBlock::printCallOp):
     22        (JSC::CodeBlock::CodeBlock):
     23        (JSC::CodeBlock::~CodeBlock):
     24        (JSC::CodeBlock::propagateTransitions):
     25        (JSC::CodeBlock::finalizeUnconditionally):
     26        (JSC::CodeBlock::unlinkCalls):
     27        (JSC::CodeBlock::unlinkIncomingCalls):
     28        (JSC::CodeBlock::linkIncomingCall):
     29        (JSC::CodeBlock::frameRegisterCount):
     30        * bytecode/CodeBlock.h:
     31        * bytecode/GetByIdStatus.cpp:
     32        (JSC::GetByIdStatus::computeFromLLInt):
     33        * bytecode/Opcode.h:
     34        (JSC::padOpcodeName):
     35        * bytecode/PutByIdStatus.cpp:
     36        (JSC::PutByIdStatus::computeFromLLInt):
     37        * bytecompiler/BytecodeGenerator.cpp:
     38        (JSC::BytecodeGenerator::emitCall):
     39        (JSC::BytecodeGenerator::emitConstruct):
     40        * heap/Heap.cpp:
     41        (JSC::Heap::gatherJSStackRoots):
     42        * interpreter/Interpreter.cpp:
     43        (JSC::Interpreter::initialize):
     44        (JSC::Interpreter::isOpcode):
     45        * interpreter/Interpreter.h:
     46        (JSC::Interpreter::getOpcodeID):
     47        * interpreter/JSStack.cpp:
     48        (JSC::JSStack::JSStack):
     49        (JSC::JSStack::committedByteCount):
     50        * interpreter/JSStack.h:
     51        * interpreter/JSStackInlines.h:
     52        (JSC::JSStack::ensureCapacityFor):
     53        (JSC::JSStack::topOfFrameFor):
     54        (JSC::JSStack::setStackLimit):
     55        * jit/ExecutableAllocatorFixedVMPool.cpp:
     56        (JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
     57        * jit/JIT.h:
     58        (JSC::JIT::compileCTINativeCall):
     59        * jit/JITExceptions.h:
     60        * jit/JITThunks.cpp:
     61        (JSC::JITThunks::ctiNativeCall):
     62        (JSC::JITThunks::ctiNativeConstruct):
     63        * llint/LLIntCLoop.cpp:
     64        * llint/LLIntCLoop.h:
     65        * llint/LLIntData.cpp:
     66        (JSC::LLInt::initialize):
     67        (JSC::LLInt::Data::performAssertions):
     68        * llint/LLIntData.h:
     69        (JSC::LLInt::Data::performAssertions): Deleted.
     70        * llint/LLIntEntrypoint.cpp:
     71        * llint/LLIntEntrypoint.h:
     72        * llint/LLIntExceptions.cpp:
     73        * llint/LLIntExceptions.h:
     74        * llint/LLIntOfflineAsmConfig.h:
     75        * llint/LLIntOffsetsExtractor.cpp:
     76        (JSC::LLIntOffsetsExtractor::dummy):
     77        * llint/LLIntOpcode.h:
     78        * llint/LLIntSlowPaths.cpp:
     79        (JSC::LLInt::LLINT_SLOW_PATH_DECL):
     80        * llint/LLIntSlowPaths.h:
     81        * llint/LLIntThunks.cpp:
     82        * llint/LLIntThunks.h:
     83        * llint/LowLevelInterpreter.cpp:
     84        * llint/LowLevelInterpreter.h:
     85        * runtime/CommonSlowPaths.cpp:
     86        * runtime/CommonSlowPaths.h:
     87        * runtime/ErrorHandlingScope.cpp:
     88        (JSC::ErrorHandlingScope::ErrorHandlingScope):
     89        (JSC::ErrorHandlingScope::~ErrorHandlingScope):
     90        * runtime/Executable.cpp:
     91        (JSC::setupLLInt):
     92        * runtime/InitializeThreading.cpp:
     93        (JSC::initializeThreading):
     94        * runtime/JSCJSValue.h:
     95        * runtime/JSCJSValueInlines.h:
     96        * runtime/Options.cpp:
     97        (JSC::recomputeDependentOptions):
     98        * runtime/VM.cpp:
     99        (JSC::VM::VM):
     100        (JSC::sanitizeStackForVM):
     101        * runtime/VM.h:
     102        (JSC::VM::canUseJIT): Deleted.
     103
    11042014-06-18  Alex Christensen  <achristensen@webkit.org>
    2105
  • trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

    r167094 r170147  
    3737// ASSERT_VALID_CODE_POINTER checks that ptr is a non-null pointer, and that it is a valid
    3838// instruction address on the platform (for example, check any alignment requirements).
    39 #if CPU(ARM_THUMB2) && !ENABLE(LLINT_C_LOOP)
     39#if CPU(ARM_THUMB2) && ENABLE(JIT)
    4040// ARM instructions must be 16-bit aligned. Thumb2 code pointers to be loaded into
    4141// into the processor are decorated with the bottom bit set, while traditional ARM has
     
    294294    }
    295295
    296 #if ENABLE(LLINT)
    297296    static MacroAssemblerCodePtr createLLIntCodePtr(OpcodeID codeId)
    298297    {
    299298        return createFromExecutableAddress(LLInt::getCodePtr(codeId));
    300299    }
    301 #endif
    302300
    303301    explicit MacroAssemblerCodePtr(ReturnAddressPtr ra)
     
    411409    }
    412410   
    413 #if ENABLE(LLINT)
    414411    // Helper for creating self-managed code refs from LLInt.
    415412    static MacroAssemblerCodeRef createLLIntCodeRef(OpcodeID codeId)
     
    417414        return createSelfManagedCodeRef(MacroAssemblerCodePtr::createFromExecutableAddress(LLInt::getCodePtr(codeId)));
    418415    }
    419 #endif
    420416
    421417    ExecutableMemoryHandle* executableMemory() const
  • trunk/Source/JavaScriptCore/assembler/MaxFrameExtentForSlowPathCall.h

    r163027 r170147  
    3838// from JS code.
    3939
    40 #if ENABLE(LLINT_C_LOOP)
     40#if !ENABLE(JIT)
    4141static const size_t maxFrameExtentForSlowPathCall = 0;
    4242
     
    7676COMPILE_ASSERT(!(maxFrameExtentForSlowPathCall % sizeof(Register)), extent_must_be_in_multiples_of_registers);
    7777
    78 #if !ENABLE(LLINT_C_LOOP)
     78#if ENABLE(JIT)
    7979// Make sure that cfr - maxFrameExtentForSlowPathCall bytes will make the stack pointer aligned
    8080COMPILE_ASSERT((maxFrameExtentForSlowPathCall % 16) == 16 - sizeof(CallerFrameAndPC), extent_must_align_stack_from_callframe_pointer);
  • trunk/Source/JavaScriptCore/bytecode/CallLinkStatus.cpp

    r168101 r170147  
    9090    UNUSED_PARAM(profiledBlock);
    9191    UNUSED_PARAM(bytecodeIndex);
    92 #if ENABLE(LLINT)
    9392#if ENABLE(DFG_JIT)
    9493    if (profiledBlock->hasExitSite(locker, DFG::FrequentExitSite(bytecodeIndex, BadFunction))) {
     
    111110   
    112111    return CallLinkStatus(callLinkInfo->lastSeenCallee.get());
    113 #else
    114     return CallLinkStatus();
    115 #endif
    116112}
    117113
  • trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

    r168497 r170147  
    284284}
    285285
    286 #if ENABLE(JIT) || ENABLE(LLINT) // unused in some configurations
    287286static void dumpStructure(PrintStream& out, const char* name, ExecState* exec, Structure* structure, const Identifier& ident)
    288287{
     
    296295        out.printf(" (offset = %d)", offset);
    297296}
    298 #endif
    299297
    300298#if ENABLE(JIT) // unused when not ENABLE(JIT), leading to silly warnings
     
    324322    UNUSED_PARAM(ident); // tell the compiler to shut up in certain platform configurations.
    325323   
    326 #if ENABLE(LLINT)
    327324    if (exec->interpreter()->getOpcodeID(instruction[0].u.opcode) == op_get_array_length)
    328325        out.printf(" llint(array_length)");
     
    332329        out.printf(")");
    333330    }
    334 #endif
    335331
    336332#if ENABLE(JIT)
     
    417413    out.printf("%s, %s, %d, %d", registerName(dst).data(), registerName(func).data(), argCount, registerOffset);
    418414    if (cacheDumpMode == DumpCaches) {
    419 #if ENABLE(LLINT)
    420415        LLIntCallLinkInfo* callLinkInfo = it[1].u.callLinkInfo;
    421416        if (callLinkInfo->lastSeenCallee) {
     
    425420                callLinkInfo->lastSeenCallee->executable());
    426421        }
    427 #endif
    428422#if ENABLE(JIT)
    429423        if (CallLinkInfo* info = map.get(CodeOrigin(location))) {
     
    15841578                m_rareData->m_exceptionHandlers[i].target = handler.target;
    15851579                m_rareData->m_exceptionHandlers[i].scopeDepth = nonLocalScopeDepth + handler.scopeDepth;
    1586 #if ENABLE(JIT) && ENABLE(LLINT)
     1580#if ENABLE(JIT)
    15871581                m_rareData->m_exceptionHandlers[i].nativeCode = CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(LLInt::getCodePtr(op_catch)));
    15881582#endif
     
    16151609
    16161610    // Allocate metadata buffers for the bytecode
    1617 #if ENABLE(LLINT)
    16181611    if (size_t size = unlinkedCodeBlock->numberOfLLintCallLinkInfos())
    16191612        m_llintCallLinkInfos.resizeToFit(size);
    1620 #endif
    16211613    if (size_t size = unlinkedCodeBlock->numberOfArrayProfiles())
    16221614        m_arrayProfiles.grow(size);
     
    17021694            m_arrayProfiles[arrayProfileIndex] = ArrayProfile(i);
    17031695            instructions[i + opLength - 2] = &m_arrayProfiles[arrayProfileIndex];
    1704 #if ENABLE(LLINT)
    17051696            instructions[i + 5] = &m_llintCallLinkInfos[pc[5].u.operand];
    1706 #endif
    17071697            break;
    17081698        }
    17091699        case op_construct: {
    1710 #if ENABLE(LLINT)
    17111700            instructions[i + 5] = &m_llintCallLinkInfos[pc[5].u.operand];
    1712 #endif
    17131701            ValueProfile* profile = &m_valueProfiles[pc[opLength - 1].u.operand];
    17141702            ASSERT(profile->m_bytecodeOffset == -1);
     
    18381826    dumpValueProfiles();
    18391827#endif
    1840 
    1841 #if ENABLE(LLINT)   
    18421828    while (m_incomingLLIntCalls.begin() != m_incomingLLIntCalls.end())
    18431829        m_incomingLLIntCalls.begin()->remove();
    1844 #endif // ENABLE(LLINT)
    18451830#if ENABLE(JIT)
    18461831    // We may be destroyed before any CodeBlocks that refer to us are destroyed.
     
    20252010    bool allAreMarkedSoFar = true;
    20262011       
    2027 #if ENABLE(LLINT)
    20282012    Interpreter* interpreter = m_vm->interpreter;
    20292013    if (jitType() == JITCode::InterpreterThunk) {
     
    20472031        }
    20482032    }
    2049 #endif // ENABLE(LLINT)
    20502033
    20512034#if ENABLE(JIT)
     
    22442227        }
    22452228
    2246 #if ENABLE(LLINT)
    22472229        for (unsigned i = 0; i < m_llintCallLinkInfos.size(); ++i) {
    22482230            if (m_llintCallLinkInfos[i].isLinked() && !Heap::isMarked(m_llintCallLinkInfos[i].callee.get())) {
     
    22542236                m_llintCallLinkInfos[i].lastSeenCallee.clear();
    22552237        }
    2256 #endif // ENABLE(LLINT)
    22572238    }
    22582239
     
    26502631    if (!!m_alternative)
    26512632        m_alternative->unlinkCalls();
    2652 #if ENABLE(LLINT)
    26532633    for (size_t i = 0; i < m_llintCallLinkInfos.size(); ++i) {
    26542634        if (m_llintCallLinkInfos[i].isLinked())
    26552635            m_llintCallLinkInfos[i].unlink();
    26562636    }
    2657 #endif
    26582637    if (m_callLinkInfos.isEmpty())
    26592638        return;
     
    26782657void CodeBlock::unlinkIncomingCalls()
    26792658{
    2680 #if ENABLE(LLINT)
    26812659    while (m_incomingLLIntCalls.begin() != m_incomingLLIntCalls.end())
    26822660        m_incomingLLIntCalls.begin()->unlink();
    2683 #endif // ENABLE(LLINT)
    26842661#if ENABLE(JIT)
    26852662    if (m_incomingCalls.isEmpty())
     
    26912668}
    26922669
    2693 #if ENABLE(LLINT)
    26942670void CodeBlock::linkIncomingCall(ExecState* callerFrame, LLIntCallLinkInfo* incoming)
    26952671{
     
    26972673    m_incomingLLIntCalls.push(incoming);
    26982674}
    2699 #endif // ENABLE(LLINT)
    27002675
    27012676void CodeBlock::clearEvalCache()
     
    33723347{
    33733348    switch (jitType()) {
    3374 #if ENABLE(LLINT)
    33753349    case JITCode::InterpreterThunk:
    33763350        return LLInt::frameRegisterCountFor(this);
    3377 #endif // ENABLE(LLINT)
    33783351
    33793352#if ENABLE(JIT)
  • trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

    r168178 r170147  
    233233#endif // ENABLE(JIT)
    234234
    235 #if ENABLE(LLINT)
    236235    void linkIncomingCall(ExecState* callerFrame, LLIntCallLinkInfo*);
    237 #endif // ENABLE(LLINT)
    238236
    239237    void setJITCodeMap(PassOwnPtr<CompactJITCodeMap> jitCodeMap)
     
    10411039    unsigned m_codeType;
    10421040
    1043 #if ENABLE(LLINT)
    10441041    Vector<LLIntCallLinkInfo> m_llintCallLinkInfos;
    10451042    SentinelLinkedList<LLIntCallLinkInfo, BasicRawSentinelNode<LLIntCallLinkInfo>> m_incomingLLIntCalls;
    1046 #endif
    10471043    RefPtr<JITCode> m_jitCode;
    10481044#if ENABLE(JIT)
  • trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp

    r168548 r170147  
    6262    UNUSED_PARAM(bytecodeIndex);
    6363    UNUSED_PARAM(uid);
    64 #if ENABLE(LLINT)
    6564    Instruction* instruction = profiledBlock->instructions().begin() + bytecodeIndex;
    6665   
     
    8584   
    8685    return GetByIdStatus(Simple, false, GetByIdVariant(StructureSet(structure), offset, specificValue));
    87 #else
    88     return GetByIdStatus(NoInformation, false);
    89 #endif
    9086}
    9187
  • trunk/Source/JavaScriptCore/bytecode/Opcode.h

    r167094 r170147  
    6060
    6161const int maxOpcodeLength = 9;
    62 #if ENABLE(LLINT_C_LOOP)
     62#if !ENABLE(JIT)
    6363const int numOpcodeIDs = NUMBER_OF_BYTECODE_IDS + NUMBER_OF_CLOOP_BYTECODE_HELPER_IDS + NUMBER_OF_BYTECODE_HELPER_IDS;
    6464#else
  • trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp

    r167094 r170147  
    6464    UNUSED_PARAM(bytecodeIndex);
    6565    UNUSED_PARAM(uid);
    66 #if ENABLE(LLINT)
    6766    Instruction* instruction = profiledBlock->instructions().begin() + bytecodeIndex;
    6867
     
    10099        chain ? adoptRef(new IntendedStructureChain(profiledBlock, structure, chain)) : 0,
    101100        offset);
    102 #else
    103     return PutByIdStatus(NoInformation);
    104 #endif
    105101}
    106102
  • trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

    r166392 r170147  
    17671767    instructions().append(callArguments.argumentCountIncludingThis());
    17681768    instructions().append(callArguments.stackOffset());
    1769 #if ENABLE(LLINT)
    17701769    instructions().append(m_codeBlock->addLLIntCallLinkInfo());
    1771 #else
    1772     instructions().append(0);
    1773 #endif
    17741770    instructions().append(0);
    17751771    instructions().append(arrayProfile);
     
    19061902    instructions().append(callArguments.argumentCountIncludingThis());
    19071903    instructions().append(callArguments.stackOffset());
    1908 #if ENABLE(LLINT)
    19091904    instructions().append(m_codeBlock->addLLIntCallLinkInfo());
    1910 #else
    1911     instructions().append(0);
    1912 #endif
    19131905    instructions().append(0);
    19141906    instructions().append(0);
  • trunk/Source/JavaScriptCore/heap/Heap.cpp

    r168497 r170147  
    568568void Heap::gatherJSStackRoots(ConservativeRoots& roots)
    569569{
    570 #if ENABLE(LLINT_C_LOOP)
     570#if !ENABLE(JIT)
    571571    GCPHASE(GatherJSStackRoots);
    572572    stack().gatherConservativeRoots(roots, m_jitStubRoutines, m_codeBlocks);
  • trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

    r169221 r170147  
    8585#endif
    8686
    87 #define WTF_USE_GCC_COMPUTED_GOTO_WORKAROUND (ENABLE(LLINT) && !defined(__llvm__))
     87#define WTF_USE_GCC_COMPUTED_GOTO_WORKAROUND (!defined(__llvm__))
    8888
    8989using namespace std;
     
    300300    UNUSED_PARAM(canUseJIT);
    301301
    302 #if ENABLE(COMPUTED_GOTO_OPCODES) && ENABLE(LLINT)
     302#if ENABLE(COMPUTED_GOTO_OPCODES)
    303303    m_opcodeTable = LLInt::opcodeMap();
    304304    for (int i = 0; i < numOpcodeIDs; ++i)
     
    429429{
    430430#if ENABLE(COMPUTED_GOTO_OPCODES)
    431 #if !ENABLE(LLINT)
    432     return static_cast<OpcodeID>(bitwise_cast<uintptr_t>(opcode)) <= op_end;
    433 #else
    434431    return opcode != HashTraits<Opcode>::emptyValue()
    435432        && !HashTraits<Opcode>::isDeletedValue(opcode)
    436433        && m_opcodeIDTable.contains(opcode);
    437 #endif
    438434#else
    439435    return opcode >= 0 && opcode <= op_end;
  • trunk/Source/JavaScriptCore/interpreter/Interpreter.h

    r165676 r170147  
    220220        {
    221221            ASSERT(m_initialized);
    222 #if ENABLE(COMPUTED_GOTO_OPCODES) && ENABLE(LLINT)
     222#if ENABLE(COMPUTED_GOTO_OPCODES)
    223223            ASSERT(isOpcode(opcode));
    224224            return m_opcodeIDTable.get(opcode);
     
    275275        int m_errorHandlingModeReentry;
    276276       
    277 #if ENABLE(COMPUTED_GOTO_OPCODES) && ENABLE(LLINT)
     277#if ENABLE(COMPUTED_GOTO_OPCODES)
    278278        Opcode* m_opcodeTable; // Maps OpcodeID => Opcode for compiling
    279279        HashMap<Opcode, OpcodeID> m_opcodeIDTable; // Maps Opcode => OpcodeID for decompiling
  • trunk/Source/JavaScriptCore/interpreter/JSStack.cpp

    r165676 r170147  
    3737namespace JSC {
    3838
    39 #if ENABLE(LLINT_C_LOOP)
     39#if !ENABLE(JIT)
    4040static size_t committedBytesCount = 0;
    4141
     
    4545    return staticMutex;
    4646}   
    47 #endif // ENABLE(LLINT_C_LOOP)
     47#endif // !ENABLE(JIT)
    4848
    4949JSStack::JSStack(VM& vm)
    5050    : m_vm(vm)
    5151    , m_topCallFrame(vm.topCallFrame)
    52 #if ENABLE(LLINT_C_LOOP)
     52#if !ENABLE(JIT)
    5353    , m_end(0)
    5454    , m_reservedZoneSizeInRegisters(0)
    5555#endif
    5656{
    57 #if ENABLE(LLINT_C_LOOP)
     57#if !ENABLE(JIT)
    5858    size_t capacity = Options::maxPerThreadStackUsage();
    5959    ASSERT(capacity && isPageAligned(capacity));
     
    6464   
    6565    m_lastStackTop = baseOfStack();
    66 #endif // ENABLE(LLINT_C_LOOP)
     66#endif // !ENABLE(JIT)
    6767
    6868    m_topCallFrame = 0;
    6969}
    7070
    71 #if ENABLE(LLINT_C_LOOP)
     71#if !ENABLE(JIT)
    7272JSStack::~JSStack()
    7373{
     
    159159        growSlowCase(m_end + 1);
    160160}
    161 #endif // ENABLE(LLINT_C_LOOP)
     161#endif // !ENABLE(JIT)
    162162
    163 #if !ENABLE(LLINT_C_LOOP)
     163#if ENABLE(JIT)
    164164Register* JSStack::lowAddress() const
    165165{
     
    173173    return reinterpret_cast<Register*>(wtfThreadData().stack().origin());
    174174}
    175 #endif // !ENABLE(LLINT_C_LOOP)
     175#endif // ENABLE(JIT)
    176176
    177177size_t JSStack::committedByteCount()
    178178{
    179 #if ENABLE(LLINT_C_LOOP)
     179#if !ENABLE(JIT)
    180180    MutexLocker locker(stackStatisticsMutex());
    181181    return committedBytesCount;
  • trunk/Source/JavaScriptCore/interpreter/JSStack.h

    r165676 r170147  
    8080        static size_t committedByteCount();
    8181
    82 #if !ENABLE(LLINT_C_LOOP)
     82#if ENABLE(JIT)
    8383        void gatherConservativeRoots(ConservativeRoots&) { }
    8484        void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&) { }
     
    104104
    105105        inline Register* topOfStack();
    106 #endif // ENABLE(LLINT_C_LOOP)
     106#endif // ENABLE(JIT)
    107107
    108108    private:
    109109
    110 #if ENABLE(LLINT_C_LOOP)
     110#if !ENABLE(JIT)
    111111        Register* lowAddress() const
    112112        {
     
    121121        Register* lowAddress() const;
    122122        Register* highAddress() const;
    123 #endif // ENABLE(LLINT_C_LOOP)
     123#endif // !ENABLE(JIT)
    124124
    125 #if ENABLE(LLINT_C_LOOP)
     125#if !ENABLE(JIT)
    126126        inline Register* topOfFrameFor(CallFrame*);
    127127
     
    139139
    140140        void setStackLimit(Register* newTopOfStack);
    141 #endif // ENABLE(LLINT_C_LOOP)
     141#endif // !ENABLE(JIT)
    142142
    143143        VM& m_vm;
    144144        CallFrame*& m_topCallFrame;
    145 #if ENABLE(LLINT_C_LOOP)
     145#if !ENABLE(JIT)
    146146        Register* m_end;
    147147        Register* m_commitTop;
     
    149149        Register* m_lastStackTop;
    150150        ptrdiff_t m_reservedZoneSizeInRegisters;
    151 #endif // ENABLE(LLINT_C_LOOP)
     151#endif // !ENABLE(JIT)
    152152
    153153        friend class LLIntOffsetsExtractor;
  • trunk/Source/JavaScriptCore/interpreter/JSStackInlines.h

    r163027 r170147  
    3636inline bool JSStack::ensureCapacityFor(Register* newTopOfStack)
    3737{
    38 #if ENABLE(LLINT_C_LOOP)
     38#if !ENABLE(JIT)
    3939    return grow(newTopOfStack);
    4040#else
     
    4444}
    4545
    46 #if ENABLE(LLINT_C_LOOP)
     46#if !ENABLE(JIT)
    4747
    4848inline Register* JSStack::topOfFrameFor(CallFrame* frame)
    4949{
    50 #if ENABLE(LLINT_C_LOOP)
    5150    if (UNLIKELY(!frame))
    5251        return baseOfStack();
    53 #endif
    5452    return frame->topOfFrame() - 1;
    5553}
     
    8785    Register* newEnd = newTopOfStack - 1;
    8886    m_end = newEnd;
    89 #if ENABLE(LLINT_C_LOOP)
    9087    m_vm.setJSStackLimit(newTopOfStack);
    91 #endif
    9288}
    9389
    94 #endif // ENABLE(LLINT_C_LOOP)
     90#endif // !ENABLE(JIT)
    9591
    9692} // namespace JSC
  • trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp

    r164358 r170147  
    6464    {
    6565        m_reservation = PageReservation::reserveWithGuardPages(fixedExecutableMemoryPoolSize, OSAllocator::JSJITCodePages, EXECUTABLE_POOL_WRITABLE, true);
    66 #if !ENABLE(LLINT)
    67         RELEASE_ASSERT(m_reservation);
    68 #endif
    6966        if (m_reservation) {
    7067            ASSERT(m_reservation.size() == fixedExecutableMemoryPoolSize);
  • trunk/Source/JavaScriptCore/jit/JIT.h

    r168776 r170147  
    231231        {
    232232            if (!vm->canUseJIT()) {
    233 #if ENABLE(LLINT)
    234233                return CodeRef::createLLIntCodeRef(llint_native_call_trampoline);
    235 #else
    236                 return CodeRef();
    237 #endif
    238234            }
    239235            JIT jit(vm, 0);
  • trunk/Source/JavaScriptCore/jit/JITExceptions.h

    r157636 r170147  
    2929#include "JSCJSValue.h"
    3030
    31 #if ENABLE(JIT) || ENABLE(LLINT)
    32 
    3331namespace JSC {
    3432
     
    4038} // namespace JSC
    4139
    42 #endif // ENABLE(JIT) || ENABLE(LLINT)
    43 
    4440#endif // JITExceptions_h
    4541
  • trunk/Source/JavaScriptCore/jit/JITThunks.cpp

    r163844 r170147  
    4747MacroAssemblerCodePtr JITThunks::ctiNativeCall(VM* vm)
    4848{
    49 #if ENABLE(LLINT)
    5049    if (!vm->canUseJIT())
    5150        return MacroAssemblerCodePtr::createLLIntCodePtr(llint_native_call_trampoline);
    52 #endif
    5351    return ctiStub(vm, nativeCallGenerator).code();
    5452}
     
    5654MacroAssemblerCodePtr JITThunks::ctiNativeConstruct(VM* vm)
    5755{
    58 #if ENABLE(LLINT)
    5956    if (!vm->canUseJIT())
    6057        return MacroAssemblerCodePtr::createLLIntCodePtr(llint_native_construct_trampoline);
    61 #endif
    6258    return ctiStub(vm, nativeConstructGenerator).code();
    6359}
  • trunk/Source/JavaScriptCore/llint/LLIntCLoop.cpp

    r167094 r170147  
    2727#include "LLIntCLoop.h"
    2828
    29 #if ENABLE(LLINT_C_LOOP)
     29#if !ENABLE(JIT)
    3030
    3131#include "LLIntData.h"
     
    4242} // namespace JSC
    4343
    44 #endif // ENABLE(LLINT_C_LOOP)
     44#endif // !ENABLE(JIT)
  • trunk/Source/JavaScriptCore/llint/LLIntCLoop.h

    r164814 r170147  
    2727#define LLIntCLoop_h
    2828
    29 #if ENABLE(LLINT_C_LOOP)
     29#if !ENABLE(JIT)
    3030
    3131#include "CallFrame.h"
     
    4747using JSC::LLInt::CLoop;
    4848
    49 #endif // ENABLE(LLINT_C_LOOP)
     49#endif // !ENABLE(JIT)
    5050
    5151#endif // LLIntCLoop_h
  • trunk/Source/JavaScriptCore/llint/LLIntData.cpp

    r169703 r170147  
    2626#include "config.h"
    2727#include "LLIntData.h"
    28 
    29 #if ENABLE(LLINT)
    30 
    3128#include "BytecodeConventions.h"
    3229#include "CodeType.h"
     
    4340Opcode Data::s_opcodeMap[numOpcodeIDs] = { };
    4441
    45 #if !ENABLE(LLINT_C_LOOP)
     42#if ENABLE(JIT)
    4643extern "C" void llint_entry(void*);
    4744#endif
     
    5148    Data::s_exceptionInstructions = new Instruction[maxOpcodeLength + 1];
    5249
    53 #if ENABLE(LLINT_C_LOOP)
     50#if !ENABLE(JIT)
    5451    CLoop::initialize();
    5552
    56 #else // !ENABLE(LLINT_C_LOOP)
     53#else // ENABLE(JIT)
    5754    llint_entry(&Data::s_opcodeMap);
    5855
     
    6057        Data::s_exceptionInstructions[i].u.pointer =
    6158            LLInt::getCodePtr(llint_throw_from_slow_path_trampoline);
    62 #endif // !ENABLE(LLINT_C_LOOP)
     59#endif // ENABLE(JIT)
    6360}
    6461
     
    127124    ASSERT(ValueNull == TagBitTypeOther);
    128125#endif
    129 #if CPU(X86_64) || CPU(ARM64) || ENABLE(LLINT_C_LOOP)
     126#if CPU(X86_64) || CPU(ARM64) || !ENABLE(JIT)
    130127    ASSERT(!maxFrameExtentForSlowPathCall);
    131128#elif CPU(ARM) || CPU(SH4)
     
    172169
    173170} } // namespace JSC::LLInt
    174 
    175 #endif // ENABLE(LLINT)
  • trunk/Source/JavaScriptCore/llint/LLIntData.h

    r167094 r170147  
    3535struct Instruction;
    3636
    37 #if ENABLE(LLINT_C_LOOP)
     37#if !ENABLE(JIT)
    3838typedef OpcodeID LLIntCode;
    3939#else
     
    4242
    4343namespace LLInt {
    44 
    45 #if ENABLE(LLINT)
    4644
    4745class Data {
     
    9492#endif
    9593
    96 #else // !ENABLE(LLINT)
    97 
    98 #if COMPILER(CLANG)
    99 #pragma clang diagnostic push
    100 #pragma clang diagnostic ignored "-Wmissing-noreturn"
    101 #endif
    102 
    103 class Data {
    104 public:
    105     static void performAssertions(VM&) { }
    106 };
    107 
    108 #if COMPILER(CLANG)
    109 #pragma clang diagnostic pop
    110 #endif
    111 
    112 #endif // !ENABLE(LLINT)
    113 
    11494ALWAYS_INLINE void* getCodePtr(JSC::EncodedJSValue glueHelper())
    11595{
  • trunk/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp

    r166278 r170147  
    2626#include "config.h"
    2727#include "LLIntEntrypoint.h"
    28 
    29 #if ENABLE(LLINT)
    30 
    3128#include "CodeBlock.h"
    3229#include "HeapInlines.h"
     
    125122
    126123} } // namespace JSC::LLInt
    127 
    128 #endif // ENABLE(LLINT)
  • trunk/Source/JavaScriptCore/llint/LLIntEntrypoint.h

    r164424 r170147  
    2727#define LLIntEntrypoint_h
    2828
    29 #if ENABLE(LLINT)
    30 
    3129#include "CodeSpecializationKind.h"
    3230
     
    4442} } // namespace JSC::LLInt
    4543
    46 #endif // ENABLE(LLINT)
    47 
    4844#endif // LLIntEntrypoint_h
  • trunk/Source/JavaScriptCore/llint/LLIntExceptions.cpp

    r163844 r170147  
    2626#include "config.h"
    2727#include "LLIntExceptions.h"
    28 
    29 #if ENABLE(LLINT)
    30 
    3128#include "CallFrame.h"
    3229#include "CodeBlock.h"
     
    6562
    6663} } // namespace JSC::LLInt
    67 
    68 #endif // ENABLE(LLINT)
  • trunk/Source/JavaScriptCore/llint/LLIntExceptions.h

    r164424 r170147  
    2828
    2929#include <wtf/StdLibExtras.h>
    30 
    31 #if ENABLE(LLINT)
    32 
    3330#include "MacroAssemblerCodeRef.h"
    3431
     
    5451} } // namespace JSC::LLInt
    5552
    56 #endif // ENABLE(LLINT)
    57 
    5853#endif // LLIntExceptions_h
  • trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h

    r164424 r170147  
    3131#include <wtf/InlineASM.h>
    3232
    33 #if ENABLE(LLINT_C_LOOP)
     33#if !ENABLE(JIT)
    3434#define OFFLINE_ASM_C_LOOP 1
    3535#define OFFLINE_ASM_X86 0
     
    4444#define OFFLINE_ASM_SH4 0
    4545
    46 #else // !ENABLE(LLINT_C_LOOP)
     46#else // ENABLE(JIT)
    4747
    4848#define OFFLINE_ASM_C_LOOP 0
     
    122122#endif
    123123
    124 #endif // !ENABLE(LLINT_C_LOOP)
     124#endif // ENABLE(JIT)
    125125
    126126#if USE(JSVALUE64)
  • trunk/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp

    r163225 r170147  
    5454#include <wtf/text/StringImpl.h>
    5555
     56
    5657namespace JSC {
    5758
     
    6566const unsigned* LLIntOffsetsExtractor::dummy()
    6667{
    67 #if ENABLE(LLINT)
    6868// This is a file generated by offlineasm/generate_offsets_extractor.rb, and contains code
    6969// to create a table of offsets, sizes, and a header identifying what combination of
     
    7474#include "LLIntDesiredOffsets.h"
    7575    return extractorTable;
    76 #else
    77     return 0;
    78 #endif
    7976}
    8077
  • trunk/Source/JavaScriptCore/llint/LLIntOpcode.h

    r167094 r170147  
    2727#define LLIntOpcode_h
    2828
    29 #if ENABLE(LLINT)
    30 
    31 #if ENABLE(LLINT_C_LOOP)
     29#if !ENABLE(JIT)
    3230
    3331#define FOR_EACH_LLINT_NOJIT_NATIVE_HELPER(macro) \
    3432    FOR_EACH_CLOOP_BYTECODE_HELPER_ID(macro)
    3533
    36 #else // !ENABLE(LLINT_C_LOOP)
     34#else // ENABLE(JIT)
    3735
    3836#define FOR_EACH_LLINT_NOJIT_NATIVE_HELPER(macro) \
    3937    // Nothing to do here. Use the JIT impl instead.
    4038
    41 #endif // !ENABLE(LLINT_C_LOOP)
     39#endif // !ENABLE(JIT)
    4240
    4341
     
    5149#define FOR_EACH_LLINT_OPCODE_EXTENSION(macro) FOR_EACH_LLINT_NATIVE_HELPER(macro)
    5250
    53 #else // !ENABLE(LLINT)
    54 
    55 #define FOR_EACH_LLINT_OPCODE_EXTENSION(macro) // Nothing to add.
    56 
    57 #endif // !ENABLE(LLINT)
    58 
    5951#endif // LLIntOpcode_h
  • trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

    r169341 r170147  
    2626#include "config.h"
    2727#include "LLIntSlowPaths.h"
    28 
    29 #if ENABLE(LLINT)
    30 
    3128#include "Arguments.h"
    3229#include "ArrayConstructor.h"
     
    477474    // Hence, if we get here, then we know a stack overflow is imminent. So, just
    478475    // throw the StackOverflowError unconditionally.
    479 #if ENABLE(LLINT_C_LOOP)
     476#if !ENABLE(JIT)
    480477    ASSERT(!vm.interpreter->stack().containsAddress(exec->topOfFrame()));
    481478    if (LIKELY(vm.interpreter->stack().ensureCapacityFor(exec->topOfFrame())))
     
    14651462}
    14661463
    1467 #if ENABLE(LLINT_C_LOOP)
     1464#if !ENABLE(JIT)
    14681465extern "C" SlowPathReturnType llint_stack_check_at_vm_entry(VM* vm, Register* newTopOfStack)
    14691466{
     
    14851482
    14861483} } // namespace JSC::LLInt
    1487 
    1488 #endif // ENABLE(LLINT)
  • trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h

    r166392 r170147  
    2929#include "CommonSlowPaths.h"
    3030#include <wtf/StdLibExtras.h>
    31 
    32 #if ENABLE(LLINT)
    3331
    3432namespace JSC {
     
    126124LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_put_to_scope);
    127125extern "C" SlowPathReturnType llint_throw_stack_overflow_error(VM*, ProtoCallFrame*) WTF_INTERNAL;
    128 #if ENABLE(LLINT_C_LOOP)
     126#if !ENABLE(JIT)
    129127extern "C" SlowPathReturnType llint_stack_check_at_vm_entry(VM*, Register*) WTF_INTERNAL;
    130128#endif
     
    133131} } // namespace JSC::LLInt
    134132
    135 #endif // ENABLE(LLINT)
    136 
    137133#endif // LLIntSlowPaths_h
    138134
  • trunk/Source/JavaScriptCore/llint/LLIntThunks.cpp

    r167094 r170147  
    4343
    4444#if ENABLE(JIT)
    45 #if ENABLE(LLINT)
    4645
    4746namespace LLInt {
     
    9190} // namespace LLInt
    9291
    93 #endif // ENABLE(LLINT)
    9492#else // ENABLE(JIT)
    9593
  • trunk/Source/JavaScriptCore/llint/LLIntThunks.h

    r167094 r170147  
    2727#define LLIntThunks_h
    2828
    29 #if ENABLE(LLINT)
    30 
    3129#include "MacroAssemblerCodeRef.h"
    3230
     
    5250} } // namespace JSC::LLInt
    5351
    54 #endif // ENABLE(LLINT)
    55 
    5652#endif // LLIntThunks_h
  • trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

    r168197 r170147  
    2626#include "config.h"
    2727#include "LowLevelInterpreter.h"
    28 
    29 #if ENABLE(LLINT)
    30 
    3128#include "LLIntOfflineAsmConfig.h"
    3229#include <wtf/InlineASM.h>
    3330
    34 #if ENABLE(LLINT_C_LOOP)
     31#if !ENABLE(JIT)
    3532#include "CodeBlock.h"
    3633#include "CommonSlowPaths.h"
     
    531528#include "LLIntAssembly.h"
    532529
    533 #endif // !ENABLE(LLINT_C_LOOP)
    534 
    535 #endif // ENABLE(LLINT)
     530#endif // ENABLE(JIT)
  • trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.h

    r167094 r170147  
    2727#define LowLevelInterpreter_h
    2828
    29 #if ENABLE(LLINT)
    30 
    3129#include "Opcode.h"
    3230
    33 #if ENABLE(LLINT_C_LOOP)
     31#if !ENABLE(JIT)
    3432
    3533namespace JSC {
     
    4846} // namespace JSC
    4947
    50 #endif // ENABLE(LLINT_C_LOOP)
    51 
    52 #endif // ENABLE(LLINT)
     48#endif // !ENABLE(JIT)
    5349
    5450#endif // LowLevelInterpreter_h
  • trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp

    r168443 r170147  
    2626#include "config.h"
    2727#include "CommonSlowPaths.h"
    28 
    29 #if ENABLE(JIT) || ENABLE(LLINT)
    30 
    3128#include "Arguments.h"
    3229#include "ArityCheckFailReturnThunks.h"
     
    7471#endif
    7572
    76 #if ENABLE(LLINT)
    7773#define RETURN_TO_THROW(exec, pc)   pc = LLInt::returnToThrow(exec)
    78 #else
    79 #define RETURN_TO_THROW(exec, pc)
    80 #endif
    8174
    8275#define BEGIN()                           \
     
    536529
    537530} // namespace JSC
    538 
    539 #endif // ENABLE(JIT) || ENABLE(LLINT)
  • trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h

    r164424 r170147  
    3535#include "VM.h"
    3636#include <wtf/StdLibExtras.h>
    37 
    38 #if ENABLE(JIT) || ENABLE(LLINT)
    3937
    4038namespace JSC {
     
    203201} // namespace JSC
    204202
    205 #endif // ENABLE(JIT) || ENABLE(LLINT)
    206 
    207203#endif // CommonSlowPaths_h
  • trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp

    r164018 r170147  
    3939    size_t newReservedZoneSize = Options::errorModeReservedZoneSize();
    4040    m_savedReservedZoneSize = m_vm.updateReservedZoneSize(newReservedZoneSize);
    41 #if ENABLE(LLINT_C_LOOP)
     41#if !ENABLE(JIT)
    4242    m_vm.interpreter->stack().setReservedZoneSize(newReservedZoneSize);
    4343#endif
     
    4848    RELEASE_ASSERT(m_vm.stackPointerAtVMEntry());
    4949    m_vm.updateReservedZoneSize(m_savedReservedZoneSize);
    50 #if ENABLE(LLINT_C_LOOP)
     50#if !ENABLE(JIT)
    5151    m_vm.interpreter->stack().setReservedZoneSize(m_savedReservedZoneSize);
    5252#endif
  • trunk/Source/JavaScriptCore/runtime/Executable.cpp

    r170034 r170147  
    286286static void setupLLInt(VM& vm, CodeBlock* codeBlock)
    287287{
    288 #if ENABLE(LLINT)
    289288    LLInt::setEntrypoint(vm, codeBlock);
    290 #else
    291     UNUSED_PARAM(vm);
    292     UNUSED_PARAM(codeBlock);
    293     UNREACHABLE_FOR_PLATFORM();
    294 #endif
    295289}
    296290
  • trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp

    r165676 r170147  
    6868#endif
    6969        JSStack::initializeThreading();
    70 #if ENABLE(LLINT)
    7170        LLInt::initialize();
    72 #endif
    7371#ifndef NDEBUG
    7472        DisallowGC::initialize();
  • trunk/Source/JavaScriptCore/runtime/JSCJSValue.h

    r169703 r170147  
    5656}
    5757#endif
    58 #if ENABLE(LLINT_C_LOOP)
     58#if !ENABLE(JIT)
    5959namespace LLInt {
    6060class CLoop;
     
    135135    friend class DFG::SpeculativeJIT;
    136136#endif
    137 #if ENABLE(LLINT_C_LOOP)
     137#if !ENABLE(JIT)
    138138    friend class LLInt::CLoop;
    139139#endif
     
    314314    int32_t payload() const;
    315315
    316 #if ENABLE(LLINT_C_LOOP)
     316#if !ENABLE(JIT)
    317317    // This should only be used by the LLInt C Loop interpreter who needs
    318318    // synthesize JSValue from its "register"s holding tag and payload
  • trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h

    r169823 r170147  
    313313}
    314314
    315 #if ENABLE(LLINT_C_LOOP)
     315#if !ENABLE(JIT)
    316316inline JSValue::JSValue(int32_t tag, int32_t payload)
    317317{
  • trunk/Source/JavaScriptCore/runtime/Options.cpp

    r168178 r170147  
    216216    Options::useDFGJIT() = false;
    217217    Options::useFTLJIT() = false;
    218 #endif
    219 #if !ENABLE(LLINT)
    220     Options::useLLInt() = false;
    221218#endif
    222219#if !ENABLE(YARR_JIT)
  • trunk/Source/JavaScriptCore/runtime/VM.cpp

    r169703 r170147  
    220220    , m_stackPointerAtVMEntry(0)
    221221    , m_stackLimit(0)
    222 #if ENABLE(LLINT_C_LOOP)
     222#if !ENABLE(JIT)
    223223    , m_jsStackLimit(0)
    224224#endif
     
    235235    StackBounds stack = wtfThreadData().stack();
    236236    updateReservedZoneSize(Options::reservedZoneSize());
    237 #if ENABLE(LLINT_C_LOOP)
     237#if !ENABLE(JIT)
    238238    interpreter->stack().setReservedZoneSize(Options::reservedZoneSize());
    239239#endif
     
    918918{
    919919    logSanitizeStack(vm);
    920 #if ENABLE(LLINT_C_LOOP)
     920#if !ENABLE(JIT)
    921921    vm->interpreter->stack().sanitizeStack();
    922922#else
  • trunk/Source/JavaScriptCore/runtime/VM.h

    r169703 r170147  
    316316        void* enabledProfilerAddress() { return &m_enabledProfiler; }
    317317
    318 #if ENABLE(JIT) && ENABLE(LLINT)
     318#if ENABLE(JIT)
    319319        bool canUseJIT() { return m_canUseJIT; }
    320 #elif ENABLE(JIT)
    321         bool canUseJIT() { return true; } // jit only
    322320#else
    323321        bool canUseJIT() { return false; } // interpreter only
     
    393391#endif
    394392
    395 #if ENABLE(LLINT_C_LOOP)
     393#if !ENABLE(JIT)
    396394        void* jsStackLimit() { return m_jsStackLimit; }
    397395        void setJSStackLimit(void* limit) { m_jsStackLimit = limit; }
     
    537535        void* m_stackPointerAtVMEntry;
    538536        size_t m_reservedZoneSize;
    539 #if ENABLE(LLINT_C_LOOP)
     537#if !ENABLE(JIT)
    540538        struct {
    541539            void* m_stackLimit;
     
    579577    }
    580578
    581 #if !ENABLE(LLINT_C_LOOP)
     579#if ENABLE(JIT)
    582580    extern "C" void sanitizeStackForVMImpl(VM*);
    583581#endif
  • trunk/Source/WTF/ChangeLog

    r170108 r170147  
     12014-06-19  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
     2
     3        Remove ENABLE(LLINT) and ENABLE(LLINT_C_LOOP) guards
     4        https://bugs.webkit.org/show_bug.cgi?id=130389
     5
     6        Reviewed by Mark Lam.
     7
     8        Removed ENABLE(LLINT) since we always build with it, and changed ENABLE(LLINT_C_LOOP)
     9        into !ENABLE(JIT) since they are mutually exclusive.
     10
     11        * wtf/OSAllocatorPosix.cpp:
     12        (WTF::OSAllocator::reserveAndCommit):
     13        * wtf/Platform.h:
     14
    1152014-06-18  Anders Carlsson  <andersca@apple.com>
    216
  • trunk/Source/WTF/wtf/OSAllocatorPosix.cpp

    r161601 r170147  
    105105    result = mmap(result, bytes, protection, flags, fd, 0);
    106106    if (result == MAP_FAILED) {
    107 #if ENABLE(LLINT)
    108107        if (executable)
    109108            result = 0;
    110109        else
    111 #endif
    112110            CRASH();
    113111    }
  • trunk/Source/WTF/wtf/Platform.h

    r170065 r170147  
    637637#endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */
    638638
    639 /* Disable the JITs if we're forcing the cloop to be enabled */
    640 #if defined(ENABLE_LLINT_C_LOOP) && ENABLE_LLINT_C_LOOP
    641 #define ENABLE_JIT 0
    642 #define ENABLE_DFG_JIT 0
    643 #ifdef ENABLE_FTL_JIT
    644 #undef ENABLE_FTL_JIT
    645 #endif
    646 #define ENABLE_FTL_JIT 0
    647 #endif
    648 
    649639/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k and Windows. */
    650640#if !defined(ENABLE_JIT) \
     
    707697#endif
    708698
    709 /* On some of the platforms where we have a JIT, we want to also have the
    710    low-level interpreter. */
    711 #if !defined(ENABLE_LLINT) \
    712     && ENABLE(JIT) \
    713     && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(WINDOWS)) \
    714     && ((OS(DARWIN) && !PLATFORM(EFL)) || PLATFORM(GTK) || PLATFORM(WIN)) \
    715     && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
    716 #define ENABLE_LLINT 1
    717 #endif
    718 
    719699#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC)
    720700/* Enable the DFG JIT on X86 and X86_64.  Only tested on Mac, GNU/Linux and FreeBSD. */
     
    740720#endif
    741721
    742 /* If the jit is not available, enable the LLInt C Loop: */
     722/* Disable the JIT if we force the LLInt C Loop */
     723#if defined(ENABLE_LLINT_C_LOOP) && ENABLE_LLINT_C_LOOP
     724#undef ENABLE_JIT
     725#define ENABLE_JIT 0
     726#endif
     727
     728/* If the baseline jit is not available, then disable upper tiers as well: */
    743729#if !ENABLE(JIT)
    744 #undef ENABLE_LLINT        /* Undef so that we can redefine it. */
    745 #undef ENABLE_LLINT_C_LOOP /* Undef so that we can redefine it. */
    746730#undef ENABLE_DFG_JIT      /* Undef so that we can redefine it. */
    747 #define ENABLE_LLINT 1
    748 #define ENABLE_LLINT_C_LOOP 1
     731#undef ENABLE_FTL_JIT      /* Undef so that we can redefine it. */
    749732#define ENABLE_DFG_JIT 0
    750 #endif
    751 
    752 /* Do a sanity check to make sure that we at least have one execution engine in
    753    use: */
    754 #if !(ENABLE(JIT) || ENABLE(LLINT))
    755 #error You have to have at least one execution model enabled to build JSC
    756 #endif
     733#define ENABLE_FTL_JIT 0
     734#endif
     735
    757736
    758737/* Generational collector for JSC */
     
    806785
    807786/* Determine if we need to enable Computed Goto Opcodes or not: */
    808 #if HAVE(COMPUTED_GOTO) || !ENABLE(LLINT_C_LOOP)
     787#if HAVE(COMPUTED_GOTO) || ENABLE(JIT)
    809788#define ENABLE_COMPUTED_GOTO_OPCODES 1
    810789#endif
     
    814793
    815794/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
    816 #if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP))
     795#if !defined(ENABLE_YARR_JIT)
    817796#define ENABLE_YARR_JIT 1
    818797
  • trunk/Source/cmake/OptionsEfl.cmake

    r170007 r170147  
    7272WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR ON)
    7373WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
    74 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
    7574WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
    7675WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT ON)
     
    104103if (ENABLE_LLINT_C_LOOP)
    105104    message(STATUS "Force enabling LLINT C LOOP.")
    106     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
    107105    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT OFF)
    108106    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DFG_JIT OFF)
  • trunk/Source/cmake/OptionsGTK.cmake

    r170052 r170147  
    3939WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR OFF)
    4040WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
    41 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
    4241WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
    4342WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT ON)
  • trunk/Source/cmake/WebKitFeatures.cmake

    r170007 r170147  
    7373    WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_WEB_AUDIO "Toggle Legacy Web Audio support" ON)
    7474    WEBKIT_OPTION_DEFINE(ENABLE_LINK_PREFETCH "Toggle pre fetching support" OFF)
    75     WEBKIT_OPTION_DEFINE(ENABLE_LLINT "Enable JSC Low Level Interpreter" OFF)
    7675    WEBKIT_OPTION_DEFINE(ENABLE_LLINT_C_LOOP "Force use of the llint c loop" OFF)
    7776    WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON)
  • trunk/Source/cmakeconfig.h.cmake

    r169416 r170147  
    6767#cmakedefine01 ENABLE_LEGACY_WEB_AUDIO
    6868#cmakedefine01 ENABLE_LINK_PREFETCH
    69 #cmakedefine01 ENABLE_LLINT
    7069#cmakedefine01 ENABLE_LLINT_C_LOOP
    7170#cmakedefine01 ENABLE_MATHML
Note: See TracChangeset for help on using the changeset viewer.