JavaScriptCore-1097.3.tar.gz

[apple/javascriptcore.git] / interpreter / RegisterFile.cpp

diff --git a/interpreter/RegisterFile.cpp b/interpreter/RegisterFile.cpp
index 50698f5f010ef3191e7a69eeb2cb772d848e3dbc..b72352781a1bb66a642eb595d1df422a388d5106 100644 (file)
--- a/interpreter/RegisterFile.cpp
+++ b/interpreter/RegisterFile.cpp
@@ -29,17 +29,79 @@
 #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()
 {
-#if HAVE(MMAP)
-    munmap(m_buffer, ((m_max - m_start) + m_maxGlobals) * sizeof(Register));
-#elif HAVE(VIRTUALALLOC)
-    VirtualFree(m_buffer, 0, MEM_RELEASE);
-#else
-    #error "Don't know how to release virtual memory on this platform."
-#endif
+    void* base = m_reservation.base();
+    m_reservation.decommit(base, reinterpret_cast<intptr_t>(m_commitEnd) - reinterpret_cast<intptr_t>(base));
+    addToCommittedByteCount(-(reinterpret_cast<intptr_t>(m_commitEnd) - reinterpret_cast<intptr_t>(base)));
+    m_reservation.deallocate();
+}
+
+bool RegisterFile::growSlowCase(Register* newEnd)
+{
+    if (newEnd <= m_commitEnd) {
+        m_end = newEnd;
+        return true;
+    }
+
+    long delta = roundUpAllocationSize(reinterpret_cast<char*>(newEnd) - reinterpret_cast<char*>(m_commitEnd), commitSize);
+    if (reinterpret_cast<char*>(m_commitEnd) + delta > static_cast<char*>(m_reservation.base()) + m_reservation.size())
+        return false;
+
+    m_reservation.commit(m_commitEnd, delta);
+    addToCommittedByteCount(delta);
+    m_commitEnd = reinterpret_cast_ptr<Register*>(reinterpret_cast<char*>(m_commitEnd) + delta);
+    m_end = newEnd;
+    return true;
+}
+
+void RegisterFile::gatherConservativeRoots(ConservativeRoots& conservativeRoots)
+{
+    conservativeRoots.add(begin(), end());
+}
+
+void RegisterFile::gatherConservativeRoots(ConservativeRoots& conservativeRoots, DFGCodeBlocks& dfgCodeBlocks)
+{
+    conservativeRoots.add(begin(), end(), dfgCodeBlocks);
+}
+
+void RegisterFile::releaseExcessCapacity()
+{
+    ptrdiff_t delta = reinterpret_cast<uintptr_t>(m_commitEnd) - reinterpret_cast<uintptr_t>(m_reservation.base());
+    m_reservation.decommit(m_reservation.base(), delta);
+    addToCommittedByteCount(-delta);
+    m_commitEnd = static_cast<Register*>(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<long>(committedBytesCount) + byteCount > -1);
+    committedBytesCount += byteCount;
 }
 
 } // namespace JSC