Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (108019 => 108020)
--- trunk/Source/_javascript_Core/ChangeLog 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-02-17 04:10:00 UTC (rev 108020)
@@ -1,3 +1,66 @@
+2012-02-16 Filip Pizlo <[email protected]>
+
+ ENABLE_INTERPRETER should be ENABLE_CLASSIC_INTERPRETER
+ https://bugs.webkit.org/show_bug.cgi?id=78791
+
+ Rubber stamped by Oliver Hunt.
+
+ Just a renaming, nothing more. Also renamed COMPUTED_GOTO_INTERPRETER to
+ COMPUTED_GOTO_CLASSIC_INTERPRETER.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dump):
+ (JSC::CodeBlock::stronglyVisitStrongReferences):
+ (JSC):
+ (JSC::CodeBlock::shrinkToFit):
+ * bytecode/CodeBlock.h:
+ (CodeBlock):
+ * bytecode/Instruction.h:
+ (JSC::Instruction::Instruction):
+ * bytecode/Opcode.h:
+ (JSC::padOpcodeName):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitResolve):
+ (JSC::BytecodeGenerator::emitResolveWithBase):
+ (JSC::BytecodeGenerator::emitGetById):
+ (JSC::BytecodeGenerator::emitPutById):
+ (JSC::BytecodeGenerator::emitDirectPutById):
+ * interpreter/AbstractPC.cpp:
+ (JSC::AbstractPC::AbstractPC):
+ * interpreter/AbstractPC.h:
+ (AbstractPC):
+ * interpreter/CallFrame.h:
+ (ExecState):
+ * interpreter/Interpreter.cpp:
+ (JSC):
+ (JSC::Interpreter::initialize):
+ (JSC::Interpreter::isOpcode):
+ (JSC::Interpreter::unwindCallFrame):
+ (JSC::Interpreter::execute):
+ (JSC::Interpreter::privateExecute):
+ (JSC::Interpreter::retrieveLastCaller):
+ * interpreter/Interpreter.h:
+ (JSC::Interpreter::getOpcode):
+ (JSC::Interpreter::getOpcodeID):
+ (Interpreter):
+ * jit/ExecutableAllocatorFixedVMPool.cpp:
+ (JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
+ * runtime/Executable.cpp:
+ (JSC::EvalExecutable::compileInternal):
+ (JSC::ProgramExecutable::compileInternal):
+ (JSC::FunctionExecutable::compileForCallInternal):
+ (JSC::FunctionExecutable::compileForConstructInternal):
+ * runtime/Executable.h:
+ (NativeExecutable):
+ * runtime/JSGlobalData.cpp:
+ (JSC::JSGlobalData::JSGlobalData):
+ (JSC::JSGlobalData::getHostFunction):
+ * runtime/JSGlobalData.h:
+ (JSGlobalData):
+ * wtf/OSAllocatorPosix.cpp:
+ (WTF::OSAllocator::reserveAndCommit):
+ * wtf/Platform.h:
+
2012-02-15 Geoffrey Garen <[email protected]>
Made Weak<T> single-owner, adding PassWeak<T>
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (108019 => 108020)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2012-02-17 04:10:00 UTC (rev 108020)
@@ -412,7 +412,7 @@
} while (i < m_structureStubInfos.size());
}
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!m_globalResolveInstructions.isEmpty() || !m_propertyAccessInstructions.isEmpty())
dataLog("\nStructures:\n");
@@ -1851,7 +1851,7 @@
visitor.append(&m_functionExprs[i]);
for (size_t i = 0; i < m_functionDecls.size(); ++i)
visitor.append(&m_functionDecls[i]);
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
for (size_t size = m_propertyAccessInstructions.size(), i = 0; i < size; ++i)
visitStructures(visitor, &instructions()[m_propertyAccessInstructions[i]]);
for (size_t size = m_globalResolveInstructions.size(), i = 0; i < size; ++i)
@@ -1976,7 +1976,7 @@
return;
}
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
bool CodeBlock::hasGlobalResolveInstructionAtBytecodeOffset(unsigned bytecodeOffset)
{
if (m_globalResolveInstructions.isEmpty())
@@ -2023,7 +2023,7 @@
{
instructions().shrinkToFit();
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
m_propertyAccessInstructions.shrinkToFit();
m_globalResolveInstructions.shrinkToFit();
#endif
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (108019 => 108020)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -333,7 +333,7 @@
}
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
unsigned bytecodeOffset(Instruction* returnAddress)
{
return static_cast<Instruction*>(returnAddress) - instructions().begin();
@@ -460,7 +460,7 @@
void clearEvalCache();
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
void addPropertyAccessInstruction(unsigned propertyAccessInstruction)
{
if (!m_globalData->canUseJIT())
@@ -1075,7 +1075,7 @@
RefPtr<SourceProvider> m_source;
unsigned m_sourceOffset;
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
Vector<unsigned> m_propertyAccessInstructions;
Vector<unsigned> m_globalResolveInstructions;
#endif
Modified: trunk/Source/_javascript_Core/bytecode/Instruction.h (108019 => 108020)
--- trunk/Source/_javascript_Core/bytecode/Instruction.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/bytecode/Instruction.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -148,7 +148,7 @@
struct Instruction {
Instruction(Opcode opcode)
{
-#if !ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if !ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
// We have to initialize one of the pointer members to ensure that
// the entire struct is initialized, when opcode is not a pointer.
u.jsCell.clear();
Modified: trunk/Source/_javascript_Core/bytecode/Opcode.h (108019 => 108020)
--- trunk/Source/_javascript_Core/bytecode/Opcode.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/bytecode/Opcode.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -217,7 +217,7 @@
FOR_EACH_OPCODE_ID(VERIFY_OPCODE_ID);
#undef VERIFY_OPCODE_ID
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
#if COMPILER(RVCT) || COMPILER(INTEL)
typedef void* Opcode;
#else
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (108019 => 108020)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2012-02-17 04:10:00 UTC (rev 108020)
@@ -1278,7 +1278,7 @@
#if ENABLE(JIT)
m_codeBlock->addGlobalResolveInfo(instructions().size());
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
m_codeBlock->addGlobalResolveInstruction(instructions().size());
#endif
bool dynamic = resolveResult.isDynamic() && resolveResult.depth();
@@ -1372,7 +1372,7 @@
#if ENABLE(JIT)
m_codeBlock->addGlobalResolveInfo(instructions().size());
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
m_codeBlock->addGlobalResolveInstruction(instructions().size());
#endif
ValueProfile* profile = ""
@@ -1494,7 +1494,7 @@
RegisterID* BytecodeGenerator::emitGetById(RegisterID* dst, RegisterID* base, const Identifier& property)
{
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
m_codeBlock->addPropertyAccessInstruction(instructions().size());
#endif
@@ -1522,7 +1522,7 @@
RegisterID* BytecodeGenerator::emitPutById(RegisterID* base, const Identifier& property, RegisterID* value)
{
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
m_codeBlock->addPropertyAccessInstruction(instructions().size());
#endif
@@ -1540,7 +1540,7 @@
RegisterID* BytecodeGenerator::emitDirectPutById(RegisterID* base, const Identifier& property, RegisterID* value)
{
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
m_codeBlock->addPropertyAccessInstruction(instructions().size());
#endif
Modified: trunk/Source/_javascript_Core/interpreter/AbstractPC.cpp (108019 => 108020)
--- trunk/Source/_javascript_Core/interpreter/AbstractPC.cpp 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/interpreter/AbstractPC.cpp 2012-02-17 04:10:00 UTC (rev 108020)
@@ -45,7 +45,7 @@
}
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
UNUSED_PARAM(globalData);
m_pointer = exec->returnVPC();
m_mode = Interpreter;
Modified: trunk/Source/_javascript_Core/interpreter/AbstractPC.h (108019 => 108020)
--- trunk/Source/_javascript_Core/interpreter/AbstractPC.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/interpreter/AbstractPC.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -60,7 +60,7 @@
}
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
AbstractPC(Instruction* vPC)
: m_pointer(vPC)
, m_mode(Interpreter)
Modified: trunk/Source/_javascript_Core/interpreter/CallFrame.h (108019 => 108020)
--- trunk/Source/_javascript_Core/interpreter/CallFrame.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/interpreter/CallFrame.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -131,7 +131,7 @@
return 0;
}
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
Instruction* returnVPC() const { return this[RegisterFile::ReturnPC].vPC(); }
#endif
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (108019 => 108020)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2012-02-17 04:10:00 UTC (rev 108020)
@@ -69,7 +69,7 @@
#include "JIT.h"
#endif
-#define WTF_USE_GCC_COMPUTED_GOTO_WORKAROUND (ENABLE(COMPUTED_GOTO_INTERPRETER) && !defined(__llvm__))
+#define WTF_USE_GCC_COMPUTED_GOTO_WORKAROUND (ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER) && !defined(__llvm__))
using namespace std;
@@ -83,7 +83,7 @@
return sc->localDepth();
}
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
static NEVER_INLINE JSValue concatenateStrings(ExecState* exec, Register* strings, unsigned count)
{
return jsString(exec, strings, count);
@@ -365,7 +365,7 @@
return false;
}
-#endif // ENABLE(INTERPRETER)
+#endif // ENABLE(CLASSIC_INTERPRETER)
ALWAYS_INLINE CallFrame* Interpreter::slideRegisterWindowForCall(CodeBlock* newCodeBlock, RegisterFile* registerFile, CallFrame* callFrame, size_t registerOffset, int argumentCountIncludingThis)
{
@@ -394,7 +394,7 @@
return newCallFrame;
}
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
static NEVER_INLINE bool isInvalidParamForIn(CallFrame* callFrame, JSValue value, JSValue& exceptionData)
{
if (value.isObject())
@@ -549,7 +549,7 @@
void Interpreter::initialize(bool canUseJIT)
{
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
if (canUseJIT) {
// If the JIT is present, don't use jump destinations for opcodes.
@@ -567,12 +567,12 @@
}
#else
UNUSED_PARAM(canUseJIT);
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
m_enabled = true;
#else
m_enabled = false;
#endif
-#endif // ENABLE(COMPUTED_GOTO_INTERPRETER)
+#endif // ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
#if !ASSERT_DISABLED
m_initialized = true;
#endif
@@ -667,7 +667,7 @@
bool Interpreter::isOpcode(Opcode opcode)
{
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
if (!m_enabled)
return opcode >= 0 && static_cast<OpcodeID>(bitwise_cast<uintptr_t>(opcode)) <= op_end;
return opcode != HashTraits<Opcode>::emptyValue()
@@ -724,7 +724,7 @@
// the beginning of next instruction to execute. To get an offset
// inside the call instruction that triggered the exception we
// have to subtract 1.
-#if ENABLE(JIT) && ENABLE(INTERPRETER)
+#if ENABLE(JIT) && ENABLE(CLASSIC_INTERPRETER)
if (callerFrame->globalData().canUseJIT())
bytecodeOffset = codeBlock->bytecodeOffset(callFrame->returnPC());
else
@@ -808,7 +808,7 @@
if (callframeIsHost) {
// Don't need to deal with inline callframes here as by definition we haven't
// inlined a call with an intervening native call frame.
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!globalData->canUseJIT()) {
bytecodeOffset = callerFrame->bytecodeOffsetForNonDFGCode();
lineNumber = callerCodeBlock->lineNumberForBytecodeOffset(bytecodeOffset - 1);
@@ -824,7 +824,7 @@
bytecodeOffset = callerFrame->bytecodeOffsetForNonDFGCode();
#endif
} else {
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!globalData->canUseJIT()) {
bytecodeOffset = callerCodeBlock->bytecodeOffset(callFrame->returnVPC());
lineNumber = callerCodeBlock->lineNumberForBytecodeOffset(bytecodeOffset - 1);
@@ -868,7 +868,7 @@
static ALWAYS_INLINE const UString getSourceURLFromCallFrame(CallFrame* callFrame)
{
ASSERT(!callFrame->hasHostCallFrameFlag());
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
#if ENABLE(JIT)
if (callFrame->globalData().canUseJIT())
return callFrame->codeBlock()->ownerExecutable()->sourceURL();
@@ -1408,15 +1408,15 @@
m_reentryDepth++;
#if ENABLE(JIT)
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (closure.newCallFrame->globalData().canUseJIT())
#endif
result = closure.functionExecutable->generatedJITCodeForCall().execute(&m_registerFile, closure.newCallFrame, closure.globalData);
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
else
#endif
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
result = privateExecute(Normal, &m_registerFile, closure.newCallFrame);
#endif
m_reentryDepth--;
@@ -1514,15 +1514,15 @@
m_reentryDepth++;
#if ENABLE(JIT)
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (callFrame->globalData().canUseJIT())
#endif
result = eval->generatedJITCode().execute(&m_registerFile, newCallFrame, scopeChain->globalData);
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
else
#endif
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
result = privateExecute(Normal, &m_registerFile, newCallFrame);
#endif
m_reentryDepth--;
@@ -1565,7 +1565,7 @@
}
}
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
NEVER_INLINE ScopeChainNode* Interpreter::createExceptionScope(CallFrame* callFrame, const Instruction* vPC)
{
int dst = vPC[1].u.operand;
@@ -1797,20 +1797,20 @@
vPC[4] = 0;
}
-#endif // ENABLE(INTERPRETER)
+#endif // ENABLE(CLASSIC_INTERPRETER)
JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFile, CallFrame* callFrame)
{
// One-time initialization of our address tables. We have to put this code
// here because our labels are only in scope inside this function.
if (UNLIKELY(flag == InitializeAndReturn)) {
- #if ENABLE(COMPUTED_GOTO_INTERPRETER)
+ #if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
#define LIST_OPCODE_LABEL(id, length) &&id,
static Opcode labels[] = { FOR_EACH_OPCODE_ID(LIST_OPCODE_LABEL) };
for (size_t i = 0; i < WTF_ARRAY_LENGTH(labels); ++i)
m_opcodeTable[i] = labels[i];
#undef LIST_OPCODE_LABEL
- #endif // ENABLE(COMPUTED_GOTO_INTERPRETER)
+ #endif // ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
return JSValue();
}
@@ -1818,14 +1818,14 @@
ASSERT(m_enabled);
#if ENABLE(JIT)
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
// Mixing Interpreter + JIT is not supported.
if (callFrame->globalData().canUseJIT())
#endif
ASSERT_NOT_REACHED();
#endif
-#if !ENABLE(INTERPRETER)
+#if !ENABLE(CLASSIC_INTERPRETER)
UNUSED_PARAM(registerFile);
UNUSED_PARAM(callFrame);
return JSValue();
@@ -1876,7 +1876,7 @@
callFrame->setBytecodeOffsetForNonDFGCode(vPC - codeBlock->instructions().data() + 1);\
} while (0)
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
#define NEXT_INSTRUCTION() SAMPLE(codeBlock, vPC); goto *vPC->u.opcode
#if ENABLE(OPCODE_STATS)
#define DEFINE_OPCODE(opcode) \
@@ -5022,7 +5022,7 @@
vPC += target;
NEXT_INSTRUCTION();
}
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
// Appease GCC
goto *(&&skip_new_scope);
#endif
@@ -5038,7 +5038,7 @@
vPC += OPCODE_LENGTH(op_push_new_scope);
NEXT_INSTRUCTION();
}
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
skip_new_scope:
#endif
DEFINE_OPCODE(op_catch) {
@@ -5228,14 +5228,14 @@
NEXT_INSTRUCTION();
}
}
-#if !ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if !ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
} // iterator loop ends
#endif
#undef NEXT_INSTRUCTION
#undef DEFINE_OPCODE
#undef CHECK_FOR_EXCEPTION
#undef CHECK_FOR_TIMEOUT
-#endif // ENABLE(INTERPRETER)
+#endif // ENABLE(CLASSIC_INTERPRETER)
}
JSValue Interpreter::retrieveArgumentsFromVMCode(CallFrame* callFrame, JSFunction* function) const
@@ -5294,7 +5294,7 @@
if (!callerCodeBlock)
return;
unsigned bytecodeOffset = 0;
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!callerFrame->globalData().canUseJIT())
bytecodeOffset = callerCodeBlock->bytecodeOffset(callFrame->returnVPC());
#if ENABLE(JIT)
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.h (108019 => 108020)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -170,7 +170,7 @@
Opcode getOpcode(OpcodeID id)
{
ASSERT(m_initialized);
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
return m_opcodeTable[id];
#else
return id;
@@ -180,7 +180,7 @@
OpcodeID getOpcodeID(Opcode opcode)
{
ASSERT(m_initialized);
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
ASSERT(isOpcode(opcode));
if (!m_enabled)
return static_cast<OpcodeID>(bitwise_cast<uintptr_t>(opcode));
@@ -222,7 +222,7 @@
void endRepeatCall(CallFrameClosure&);
JSValue execute(CallFrameClosure&);
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
NEVER_INLINE bool resolve(CallFrame*, Instruction*, JSValue& exceptionValue);
NEVER_INLINE bool resolveSkip(CallFrame*, Instruction*, JSValue& exceptionValue);
NEVER_INLINE bool resolveGlobal(CallFrame*, Instruction*, JSValue& exceptionValue);
@@ -236,7 +236,7 @@
void uncacheGetByID(CodeBlock*, Instruction* vPC);
void tryCachePutByID(CallFrame*, CodeBlock*, Instruction*, JSValue baseValue, const PutPropertySlot&);
void uncachePutByID(CodeBlock*, Instruction* vPC);
-#endif // ENABLE(INTERPRETER)
+#endif // ENABLE(CLASSIC_INTERPRETER)
NEVER_INLINE bool unwindCallFrame(CallFrame*&, JSValue, unsigned& bytecodeOffset, CodeBlock*&);
@@ -259,7 +259,7 @@
RegisterFile m_registerFile;
-#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
Opcode m_opcodeTable[numOpcodeIDs]; // Maps OpcodeID => Opcode for compiling
HashMap<Opcode, OpcodeID> m_opcodeIDTable; // Maps Opcode => OpcodeID for decompiling
#endif
Modified: trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp (108019 => 108020)
--- trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2012-02-17 04:10:00 UTC (rev 108020)
@@ -59,7 +59,7 @@
: MetaAllocator(32) // round up all allocations to 32 bytes
{
m_reservation = PageReservation::reserveWithGuardPages(fixedPoolSize, OSAllocator::JSJITCodePages, EXECUTABLE_POOL_WRITABLE, true);
-#if !ENABLE(INTERPRETER)
+#if !ENABLE(CLASSIC_INTERPRETER)
if (!m_reservation)
CRASH();
#endif
Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (108019 => 108020)
--- trunk/Source/_javascript_Core/runtime/Executable.cpp 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp 2012-02-17 04:10:00 UTC (rev 108020)
@@ -223,7 +223,7 @@
#endif
#if ENABLE(JIT)
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!m_jitCodeForCall)
Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_evalCodeBlock));
else
@@ -349,7 +349,7 @@
#endif
#if ENABLE(JIT)
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!m_jitCodeForCall)
Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_programCodeBlock));
else
@@ -517,7 +517,7 @@
#endif
#if ENABLE(JIT)
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!m_jitCodeForCall)
Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_codeBlockForCall));
else
@@ -559,7 +559,7 @@
#endif
#if ENABLE(JIT)
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!m_jitCodeForConstruct)
Heap::heap(this)->reportExtraMemoryCost(sizeof(*m_codeBlockForConstruct));
else
Modified: trunk/Source/_javascript_Core/runtime/Executable.h (108019 => 108020)
--- trunk/Source/_javascript_Core/runtime/Executable.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/runtime/Executable.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -199,7 +199,7 @@
}
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
static NativeExecutable* create(JSGlobalData& globalData, NativeFunction function, NativeFunction constructor)
{
ASSERT(!globalData.canUseJIT());
@@ -237,7 +237,7 @@
}
#endif
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
void finishCreation(JSGlobalData& globalData)
{
ASSERT(!globalData.canUseJIT());
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp (108019 => 108020)
--- trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp 2012-02-17 04:10:00 UTC (rev 108020)
@@ -189,7 +189,7 @@
wtfThreadData().setCurrentIdentifierTable(existingEntryIdentifierTable);
-#if ENABLE(JIT) && ENABLE(INTERPRETER)
+#if ENABLE(JIT) && ENABLE(CLASSIC_INTERPRETER)
#if USE(CF)
CFStringRef canUseJITKey = CFStringCreateWithCString(0 , "_javascript_CoreUseJIT", kCFStringEncodingMacRoman);
CFBooleanRef canUseJIT = (CFBooleanRef)CFPreferencesCopyAppValue(canUseJITKey, kCFPreferencesCurrentApplication);
@@ -209,7 +209,7 @@
#endif
#endif
#if ENABLE(JIT)
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (m_canUseJIT)
m_canUseJIT = executableAllocator.isValid();
#endif
@@ -383,7 +383,7 @@
NativeExecutable* JSGlobalData::getHostFunction(NativeFunction function, NativeFunction constructor)
{
-#if ENABLE(INTERPRETER)
+#if ENABLE(CLASSIC_INTERPRETER)
if (!canUseJIT())
return NativeExecutable::create(*this, function, constructor);
#endif
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalData.h (108019 => 108020)
--- trunk/Source/_javascript_Core/runtime/JSGlobalData.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalData.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -217,7 +217,7 @@
#if !ENABLE(JIT)
bool canUseJIT() { return false; } // interpreter only
-#elif !ENABLE(INTERPRETER)
+#elif !ENABLE(CLASSIC_INTERPRETER)
bool canUseJIT() { return true; } // jit only
#else
bool canUseJIT() { return m_canUseJIT; }
@@ -349,7 +349,7 @@
JSGlobalData(GlobalDataType, ThreadStackType, HeapSize);
static JSGlobalData*& sharedInstanceInternal();
void createNativeThunk();
-#if ENABLE(JIT) && ENABLE(INTERPRETER)
+#if ENABLE(JIT) && ENABLE(CLASSIC_INTERPRETER)
bool m_canUseJIT;
#endif
#if ENABLE(GC_VALIDATION)
Modified: trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp (108019 => 108020)
--- trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp 2012-02-17 04:10:00 UTC (rev 108020)
@@ -102,7 +102,7 @@
result = mmap(result, bytes, protection, flags, fd, 0);
if (result == MAP_FAILED) {
- #if ENABLE(INTERPRETER)
+ #if ENABLE(CLASSIC_INTERPRETER)
if (executable)
result = 0;
else
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (108019 => 108020)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2012-02-17 03:50:29 UTC (rev 108019)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2012-02-17 04:10:00 UTC (rev 108020)
@@ -597,11 +597,11 @@
#define WTF_USE_PTHREADS 1
#if PLATFORM(IOS_SIMULATOR)
- #define ENABLE_INTERPRETER 1
+ #define ENABLE_CLASSIC_INTERPRETER 1
#define ENABLE_JIT 0
#define ENABLE_YARR_JIT 0
#else
- #define ENABLE_INTERPRETER 1
+ #define ENABLE_CLASSIC_INTERPRETER 1
#define ENABLE_JIT 1
#define ENABLE_YARR_JIT 1
#endif
@@ -956,10 +956,10 @@
#endif
/* Ensure that either the JIT or the interpreter has been enabled. */
-#if !defined(ENABLE_INTERPRETER) && !ENABLE(JIT)
-#define ENABLE_INTERPRETER 1
+#if !defined(ENABLE_CLASSIC_INTERPRETER) && !ENABLE(JIT)
+#define ENABLE_CLASSIC_INTERPRETER 1
#endif
-#if !(ENABLE(JIT) || ENABLE(INTERPRETER))
+#if !(ENABLE(JIT) || ENABLE(CLASSIC_INTERPRETER))
#error You have to have at least one execution model enabled to build JSC
#endif
@@ -992,8 +992,8 @@
#if COMPILER(GCC) || (RVCT_VERSION_AT_LEAST(4, 0, 0, 0) && defined(__GNUC__))
#define HAVE_COMPUTED_GOTO 1
#endif
-#if HAVE(COMPUTED_GOTO) && ENABLE(INTERPRETER)
-#define ENABLE_COMPUTED_GOTO_INTERPRETER 1
+#if HAVE(COMPUTED_GOTO) && ENABLE(CLASSIC_INTERPRETER)
+#define ENABLE_COMPUTED_GOTO_CLASSIC_INTERPRETER 1
#endif
/* Regular _expression_ Tracing - Set to 1 to trace RegExp's in jsc. Results dumped at exit */
