Changeset 63056 in webkit for trunk/JavaScriptCore/interpreter/Interpreter.h

Timestamp:

Jul 10, 2010, 6:14:47 PM (15 years ago)

Author:

[email protected]

Message:

2010-07-10 Oliver Hunt <​[email protected]>

Reviewed by Maciej Stachowiak.

HAVE_COMPUTED_GOTO is dependent on the interpreter being enabled
​https://bugs.webkit.org/show_bug.cgi?id=42039

Separate the existence of computed goto support in the compiler
from whether or not we are using the interpreter. All the current
HAVE(COMPUTED_GOTO) guards are for the interpreter, but I'd like
the option of using it elsewhere. The interpreter now uses
ENABLE(COMPUTED_GOTO_INTERPRETER)

• bytecode/Instruction.h: (JSC::Instruction::Instruction):
• bytecode/Opcode.h:
• interpreter/Interpreter.cpp: (JSC::Interpreter::Interpreter): (JSC::Interpreter::isOpcode): (JSC::Interpreter::privateExecute):
• interpreter/Interpreter.h: (JSC::Interpreter::getOpcode): (JSC::Interpreter::getOpcodeID):
• wtf/Platform.h:

File:

• trunk/JavaScriptCore/interpreter/Interpreter.h (modified) (3 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.h

@@ -76 +76 @@
         Opcode getOpcode(OpcodeID id)
         {
-            #if HAVE(COMPUTED_GOTO)
+            #if ENABLE(COMPUTED_GOTO_INTERPRETER)
                 return m_opcodeTable[id];
             #else
@@ -85 +85 @@
         OpcodeID getOpcodeID(Opcode opcode)
         {
-            #if HAVE(COMPUTED_GOTO)
+            #if ENABLE(COMPUTED_GOTO_INTERPRETER)
                 ASSERT(isOpcode(opcode));
                 return m_opcodeIDTable.get(opcode);
@@ -160 +160 @@
         RegisterFile m_registerFile;
         
-#if HAVE(COMPUTED_GOTO)
+#if ENABLE(COMPUTED_GOTO_INTERPRETER)
         Opcode m_opcodeTable[numOpcodeIDs]; // Maps OpcodeID => Opcode for compiling
         HashMap<Opcode, OpcodeID> m_opcodeIDTable; // Maps Opcode => OpcodeID for decompiling