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

Timestamp:

Feb 21, 2012, 8:26:12 AM (13 years ago)

Author:

Adam Roben

Message:

Roll out r108309, r108323, and r108326

They broke the 32-bit Lion build.

Original bugs is <​http://webkit.org/b/75812> <rdar://problem/10079694>.

Source/JavaScriptCore:

• CMakeLists.txt:
• GNUmakefile.am:
• GNUmakefile.list.am:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
• JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• assembler/LinkBuffer.h:
• assembler/MacroAssemblerCodeRef.h:
• bytecode/BytecodeConventions.h: Removed.
• bytecode/CallLinkStatus.cpp:
• bytecode/CallLinkStatus.h:
• bytecode/CodeBlock.cpp:
• bytecode/CodeBlock.h:
• bytecode/GetByIdStatus.cpp:
• bytecode/GetByIdStatus.h:
• bytecode/Instruction.h:
• bytecode/LLIntCallLinkInfo.h: Removed.
• bytecode/MethodCallLinkStatus.cpp:
• bytecode/Opcode.cpp:
• bytecode/Opcode.h:
• bytecode/PutByIdStatus.cpp:
• bytecode/PutByIdStatus.h:
• bytecompiler/BytecodeGenerator.cpp:
• dfg/DFGByteCodeParser.cpp:
• dfg/DFGCapabilities.h:
• dfg/DFGOSRExitCompiler.cpp:
• dfg/DFGOperations.cpp:
• heap/Heap.h:
• heap/MarkStack.cpp:
• heap/MarkedAllocator.h:
• heap/MarkedSpace.h:
• interpreter/CallFrame.cpp:
• interpreter/CallFrame.h:
• interpreter/Interpreter.cpp:
• interpreter/Interpreter.h:
• interpreter/RegisterFile.h:
• jit/ExecutableAllocator.h:
• jit/HostCallReturnValue.cpp: Removed.
• jit/HostCallReturnValue.h: Removed.
• jit/JIT.cpp:
• jit/JITCode.h:
• jit/JITDriver.h:
• jit/JITExceptions.cpp:
• jit/JITInlineMethods.h:
• jit/JITStubs.cpp:
• jit/JITStubs.h:
• jit/JSInterfaceJIT.h:
• llint/LLIntCommon.h: Removed.
• llint/LLIntData.cpp: Removed.
• llint/LLIntData.h: Removed.
• llint/LLIntEntrypoints.cpp: Removed.
• llint/LLIntEntrypoints.h: Removed.
• llint/LLIntExceptions.cpp: Removed.
• llint/LLIntExceptions.h: Removed.
• llint/LLIntOfflineAsmConfig.h: Removed.
• llint/LLIntOffsetsExtractor.cpp: Removed.
• llint/LLIntSlowPaths.cpp: Removed.
• llint/LLIntSlowPaths.h: Removed.
• llint/LLIntThunks.cpp: Removed.
• llint/LLIntThunks.h: Removed.
• llint/LowLevelInterpreter.asm: Removed.
• llint/LowLevelInterpreter.cpp: Removed.
• llint/LowLevelInterpreter.h: Removed.
• offlineasm/armv7.rb: Removed.
• offlineasm/asm.rb: Removed.
• offlineasm/ast.rb: Removed.
• offlineasm/backends.rb: Removed.
• offlineasm/generate_offset_extractor.rb: Removed.
• offlineasm/instructions.rb: Removed.
• offlineasm/offset_extractor_constants.rb: Removed.
• offlineasm/offsets.rb: Removed.
• offlineasm/opt.rb: Removed.
• offlineasm/parser.rb: Removed.
• offlineasm/registers.rb: Removed.
• offlineasm/self_hash.rb: Removed.
• offlineasm/settings.rb: Removed.
• offlineasm/transform.rb: Removed.
• offlineasm/x86.rb: Removed.
• runtime/CodeSpecializationKind.h: Removed.
• runtime/CommonSlowPaths.h:
• runtime/Executable.cpp:
• runtime/Executable.h:
• runtime/ExecutionHarness.h: Removed.
• runtime/JSArray.h:
• runtime/JSCell.h:
• runtime/JSFunction.h:
• runtime/JSGlobalData.cpp:
• runtime/JSGlobalData.h:
• runtime/JSGlobalObject.h:
• runtime/JSObject.h:
• runtime/JSPropertyNameIterator.h:
• runtime/JSString.h:
• runtime/JSTypeInfo.h:
• runtime/JSValue.cpp:
• runtime/JSValue.h:
• runtime/JSVariableObject.h:
• runtime/Options.cpp:
• runtime/Options.h:
• runtime/ScopeChain.h:
• runtime/Structure.cpp:
• runtime/Structure.h:
• runtime/StructureChain.h:
• wtf/InlineASM.h:
• wtf/Platform.h:
• wtf/SentinelLinkedList.h:
• wtf/text/StringImpl.h:

Source/WebCore:

• CMakeLists.txt:

Source/WebKit:

• CMakeLists.txt:

Tools:

• DumpRenderTree/efl/CMakeLists.txt:

File:

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

trunk/Source/JavaScriptCore/interpreter/Interpreter.h

@@ -35 +35 @@
 #include "JSValue.h"
 #include "JSObject.h"
-#include "LLIntData.h"
 #include "Opcode.h"
 #include "RegisterFile.h"
@@ -48 +47 @@
     class FunctionExecutable;
     class JSGlobalObject;
-    class LLIntOffsetsExtractor;
     class ProgramExecutable;
     class Register;
@@ -161 +159 @@
     class Interpreter {
         WTF_MAKE_FAST_ALLOCATED;
+        friend class JIT;
         friend class CachedCall;
-        friend class LLIntOffsetsExtractor;
-        friend class JIT;
     public:
         Interpreter();
-        ~Interpreter();
-        
-        void initialize(LLInt::Data*, bool canUseJIT);
+        
+        void initialize(bool canUseJIT);
 
         RegisterFile& registerFile() { return m_registerFile; }
@@ -175 +171 @@
         {
             ASSERT(m_initialized);
-#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER) || ENABLE(LLINT)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
             return m_opcodeTable[id];
 #else
@@ -185 +181 @@
         {
             ASSERT(m_initialized);
-#if ENABLE(LLINT)
+#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
             ASSERT(isOpcode(opcode));
-            return m_opcodeIDTable.get(opcode);
-#elif ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER)
-            ASSERT(isOpcode(opcode));
-            if (!m_classicEnabled)
+            if (!m_enabled)
                 return static_cast<OpcodeID>(bitwise_cast<uintptr_t>(opcode));
 
@@ -197 +190 @@
             return opcode;
 #endif
-        }
-        
-        bool classicEnabled()
-        {
-            return m_classicEnabled;
         }
 
@@ -272 +260 @@
         RegisterFile m_registerFile;
         
-#if ENABLE(LLINT)
-        Opcode* m_opcodeTable; // Maps OpcodeID => Opcode for compiling
-        HashMap<Opcode, OpcodeID> m_opcodeIDTable; // Maps Opcode => OpcodeID for decompiling
-#elif ENABLE(COMPUTED_GOTO_CLASSIC_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
@@ -283 +268 @@
         bool m_initialized;
 #endif
-        bool m_classicEnabled;
+        bool m_enabled;
     };