Changeset 108358 in webkit for trunk/Source/JavaScriptCore/interpreter/CallFrame.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/CallFrame.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -104 +104 @@
         CallFrame* callerFrame() const { return this[RegisterFile::CallerFrame].callFrame(); }
 #if ENABLE(JIT)
+        bool hasReturnPC() const { return this[RegisterFile::ReturnPC].vPC(); }
         ReturnAddressPtr returnPC() const { return ReturnAddressPtr(this[RegisterFile::ReturnPC].vPC()); }
-        bool hasReturnPC() const { return !!this[RegisterFile::ReturnPC].vPC(); }
-        void clearReturnPC() { registers()[RegisterFile::ReturnPC] = static_cast<Instruction*>(0); }
 #endif
         AbstractPC abstractReturnPC(JSGlobalData& globalData) { return AbstractPC(globalData, this); }
-#if USE(JSVALUE32_64)
-        unsigned bytecodeOffsetForNonDFGCode() const;
-        void setBytecodeOffsetForNonDFGCode(unsigned offset);
-#else
-        unsigned bytecodeOffsetForNonDFGCode() const
+        unsigned bytecodeOffsetForNonDFGCode()
         {
             ASSERT(codeBlock());
@@ -124 +119 @@
             this[RegisterFile::ArgumentCount].tag() = static_cast<int32_t>(offset);
         }
-#endif
 
 #if ENABLE(DFG_JIT)
@@ -141 +135 @@
 #if ENABLE(CLASSIC_INTERPRETER)
         Instruction* returnVPC() const { return this[RegisterFile::ReturnPC].vPC(); }
-#endif
-#if USE(JSVALUE32_64)
-        Instruction* currentVPC() const
-        {
-            return bitwise_cast<Instruction*>(this[RegisterFile::ArgumentCount].tag());
-        }
-        void setCurrentVPC(Instruction* vpc)
-        {
-            this[RegisterFile::ArgumentCount].tag() = bitwise_cast<int32_t>(vpc);
-        }
-#else
-        Instruction* currentVPC() const;
-        void setCurrentVPC(Instruction* vpc);
 #endif