Changeset 127199 in webkit for trunk/Source/JavaScriptCore/jit/JITCode.h

Timestamp:

Aug 30, 2012, 3:21:48 PM (13 years ago)

Author:

[email protected]

Message:

Render unto #ifdef's that which belong to them.
​https://bugs.webkit.org/show_bug.cgi?id=95482.

Patch by Mark Lam <​[email protected]> on 2012-08-30
Reviewed by Filip Pizlo.

Source/JavaScriptCore:

Refining / disambiguating between #ifdefs and adding some. For
example, ENABLE(JIT) is conflated with ENABLE(LLINT) in some places.
Also, we need to add ENABLE(COMPUTED_GOTO_OPCODES) to indicate that we
want interpreted opcodes to use COMPUTED GOTOs apart from ENABLE(LLINT)
and ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER). Also cleaned up #ifdefs
in certain places which were previously incorrect.

• bytecode/CodeBlock.cpp:

(JSC):
(JSC::CodeBlock::bytecodeOffset):

• bytecode/CodeBlock.h:

(CodeBlock):

• bytecode/Opcode.h:

(JSC::padOpcodeName):

• config.h:
• dfg/DFGOperations.cpp:
• interpreter/AbstractPC.cpp:

(JSC::AbstractPC::AbstractPC):

• interpreter/CallFrame.h:

(ExecState):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::~Interpreter):
(JSC::Interpreter::initialize):
(JSC::Interpreter::isOpcode):
(JSC::Interpreter::unwindCallFrame):
(JSC::getLineNumberForCallFrame):
(JSC::getCallerInfo):
(JSC::Interpreter::execute):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):
(JSC::Interpreter::privateExecute):

• interpreter/Interpreter.h:

(JSC::Interpreter::getOpcode):
(JSC::Interpreter::getOpcodeID):
(Interpreter):

• jit/HostCallReturnValue.h:
• jit/JITCode.h:

(JITCode):

• jit/JITExceptions.cpp:
• jit/JITExceptions.h:
• jit/JSInterfaceJIT.h:
• llint/LLIntData.h:

(JSC::LLInt::getOpcode):

• llint/LLIntEntrypoints.cpp:

(JSC::LLInt::getFunctionEntrypoint):
(JSC::LLInt::getEvalEntrypoint):
(JSC::LLInt::getProgramEntrypoint):

• llint/LLIntOffsetsExtractor.cpp:

(JSC::LLIntOffsetsExtractor::dummy):

• llint/LLIntSlowPaths.cpp:

(LLInt):

• runtime/JSGlobalData.cpp:

(JSC):

Source/WTF:

• wtf/Platform.h: Added ENABLE(COMPUTED_GOTO_OPCODES).

File:

• trunk/Source/JavaScriptCore/jit/JITCode.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/jit/JITCode.h

@@ -27 +27 @@
 #define JITCode_h
 
-#if ENABLE(JIT)
+#if ENABLE(JIT) || ENABLE(LLINT)
 #include "CallFrame.h"
 #include "JSValue.h"
@@ -43 +43 @@
     
     class JITCode {
-#if ENABLE(JIT)
+#if ENABLE(JIT) || ENABLE(LLINT)
         typedef MacroAssemblerCodeRef CodeRef;
         typedef MacroAssemblerCodePtr CodePtr;
@@ -78 +78 @@
         }
         
-#if ENABLE(JIT)
+#if ENABLE(JIT) || ENABLE(LLINT)
         JITCode()
             : m_jitType(None)
@@ -128 +128 @@
         }
 
+#if ENABLE(JIT)
         // Execute the code!
         inline JSValue execute(RegisterFile* registerFile, CallFrame* callFrame, JSGlobalData* globalData)
@@ -134 +135 @@
             return globalData->exception ? jsNull() : result;
         }
+#endif
 
         void* start() const
@@ -183 +185 @@
         CodeRef m_ref;
         JITType m_jitType;
-#endif // ENABLE(JIT)
+#endif // ENABLE(JIT) || ENABLE(LLINT)
     };