Changeset 120175 in webkit for trunk/Source/JavaScriptCore/assembler/X86Assembler.h

Timestamp:

Jun 13, 2012, 2:38:42 AM (13 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r120172.
​http://trac.webkit.org/changeset/120172
​https://bugs.webkit.org/show_bug.cgi?id=88976

The patch causes compilation failures on Gtk, Qt and Apple Win
bots (Requested by zdobersek on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2012-06-13

Source/JavaScriptCore:

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• assembler/ARMv7Assembler.h:

(JSC::ARMv7Assembler::nop):
(JSC::ARMv7Assembler::label):
(JSC::ARMv7Assembler::readPointer):
(ARMv7Assembler):

• assembler/AbstractMacroAssembler.h:

(JSC):
(AbstractMacroAssembler):
(Label):

• assembler/AssemblerBuffer.h:
• assembler/MacroAssemblerARM.h:
• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::nop):
(JSC::MacroAssemblerARMv7::jump):
(JSC::MacroAssemblerARMv7::makeBranch):

• assembler/MacroAssemblerMIPS.h:
• assembler/MacroAssemblerSH4.h:
• assembler/MacroAssemblerX86.h:

(MacroAssemblerX86):
(JSC::MacroAssemblerX86::moveWithPatch):

• assembler/MacroAssemblerX86Common.h:
• assembler/MacroAssemblerX86_64.h:

(JSC::MacroAssemblerX86_64::branchTest8):

• assembler/X86Assembler.h:

(JSC::X86Assembler::cmpb_im):
(JSC::X86Assembler::codeSize):
(JSC::X86Assembler::label):
(JSC::X86Assembler::X86InstructionFormatter::memoryModRM):

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):

• bytecode/CodeBlock.h:

(JSC::CodeBlock::appendOSRExit):
(JSC::CodeBlock::appendSpeculationRecovery):
(DFGData):

• bytecode/DFGExitProfile.h:

(JSC::DFG::exitKindToString):
(JSC::DFG::exitKindIsCountable):

• bytecode/Instruction.h:
• bytecode/Opcode.h:

(JSC):
(JSC::padOpcodeName):

• bytecode/Watchpoint.cpp: Removed.
• bytecode/Watchpoint.h: Removed.
• bytecompiler/BytecodeGenerator.cpp:

(JSC::ResolveResult::checkValidity):
(JSC::BytecodeGenerator::addGlobalVar):
(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::resolve):
(JSC::BytecodeGenerator::emitResolve):
(JSC::BytecodeGenerator::emitResolveWithBase):
(JSC::BytecodeGenerator::emitResolveWithThis):
(JSC::BytecodeGenerator::emitGetStaticVar):
(JSC::BytecodeGenerator::emitPutStaticVar):

• bytecompiler/BytecodeGenerator.h:

(BytecodeGenerator):

• bytecompiler/NodesCodegen.cpp:

(JSC::FunctionCallResolveNode::emitBytecode):
(JSC::PostfixResolveNode::emitBytecode):
(JSC::PrefixResolveNode::emitBytecode):
(JSC::ReadModifyResolveNode::emitBytecode):
(JSC::AssignResolveNode::emitBytecode):
(JSC::ConstDeclNode::emitCodeSingle):

• dfg/DFGAbstractState.cpp:

(JSC::DFG::AbstractState::execute):
(JSC::DFG::AbstractState::clobberStructures):

• dfg/DFGAbstractState.h:

(AbstractState):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::handleInlining):
(JSC::DFG::ByteCodeParser::parseBlock):

• dfg/DFGCCallHelpers.h:

(JSC::DFG::CCallHelpers::setupArguments):

• dfg/DFGCSEPhase.cpp:

(JSC::DFG::CSEPhase::globalVarStoreElimination):
(JSC::DFG::CSEPhase::performNodeCSE):

• dfg/DFGCapabilities.h:

(JSC::DFG::canCompileOpcode):

• dfg/DFGConstantFoldingPhase.cpp:

(JSC::DFG::ConstantFoldingPhase::run):

• dfg/DFGCorrectableJumpPoint.h:
• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::linkOSRExits):
(JSC::DFG::JITCompiler::link):

• dfg/DFGNode.h:

(JSC::DFG::Node::hasRegisterPointer):

• dfg/DFGNodeType.h:

(DFG):

• dfg/DFGOSRExit.cpp:

(JSC::DFG::OSRExit::OSRExit):

• dfg/DFGOSRExit.h:

(OSRExit):

• dfg/DFGOperations.cpp:
• dfg/DFGOperations.h:
• dfg/DFGPredictionPropagationPhase.cpp:

(JSC::DFG::PredictionPropagationPhase::propagate):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::callOperation):
(JSC::DFG::SpeculativeJIT::appendCallSetResult):
(JSC::DFG::SpeculativeJIT::speculationCheck):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):
(JSC::JIT::privateCompileSlowCases):

