Changeset 161582 in webkit

Timestamp:

Jan 9, 2014, 2:07:31 PM (13 years ago)

Author:

mark.lam@apple.com

Message:

CStack: Rename "host zone" to "reserved zone".
​https://bugs.webkit.org/show_bug.cgi?id=126716.

Reviewed by Michael Saboff.

The "zone" is used as a reserve of stack memory for:

1. nominal host code stack usage.
2. stack space for error handling.
3. initial stack space for pushing VMEntrySentinel frames.

The "zone" may reside on the C stack and on the C loop JSStack depending
on context. Hence, the name "host zone" is not quite accurate, and we'll
rename it to "reserved zone".

• interpreter/JSStack.cpp:

(JSC::JSStack::JSStack):
(JSC::JSStack::growSlowCase):
(JSC::JSStack::releaseExcessCapacity):
(JSC::JSStack::setReservedZoneSize):

• interpreter/JSStack.h:
• interpreter/JSStackInlines.h:

(JSC::JSStack::shrink):

• runtime/ErrorHandlingScope.cpp:

(JSC::ErrorHandlingScope::ErrorHandlingScope):
(JSC::ErrorHandlingScope::~ErrorHandlingScope):

• runtime/ErrorHandlingScope.h:
• runtime/JSLock.cpp:

(JSC::JSLock::DropAllLocks::DropAllLocks):
(JSC::JSLock::DropAllLocks::~DropAllLocks):

• runtime/JSLock.h:
• runtime/Options.h:
• runtime/VM.cpp:

(JSC::VM::VM):
(JSC::VM::updateStackLimitWithReservedZoneSize):

• runtime/VM.h:

(JSC::VM::reservedZoneSize):

• runtime/VMEntryScope.cpp:

(JSC::VMEntryScope::VMEntryScope):
(JSC::VMEntryScope::~VMEntryScope):

• runtime/VMEntryScope.h:

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/JSStack.cpp (modified) (5 diffs)
• interpreter/JSStack.h (modified) (2 diffs)
• interpreter/JSStackInlines.h (modified) (1 diff)
• llint/LowLevelInterpreter32_64.asm (modified) (1 diff)
• llint/LowLevelInterpreter64.asm (modified) (1 diff)
• runtime/ErrorHandlingScope.cpp (modified) (2 diffs)
• runtime/ErrorHandlingScope.h (modified) (1 diff)
• runtime/JSLock.cpp (modified) (3 diffs)
• runtime/JSLock.h (modified) (1 diff)
• runtime/Options.h (modified) (1 diff)
• runtime/VM.cpp (modified) (3 diffs)
• runtime/VM.h (modified) (2 diffs)
• runtime/VMEntryScope.cpp (modified) (2 diffs)
• runtime/VMEntryScope.h (modified) (1 diff)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-09  Mark Lam  <mark.lam@apple.com>
+
+        CStack: Rename "host zone" to "reserved zone".
+        https://bugs.webkit.org/show_bug.cgi?id=126716.
+
+        Reviewed by Michael Saboff.
+
+        The "zone" is used as a reserve of stack memory for:
+        1. nominal host code stack usage.
+        2. stack space for error handling.
+        3. initial stack space for pushing VMEntrySentinel frames.
+
+        The "zone" may reside on the C stack and on the C loop JSStack depending
+        on context. Hence, the name "host zone" is not quite accurate, and we'll
+        rename it to "reserved zone".
+
+        * interpreter/JSStack.cpp:
+        (JSC::JSStack::JSStack):
+        (JSC::JSStack::growSlowCase):
+        (JSC::JSStack::releaseExcessCapacity):
+        (JSC::JSStack::setReservedZoneSize):
+        * interpreter/JSStack.h:
+        * interpreter/JSStackInlines.h:
+        (JSC::JSStack::shrink):
+        * runtime/ErrorHandlingScope.cpp:
+        (JSC::ErrorHandlingScope::ErrorHandlingScope):
+        (JSC::ErrorHandlingScope::~ErrorHandlingScope):
+        * runtime/ErrorHandlingScope.h:
+        * runtime/JSLock.cpp:
+        (JSC::JSLock::DropAllLocks::DropAllLocks):
+        (JSC::JSLock::DropAllLocks::~DropAllLocks):
+        * runtime/JSLock.h:
+        * runtime/Options.h:
+        * runtime/VM.cpp:
+        (JSC::VM::VM):
+        (JSC::VM::updateStackLimitWithReservedZoneSize):
+        * runtime/VM.h:
+        (JSC::VM::reservedZoneSize):
+        * runtime/VMEntryScope.cpp:
+        (JSC::VMEntryScope::VMEntryScope):
+        (JSC::VMEntryScope::~VMEntryScope):
+        * runtime/VMEntryScope.h:
+
 2014-01-09  Mark Lam  <mark.lam@apple.com>
 

branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp

@@ -51 +51 @@
 #if ENABLE(LLINT_C_LOOP)
     , m_end(0)
-    , m_hostZoneSizeInRegisters(0)
+    , m_reservedZoneSizeInRegisters(0)
 #endif
 {
@@ -79 +79 @@
 bool JSStack::growSlowCase(Register* newTopOfStack)
 {
-    Register* newTopOfStackWithHostZone = newTopOfStack - m_hostZoneSizeInRegisters;
+    Register* newTopOfStackWithReservedZone = newTopOfStack - m_reservedZoneSizeInRegisters;
 
     // If we have already committed enough memory to satisfy this request,
     // just update the end pointer and return.
-    if (newTopOfStackWithHostZone >= m_commitTop) {
+    if (newTopOfStackWithReservedZone >= m_commitTop) {
         setStackLimit(newTopOfStack);
         return true;
@@ -91 +91 @@
     // have it is still within our budget. If not, we'll fail to grow and
     // return false.
-    ptrdiff_t delta = reinterpret_cast<char*>(m_commitTop) - reinterpret_cast<char*>(newTopOfStackWithHostZone);
+    ptrdiff_t delta = reinterpret_cast<char*>(m_commitTop) - reinterpret_cast<char*>(newTopOfStackWithReservedZone);
     delta = WTF::roundUpToMultipleOf(commitSize, delta);
     Register* newCommitTop = m_commitTop - (delta / sizeof(Register));
@@ -131 +131 @@
 void JSStack::releaseExcessCapacity()
 {
-    Register* highAddressWithHostZone = highAddress() - m_hostZoneSizeInRegisters;
-    ptrdiff_t delta = reinterpret_cast<char*>(highAddressWithHostZone) - reinterpret_cast<char*>(m_commitTop);
+    Register* highAddressWithReservedZone = highAddress() - m_reservedZoneSizeInRegisters;
+    ptrdiff_t delta = reinterpret_cast<char*>(highAddressWithReservedZone) - reinterpret_cast<char*>(m_commitTop);
     m_reservation.decommit(m_commitTop, delta);
     addToCommittedByteCount(-delta);
-    m_commitTop = highAddressWithHostZone;
+    m_commitTop = highAddressWithReservedZone;
 }
 
@@ -150 +150 @@
 }
 
-void JSStack::setHostZoneSize(size_t hostZoneSize)
+void JSStack::setReservedZoneSize(size_t reservedZoneSize)
 {
-    m_hostZoneSizeInRegisters = hostZoneSize / sizeof(Register);
-    if (m_commitTop >= (m_end + 1) - m_hostZoneSizeInRegisters)
+    m_reservedZoneSizeInRegisters = reservedZoneSize / sizeof(Register);
+    if (m_commitTop >= (m_end + 1) - m_reservedZoneSizeInRegisters)
         growSlowCase(m_end + 1);
 }

branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h

@@ -108 +108 @@
         static void initializeThreading();
 
-        void setHostZoneSize(size_t);
+        void setReservedZoneSize(size_t);
 
         CallFrame* pushFrame(class CodeBlock*, JSScope*, int argsCount, JSObject* callee);
@@ -175 +175 @@
         PageReservation m_reservation;
         Register* m_lastStackTop;
-        ptrdiff_t m_hostZoneSizeInRegisters;
+        ptrdiff_t m_reservedZoneSizeInRegisters;
 #endif // ENABLE(LLINT_C_LOOP)
 

branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h

@@ -162 +162 @@
     // assign the constant to a local variable, and use the local instead.
     ptrdiff_t maxExcessCapacity = JSStack::maxExcessCapacity;
-    ptrdiff_t maxExcessInRegisters = std::max(maxExcessCapacity, m_hostZoneSizeInRegisters);
+    ptrdiff_t maxExcessInRegisters = std::max(maxExcessCapacity, m_reservedZoneSizeInRegisters);
     if (m_end == baseOfStack() && (highAddress() - m_commitTop) >= maxExcessInRegisters)
         releaseExcessCapacity();

branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -231 +231 @@
     storep sp, VM::stackPointerAtVMEntry[vm]
 
-    # The stack host zone ensures that we have adequate space for the
+    # The stack reserved zone ensures that we have adequate space for the
     # VMEntrySentinelFrame. Proceed with allocating and initializing the
     # sentinel frame.

branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -122 +122 @@
     checkStackPointerAlignment(temp2, 0xbad0dc01)
 
-    # The stack host zone ensures that we have adequate space for the
+    # The stack reserved zone ensures that we have adequate space for the
     # VMEntrySentinelFrame. Proceed with allocating and initializing the
     # sentinel frame.

branches/jsCStack/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp

@@ -38 +38 @@
     if (!m_vm.stackPointerAtVMEntry)
         m_vm.stackPointerAtVMEntry = this;
-    size_t newHostZoneSize = Options::errorModeHostZoneSize();
-    m_savedHostZoneSize = m_vm.updateStackLimitWithHostZoneSize(newHostZoneSize);
+    size_t newReservedZoneSize = Options::errorModeReservedZoneSize();
+    m_savedReservedZoneSize = m_vm.updateStackLimitWithReservedZoneSize(newReservedZoneSize);
 #if ENABLE(LLINT_C_LOOP)
-    m_vm.interpreter->stack().setHostZoneSize(newHostZoneSize);
+    m_vm.interpreter->stack().setReservedZoneSize(newReservedZoneSize);
 #endif
 }
@@ -49 +49 @@
     if (m_vm.stackPointerAtVMEntry == this)
         m_vm.stackPointerAtVMEntry = nullptr;
-    m_vm.updateStackLimitWithHostZoneSize(m_savedHostZoneSize);
+    m_vm.updateStackLimitWithReservedZoneSize(m_savedReservedZoneSize);
 #if ENABLE(LLINT_C_LOOP)
-    m_vm.interpreter->stack().setHostZoneSize(m_savedHostZoneSize);
+    m_vm.interpreter->stack().setReservedZoneSize(m_savedReservedZoneSize);
 #endif
 }

branches/jsCStack/Source/JavaScriptCore/runtime/ErrorHandlingScope.h

@@ -37 +37 @@
 private:
     VM& m_vm;
-    size_t m_savedHostZoneSize;
+    size_t m_savedReservedZoneSize;
 };
 

