Changeset 161027 in webkit

Timestamp:

Dec 23, 2013, 3:17:25 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

CStack: Cosmetic: rename JSStack::m_useableEnd to m_useableTop.
​https://bugs.webkit.org/show_bug.cgi?id=126184.

Not yet reviewed.

In JSStack::enableErrorStackReserve() and disableErrorStackReserve(),
m_useableEnd is initialize to reservationTop() or reservationTop() +
commitSize. Hence, it points to an allocatable slot in the stack, not
past it. Naming it m_useableTop is more correct.

• interpreter/JSStack.cpp:

(JSC::JSStack::growSlowCase):
(JSC::JSStack::enableErrorStackReserve):
(JSC::JSStack::disableErrorStackReserve):

• interpreter/JSStack.h:

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/JSStack.cpp (modified) (2 diffs)
• interpreter/JSStack.h (modified) (1 diff)

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-23  Mark Lam  <mark.lam@apple.com>
+
+        CStack: Cosmetic: rename JSStack::m_useableEnd to m_useableTop.
+        https://bugs.webkit.org/show_bug.cgi?id=126184.
+
+        Not yet reviewed.
+
+        In JSStack::enableErrorStackReserve() and disableErrorStackReserve(),
+        m_useableEnd is initialize to reservationTop() or reservationTop() +
+        commitSize. Hence, it points to an allocatable slot in the stack, not
+        past it. Naming it m_useableTop is more correct.
+
+        * interpreter/JSStack.cpp:
+        (JSC::JSStack::growSlowCase):
+        (JSC::JSStack::enableErrorStackReserve):
+        (JSC::JSStack::disableErrorStackReserve):
+        * interpreter/JSStack.h:
+
 2013-12-23  Mark Lam  <mark.lam@apple.com>
 

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

@@ -91 +91 @@
     // return false.
     long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitSize);
-    if (reinterpret_cast<char*>(m_commitEnd) - delta <= reinterpret_cast<char*>(m_useableEnd))
+    if (reinterpret_cast<char*>(m_commitEnd) - delta <= reinterpret_cast<char*>(m_useableTop))
         return false;
 
@@ -148 +148 @@
 void JSStack::enableErrorStackReserve()
 {
-    m_useableEnd = reservationTop();
+    m_useableTop = reservationTop();
 }
 
 void JSStack::disableErrorStackReserve()
 {
-    char* useableEnd = reinterpret_cast<char*>(reservationTop()) + commitSize;
-    m_useableEnd = reinterpret_cast_ptr<Register*>(useableEnd);
+    char* useableTop = reinterpret_cast<char*>(reservationTop()) + commitSize;
+    m_useableTop = reinterpret_cast_ptr<Register*>(useableTop);
 
     // By the time we get here, we are guaranteed to be destructing the last
     // Interpreter::ErrorHandlingMode that enabled this reserve in the first
-    // place. That means the stack space beyond m_useableEnd before we
+    // place. That means the stack space beyond m_useableTop before we
     // enabled the reserve was not previously in use. Hence, it is safe to
-    // shrink back to that m_useableEnd.
-    if (m_end < m_useableEnd) {
-        ASSERT(m_topCallFrame->topOfFrame() > m_useableEnd);
-        shrink(m_useableEnd);
+    // shrink back to that m_useableTop.
+    if (m_end < m_useableTop) {
+        ASSERT(m_topCallFrame->topOfFrame() > m_useableTop);
+        shrink(m_useableTop);
     }
 }

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

@@ -178 +178 @@
         Register* m_end;
         Register* m_commitEnd;
-        Register* m_useableEnd;
+        Register* m_useableTop;
         PageReservation m_reservation;
         Register* m_lastStackTop;