From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Oct 2012 16:21:14 +0200 Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes --- Source/JavaScriptCore/interpreter/RegisterFile.cpp | 107 --------------------- 1 file changed, 107 deletions(-) delete mode 100644 Source/JavaScriptCore/interpreter/RegisterFile.cpp (limited to 'Source/JavaScriptCore/interpreter/RegisterFile.cpp') diff --git a/Source/JavaScriptCore/interpreter/RegisterFile.cpp b/Source/JavaScriptCore/interpreter/RegisterFile.cpp deleted file mode 100644 index dacb53872..000000000 --- a/Source/JavaScriptCore/interpreter/RegisterFile.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2008 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "RegisterFile.h" - -#include "ConservativeRoots.h" -#include "Interpreter.h" - -namespace JSC { - -static size_t committedBytesCount = 0; - -static Mutex& registerFileStatisticsMutex() -{ - DEFINE_STATIC_LOCAL(Mutex, staticMutex, ()); - return staticMutex; -} - -RegisterFile::~RegisterFile() -{ - void* base = m_reservation.base(); - m_reservation.decommit(base, reinterpret_cast(m_commitEnd) - reinterpret_cast(base)); - addToCommittedByteCount(-(reinterpret_cast(m_commitEnd) - reinterpret_cast(base))); - m_reservation.deallocate(); -} - -bool RegisterFile::growSlowCase(Register* newEnd) -{ - if (newEnd <= m_commitEnd) { - m_end = newEnd; - return true; - } - - long delta = roundUpAllocationSize(reinterpret_cast(newEnd) - reinterpret_cast(m_commitEnd), commitSize); - if (reinterpret_cast(m_commitEnd) + delta > static_cast(m_reservation.base()) + m_reservation.size()) - return false; - - m_reservation.commit(m_commitEnd, delta); - addToCommittedByteCount(delta); - m_commitEnd = reinterpret_cast_ptr(reinterpret_cast(m_commitEnd) + delta); - m_end = newEnd; - return true; -} - -void RegisterFile::gatherConservativeRoots(ConservativeRoots& conservativeRoots) -{ - conservativeRoots.add(begin(), end()); -} - -void RegisterFile::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, DFGCodeBlocks& dfgCodeBlocks) -{ - conservativeRoots.add(begin(), end(), jitStubRoutines, dfgCodeBlocks); -} - -void RegisterFile::releaseExcessCapacity() -{ - ptrdiff_t delta = reinterpret_cast(m_commitEnd) - reinterpret_cast(m_reservation.base()); - m_reservation.decommit(m_reservation.base(), delta); - addToCommittedByteCount(-delta); - m_commitEnd = static_cast(m_reservation.base()); -} - -void RegisterFile::initializeThreading() -{ - registerFileStatisticsMutex(); -} - -size_t RegisterFile::committedByteCount() -{ - MutexLocker locker(registerFileStatisticsMutex()); - return committedBytesCount; -} - -void RegisterFile::addToCommittedByteCount(long byteCount) -{ - MutexLocker locker(registerFileStatisticsMutex()); - ASSERT(static_cast(committedBytesCount) + byteCount > -1); - committedBytesCount += byteCount; -} - -} // namespace JSC -- cgit v1.2.1