• jit/JIT.h:
• jit/JITPropertyAccess.cpp:
• jit/JITPropertyAccess32_64.cpp:
• jit/JITStubs.cpp:
• jit/JITStubs.h:
• llint/LLIntSlowPaths.cpp:
• llint/LLIntSlowPaths.h:

(LLInt):

• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• runtime/JSObject.cpp:

(JSC::JSObject::removeDirect):

• runtime/JSObject.h:

(JSObject):

• runtime/JSSymbolTableObject.h:

(JSC::symbolTableGet):
(JSC::symbolTablePut):
(JSC::symbolTablePutWithAttributes):

• runtime/SymbolTable.cpp: Removed.
• runtime/SymbolTable.h:

(JSC):
(JSC::SymbolTableEntry::isNull):
(JSC::SymbolTableEntry::getIndex):
(SymbolTableEntry):
(JSC::SymbolTableEntry::getAttributes):
(JSC::SymbolTableEntry::isReadOnly):
(JSC::SymbolTableEntry::pack):
(JSC::SymbolTableEntry::isValidIndex):

Source/WTF:

• wtf/SegmentedVector.h:

(WTF):
(SegmentedVectorIterator):
(WTF::SegmentedVectorIterator::operator=):
(WTF::SegmentedVectorIterator::SegmentedVectorIterator):
(SegmentedVector):

LayoutTests:

• fast/js/dfg-call-function-hit-watchpoint-expected.txt: Removed.
• fast/js/dfg-call-function-hit-watchpoint.html: Removed.
• fast/js/jsc-test-list:
• fast/js/script-tests/dfg-call-function-hit-watchpoint.js: Removed.

File:

• trunk/Source/JavaScriptCore/assembler/X86Assembler.h (modified) (7 diffs)

trunk/Source/JavaScriptCore/assembler/X86Assembler.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -248 +248 @@
 
     X86Assembler()
-        : m_indexOfLastWatchpoint(INT_MIN)
-        , m_indexOfTailOfLastWatchpoint(INT_MIN)
     {
     }
@@ -801 +799 @@
         m_formatter.immediate8(imm);
     }
-    
-#if CPU(X86)
-    void cmpb_im(int imm, const void* addr)
-    {
-        m_formatter.oneByteOp(OP_GROUP1_EbIb, GROUP1_OP_CMP, addr);
-        m_formatter.immediate8(imm);
-    }
-#endif
 
     void cmpl_im(int imm, int offset, RegisterID base, RegisterID index, int scale)
@@ -958 +948 @@
         m_formatter.immediate8(imm);
     }
-
-#if CPU(X86)
-    void testb_im(int imm, const void* addr)
-    {
-        m_formatter.oneByteOp(OP_GROUP3_EbIb, GROUP3_OP_TEST, addr);
-        m_formatter.immediate8(imm);
-    }
-#endif
 
     void testl_i32m(int imm, int offset, RegisterID base, RegisterID index, int scale)
@@ -1721 +1703 @@
         return m_formatter.codeSize();
     }
-    
-    AssemblerLabel labelForWatchpoint()
-    {
-        AssemblerLabel result = m_formatter.label();
-        if (static_cast<int>(result.m_offset) != m_indexOfLastWatchpoint)
-            result = label();
-        m_indexOfLastWatchpoint = result.m_offset;
-        m_indexOfTailOfLastWatchpoint = result.m_offset + maxJumpReplacementSize();
-        return result;
-    }
 
     AssemblerLabel label()
     {
-        AssemblerLabel result = m_formatter.label();
-        while (UNLIKELY(static_cast<int>(result.m_offset) < m_indexOfTailOfLastWatchpoint)) {
-            nop();
-            result = m_formatter.label();
-        }
-        return result;
+        return m_formatter.label();
     }
 
@@ -1821 +1788 @@
     }
 
-    static void replaceWithJump(void* instructionStart, void* to)
-    {
-        uint8_t* ptr = reinterpret_cast<uint8_t*>(instructionStart);
-        uint8_t* dstPtr = reinterpret_cast<uint8_t*>(to);
-        intptr_t distance = (intptr_t)(dstPtr - (ptr + 5));
-        ptr[0] = static_cast<uint8_t>(OP_JMP_rel32);
-        *reinterpret_cast<int32_t*>(ptr + 1) = static_cast<int32_t>(distance);
-    }
-    
-    static ptrdiff_t maxJumpReplacementSize()
-    {
-        return 5;
-    }
-    
     static unsigned getCallReturnOffset(AssemblerLabel call)
     {
@@ -2387 +2340 @@
         AssemblerBuffer m_buffer;
     } m_formatter;
-    int m_indexOfLastWatchpoint;
-    int m_indexOfTailOfLastWatchpoint;
 };