Changeset 103292 in webkit for trunk/Source/JavaScriptCore/interpreter/Interpreter.h

Timestamp:

Dec 19, 2011, 6:42:06 PM (13 years ago)

Author:

[email protected]

Message:

If we detect that we can use the JIT, don't use computed opcode lookups
​https://bugs.webkit.org/show_bug.cgi?id=74899
<rdar://problem/10604551>

Reviewed by Gavin Barraclough.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::Interpreter):
(JSC::Interpreter::initialize):
(JSC::Interpreter::privateExecute):

• interpreter/Interpreter.h:

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

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::JSGlobalData):

File:

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

trunk/Source/JavaScriptCore/interpreter/Interpreter.h

@@ -95 +95 @@
     public:
         Interpreter();
+        
+        void initialize(bool canUseJIT);
 
         RegisterFile& registerFile() { return m_registerFile; }
@@ -100 +102 @@
         Opcode getOpcode(OpcodeID id)
         {
-            #if ENABLE(COMPUTED_GOTO_INTERPRETER)
-                return m_opcodeTable[id];
-            #else
-                return id;
-            #endif
+            ASSERT(m_initialized);
+#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+            return m_opcodeTable[id];
+#else
+            return id;
+#endif
         }
 
         OpcodeID getOpcodeID(Opcode opcode)
         {
-            #if ENABLE(COMPUTED_GOTO_INTERPRETER)
-                ASSERT(isOpcode(opcode));
-                return m_opcodeIDTable.get(opcode);
-            #else
-                return opcode;
-            #endif
+            ASSERT(m_initialized);
+#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+            ASSERT(isOpcode(opcode));
+            if (!m_enabled) {
+                OpcodeID result = static_cast<OpcodeID>(bitwise_cast<uintptr_t>(opcode));
+                ASSERT(result == m_opcodeIDTable.get(opcode));
+                return result;
+            }
+            return m_opcodeIDTable.get(opcode);
+#else
+            return opcode;
+#endif
         }
 
@@ -187 +196 @@
         HashMap<Opcode, OpcodeID> m_opcodeIDTable; // Maps Opcode => OpcodeID for decompiling
 #endif
+
+#if !ASSERT_DISABLED
+        bool m_initialized;
+#endif
+        bool m_enabled;
     };