Changeset 170147 in webkit for trunk/Source/JavaScriptCore/interpreter/JSStack.cpp

Timestamp:

Jun 19, 2014, 9:32:31 AM (11 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:

File:

• trunk/Source/JavaScriptCore/interpreter/JSStack.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/interpreter/JSStack.cpp

@@ -37 +37 @@
 namespace JSC {
 
-#if ENABLE(LLINT_C_LOOP)
+#if !ENABLE(JIT)
 static size_t committedBytesCount = 0;
 
@@ -45 +45 @@
     return staticMutex;
 }    
-#endif // ENABLE(LLINT_C_LOOP)
+#endif // !ENABLE(JIT)
 
 JSStack::JSStack(VM& vm)
     : m_vm(vm)
     , m_topCallFrame(vm.topCallFrame)
-#if ENABLE(LLINT_C_LOOP)
+#if !ENABLE(JIT)
     , m_end(0)
     , m_reservedZoneSizeInRegisters(0)
 #endif
 {
-#if ENABLE(LLINT_C_LOOP)
+#if !ENABLE(JIT)
     size_t capacity = Options::maxPerThreadStackUsage();
     ASSERT(capacity && isPageAligned(capacity));
@@ -64 +64 @@
     
     m_lastStackTop = baseOfStack();
-#endif // ENABLE(LLINT_C_LOOP)
+#endif // !ENABLE(JIT)
 
     m_topCallFrame = 0;
 }
 
-#if ENABLE(LLINT_C_LOOP)
+#if !ENABLE(JIT)
 JSStack::~JSStack()
 {
@@ -159 +159 @@
         growSlowCase(m_end + 1);
 }
-#endif // ENABLE(LLINT_C_LOOP)
+#endif // !ENABLE(JIT)
 
-#if !ENABLE(LLINT_C_LOOP)
+#if ENABLE(JIT)
 Register* JSStack::lowAddress() const
 {
@@ -173 +173 @@
     return reinterpret_cast<Register*>(wtfThreadData().stack().origin());
 }
-#endif // !ENABLE(LLINT_C_LOOP)
+#endif // ENABLE(JIT)
 
 size_t JSStack::committedByteCount()
 {
-#if ENABLE(LLINT_C_LOOP)
+#if !ENABLE(JIT)
     MutexLocker locker(stackStatisticsMutex());
     return committedBytesCount;