branches/jsCStack/Source/JavaScriptCore/runtime/JSLock.cpp

@@ -291 +291 @@
     SpinLockHolder holder(&spinLock);
 #endif
-    m_savedHostZoneSize = m_vm->hostZoneSize();
+    m_savedReservedZoneSize = m_vm->reservedZoneSize();
     m_savedStackPointerAtVMEntry = m_vm->stackPointerAtVMEntry;
     m_vm->stackPointerAtVMEntry = nullptr;
@@ -311 +311 @@
     SpinLockHolder holder(&spinLock);
 #endif
-    m_savedHostZoneSize = m_vm->hostZoneSize();
+    m_savedReservedZoneSize = m_vm->reservedZoneSize();
     m_savedStackPointerAtVMEntry = m_vm->stackPointerAtVMEntry;
     m_vm->stackPointerAtVMEntry = nullptr;
@@ -332 +332 @@
 
     m_vm->stackPointerAtVMEntry = m_savedStackPointerAtVMEntry;
-    m_vm->updateStackLimitWithHostZoneSize(m_savedHostZoneSize);
+    m_vm->updateStackLimitWithReservedZoneSize(m_savedReservedZoneSize);
 }
 

branches/jsCStack/Source/JavaScriptCore/runtime/JSLock.h

@@ -111 +111 @@
             intptr_t m_lockCount;
             RefPtr<VM> m_vm;
-            size_t m_savedHostZoneSize;
+            size_t m_savedReservedZoneSize;
             void* m_savedStackPointerAtVMEntry;
         };

branches/jsCStack/Source/JavaScriptCore/runtime/Options.h

@@ -97 +97 @@
     \
     v(unsigned, maxPerThreadStackUsage, 4 * MB) \
