Changeset 66150 in webkit for trunk/JavaScriptCore/assembler

Timestamp:

Aug 26, 2010, 4:21:24 PM (15 years ago)

Author:

[email protected]

Message:

Rolling out r64608, this regressed performance.

• JavaScriptCore.xcodeproj/project.pbxproj:
• assembler/ARMAssembler.cpp:

(JSC::ARMAssembler::executableCopy):

• assembler/LinkBuffer.h:

(JSC::LinkBuffer::LinkBuffer):
(JSC::LinkBuffer::~LinkBuffer):
(JSC::LinkBuffer::performFinalization):

• assembler/MIPSAssembler.h:

(JSC::MIPSAssembler::executableCopy):

• assembler/X86Assembler.h:

(JSC::X86Assembler::executableCopy):

• bytecode/StructureStubInfo.h:

(JSC::StructureStubInfo::initGetByIdProto):
(JSC::StructureStubInfo::initGetByIdChain):
(JSC::StructureStubInfo::initGetByIdSelfList):
(JSC::StructureStubInfo::initGetByIdProtoList):
(JSC::StructureStubInfo::initPutByIdTransition):

• jit/ExecutableAllocator.cpp:

(JSC::ExecutablePool::systemAlloc):

• jit/ExecutableAllocator.h:

(JSC::ExecutablePool::create):
(JSC::ExecutableAllocator::ExecutableAllocator):
(JSC::ExecutableAllocator::poolForSize):
(JSC::ExecutablePool::ExecutablePool):
(JSC::ExecutablePool::poolAllocate):

• jit/ExecutableAllocatorFixedVMPool.cpp:

(JSC::FixedVMPoolAllocator::allocInternal):

• jit/JIT.cpp:

(JSC::JIT::privateCompile):

• jit/JIT.h:

(JSC::JIT::compileGetByIdProto):
(JSC::JIT::compileGetByIdSelfList):
(JSC::JIT::compileGetByIdProtoList):
(JSC::JIT::compileGetByIdChainList):
(JSC::JIT::compileGetByIdChain):
(JSC::JIT::compilePutByIdTransition):
(JSC::JIT::compilePatchGetArrayLength):

• jit/JITOpcodes.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):
(JSC::JIT::privateCompileCTINativeCall):

• jit/JITPropertyAccess.cpp:

(JSC::JIT::stringGetByValStubGenerator):
(JSC::JIT::privateCompilePutByIdTransition):
(JSC::JIT::privateCompilePatchGetArrayLength):
(JSC::JIT::privateCompileGetByIdProto):
(JSC::JIT::privateCompileGetByIdSelfList):
(JSC::JIT::privateCompileGetByIdProtoList):
(JSC::JIT::privateCompileGetByIdChainList):
(JSC::JIT::privateCompileGetByIdChain):

• jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::stringGetByValStubGenerator):
(JSC::JIT::privateCompilePutByIdTransition):
(JSC::JIT::privateCompilePatchGetArrayLength):
(JSC::JIT::privateCompileGetByIdProto):
(JSC::JIT::privateCompileGetByIdSelfList):
(JSC::JIT::privateCompileGetByIdProtoList):
(JSC::JIT::privateCompileGetByIdChainList):
(JSC::JIT::privateCompileGetByIdChain):

• jit/JITStubs.cpp:

(JSC::JITThunks::tryCachePutByID):
(JSC::JITThunks::tryCacheGetByID):
(JSC::DEFINE_STUB_FUNCTION):
(JSC::getPolymorphicAccessStructureListSlot):

• jit/JITStubs.h:
• jit/SpecializedThunkJIT.h:

(JSC::SpecializedThunkJIT::finalize):

• runtime/ExceptionHelpers.cpp:
• runtime/ExceptionHelpers.h:
• runtime/Executable.cpp:

(JSC::EvalExecutable::compileInternal):
(JSC::ProgramExecutable::compileInternal):
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):
(JSC::FunctionExecutable::reparseExceptionInfo):
(JSC::EvalExecutable::reparseExceptionInfo):

• yarr/RegexJIT.cpp:

(JSC::Yarr::RegexGenerator::compile):

Location:

trunk/JavaScriptCore/assembler

Files:

• ARMAssembler.cpp (modified) (1 diff)
• LinkBuffer.h (modified) (5 diffs)
• MIPSAssembler.h (modified) (1 diff)
• X86Assembler.h (modified) (1 diff)

trunk/JavaScriptCore/assembler/ARMAssembler.cpp

@@ -352 +352 @@
 
     char* data = reinterpret_cast<char*>(m_buffer.executableCopy(allocator));
-    if (!data)
-        return 0;
 
     for (Jumps::Iterator iter = m_jumps.begin(); iter != m_jumps.end(); ++iter) {

trunk/JavaScriptCore/assembler/LinkBuffer.h

@@ -63 +63 @@
 #endif
 
-    enum LinkBufferState {
-        StateInit,
-        StateChecked,
-        StateFinalized,
-    };
-
 public:
     // Note: Initialization sequence is significant, since executablePool is a PassRefPtr.
@@ -80 +74 @@
         , m_assembler(masm)
 #ifndef NDEBUG
-        , m_state(StateInit)
+        , m_completed(false)
 #endif
     {
@@ -88 +82 @@
     ~LinkBuffer()
     {
-        ASSERT(m_state == StateFinalized);
-    }
-
-    // After constructing a link buffer, a client must call allocationSuccessful() to check alloc did not return 0.
-    bool allocationSuccessful()
-    {
-#ifndef NDEBUG
-        ASSERT(m_state == StateInit);
-        m_state = StateChecked;
-#endif
-
-        return m_code;
+        ASSERT(m_completed);
     }
 
@@ -285 +268 @@
     {
 #ifndef NDEBUG
-        ASSERT(m_state == StateChecked);
-        m_state = StateFinalized;
+        ASSERT(!m_completed);
+        m_completed = true;
 #endif
 
@@ -298 +281 @@
     MacroAssembler* m_assembler;
 #ifndef NDEBUG
-    LinkBufferState m_state;
+    bool m_completed;
 #endif
 };

trunk/JavaScriptCore/assembler/MIPSAssembler.h

@@ -690 +690 @@
     {
         void *result = m_buffer.executableCopy(allocator);
-        if (result)
-            relocateJumps(m_buffer.data(), result);
+        if (!result)
+            return 0;
+
+        relocateJumps(m_buffer.data(), result);
         return result;
     }

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -1627 +1627 @@
     void* executableCopy(ExecutablePool* allocator)
     {
-        return m_formatter.executableCopy(allocator);
+        void* copy = m_formatter.executableCopy(allocator);
+        ASSERT(copy);
+        return copy;
     }