-    v(unsigned, hostZoneSize, 128 * KB) \
-    v(unsigned, errorModeHostZoneSize, 64 * KB) \
+    v(unsigned, reservedZoneSize, 128 * KB) \
+    v(unsigned, errorModeReservedZoneSize, 64 * KB) \
     \
     v(bool, crashIfCantAllocateJITMemory, false) \

branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp

@@ -230 +230 @@
     interpreter = new Interpreter(*this);
     StackBounds stack = wtfThreadData().stack();
-    updateStackLimitWithHostZoneSize(Options::hostZoneSize());
+    updateStackLimitWithReservedZoneSize(Options::reservedZoneSize());
 #if ENABLE(LLINT_C_LOOP)
-    interpreter->stack().setHostZoneSize(Options::hostZoneSize());
+    interpreter->stack().setReservedZoneSize(Options::reservedZoneSize());
 #endif
     setLastStackTop(stack.origin());
@@ -716 +716 @@
 }
 
-size_t VM::updateStackLimitWithHostZoneSize(size_t hostZoneSize)
-{
-    size_t oldHostZoneSize = m_hostZoneSize;
-    m_hostZoneSize = hostZoneSize;
+size_t VM::updateStackLimitWithReservedZoneSize(size_t reservedZoneSize)
+{
+    size_t oldReservedZoneSize = m_reservedZoneSize;
+    m_reservedZoneSize = reservedZoneSize;
 
     void* stackLimit;
@@ -725 +725 @@
         ASSERT(wtfThreadData().stack().isGrowingDownward());
         char* startOfStack = reinterpret_cast<char*>(stackPointerAtVMEntry);
-        char* desiredStackLimit = startOfStack - Options::maxPerThreadStackUsage() + hostZoneSize;
-        stackLimit = wtfThreadData().stack().recursionLimit(hostZoneSize, desiredStackLimit);
+        char* desiredStackLimit = startOfStack - Options::maxPerThreadStackUsage() + reservedZoneSize;
+        stackLimit = wtfThreadData().stack().recursionLimit(reservedZoneSize, desiredStackLimit);
     } else
-        stackLimit = wtfThreadData().stack().recursionLimit(hostZoneSize);
+        stackLimit = wtfThreadData().stack().recursionLimit(reservedZoneSize);
 
     setStackLimit(stackLimit);
-    return oldHostZoneSize;
+    return oldReservedZoneSize;
 }
 

branches/jsCStack/Source/JavaScriptCore/runtime/VM.h

@@ -376 +376 @@
         JS_EXPORT_PRIVATE JSObject* throwException(ExecState*, JSObject*);
         
-        size_t hostZoneSize() const { return m_hostZoneSize; }
-        size_t updateStackLimitWithHostZoneSize(size_t hostZoneSize);
+        size_t reservedZoneSize() const { return m_reservedZoneSize; }
+        size_t updateStackLimitWithReservedZoneSize(size_t reservedZoneSize);
 
         void** addressOfJSStackLimit() { return &m_jsStackLimit; }
@@ -514 +514 @@
         const ClassInfo* m_initializingObjectClass;
 #endif
-        size_t m_hostZoneSize;
+        size_t m_reservedZoneSize;
 #if ENABLE(LLINT_C_LOOP)
         struct {

branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp

@@ -52 +52 @@
     if (!vm.stackPointerAtVMEntry) {
         vm.stackPointerAtVMEntry = this;
-        m_savedHostZoneSize = vm.updateStackLimitWithHostZoneSize(Options::hostZoneSize());
+        m_savedReservedZoneSize = vm.updateStackLimitWithReservedZoneSize(Options::reservedZoneSize());
     }
 
@@ -65 +65 @@
     if (m_vm.stackPointerAtVMEntry == this) {
         m_vm.stackPointerAtVMEntry = nullptr;
-        m_vm.updateStackLimitWithHostZoneSize(m_savedHostZoneSize);
+        m_vm.updateStackLimitWithReservedZoneSize(m_savedReservedZoneSize);
     }
 }

branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h

@@ -47 +47 @@
     StackStats::CheckPoint m_stackCheckPoint;
     JSGlobalObject* m_globalObject;
-    size_t m_savedHostZoneSize;
+    size_t m_savedReservedZoneSize;
 };