Changeset 160981 in webkit

Timestamp:

Dec 22, 2013, 2:26:23 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

CStack: Fixed some JSStack on C Stack boundary computations.
​https://bugs.webkit.org/show_bug.cgi?id=126139.

Not yet reviewed.

1. Implement committedByteCount() for JSStack on the C stack using the current stack usage as an estimate of committed stack memory.
2. Implement lowAddress() and highAddress() for JSStack on the C stack for containsAddress(). lowAddress() will be the top of the JS stack. highAddress() will be 1 past the end of the JS stack.
3. Moved some functions around in preparation for an upcoming patch to #if out code which is only used when ENABLE(LLINT_C_LOOP)

• interpreter/JSStack.cpp:

(JSC::JSStack::lowAddress):
(JSC::JSStack::highAddress):
(JSC::JSStack::committedByteCount):

• interpreter/JSStack.h:

(JSC::JSStack::containsAddress):
(JSC::JSStack::lowAddress):

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

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

branches/jsCStack/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-22  Mark Lam  <mark.lam@apple.com>
+
+        CStack: Fixed some JSStack on C Stack boundary computations.
+        https://bugs.webkit.org/show_bug.cgi?id=126139.
+
+        Not yet reviewed.
+
+        1. Implement committedByteCount() for JSStack on the C stack using the
+           current stack usage as an estimate of committed stack memory.
+        2. Implement lowAddress() and highAddress() for JSStack on the C stack
+           for containsAddress(). lowAddress() will be the top of the JS stack.
+           highAddress() will be 1 past the end of the JS stack.
+        3. Moved some functions around in preparation for an upcoming patch to
+           #if out code which is only used when ENABLE(LLINT_C_LOOP)
+
+        * interpreter/JSStack.cpp:
+        (JSC::JSStack::lowAddress):
+        (JSC::JSStack::highAddress):
+        (JSC::JSStack::committedByteCount):
+        * interpreter/JSStack.h:
+        (JSC::JSStack::containsAddress):
+        (JSC::JSStack::lowAddress):
+
 2013-12-22  Filip Pizlo  <fpizlo@apple.com>
 

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

@@ -143 +143 @@
 }
 
-size_t JSStack::committedByteCount()
-{
-    MutexLocker locker(stackStatisticsMutex());
-    return committedBytesCount;
-}
-
 void JSStack::addToCommittedByteCount(long byteCount)
 {
@@ -177 +171 @@
 }
 
+#if !ENABLE(LLINT_C_LOOP)
+Register* JSStack::lowAddress() const
+{
+    ASSERT(wtfThreadData().stack().isGrowingDownward());
+    return reinterpret_cast<Register*>(m_vm.jsStackLimit());
+}
+
+Register* JSStack::highAddress() const
+{
+    ASSERT(wtfThreadData().stack().isGrowingDownward());
+    return reinterpret_cast<Register*>(wtfThreadData().stack().origin());
+}
+#endif // !ENABLE(LLINT_C_LOOP)
+
+size_t JSStack::committedByteCount()
+{
+#if ENABLE(LLINT_C_LOOP)
+    MutexLocker locker(stackStatisticsMutex());
+    return committedBytesCount;
+#else
+    // When using the C stack, we don't know how many stack pages are actually
+    // committed. So, we use the current stack usage as an estimate.
+    ASSERT(wtfThreadData().stack().isGrowingDownward());
+    int8_t* current = reinterpret_cast<int8_t*>(&current);
+    int8_t* high = reinterpret_cast<int8_t*>(wtfThreadData().stack().origin());
+    return high - current;
+#endif
+}
+
 void JSStack::updateStackLimit()
 {

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

@@ -86 +86 @@
         void updateStackLimit();
 
+        bool containsAddress(Register* address) { return (lowAddress() <= address && address < highAddress()); }
+        static size_t committedByteCount();
+
         void gatherConservativeRoots(ConservativeRoots&);
         void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&);
@@ -97 +100 @@
         size_t size() const { return highAddress() - lowAddress(); }
 
-        static size_t committedByteCount();
         static void initializeThreading();
 
@@ -105 +107 @@
 
         void popFrame(CallFrame*);
-
-        bool containsAddress(Register* address) { return (lowAddress() <= address && address <= highAddress()); }
 
 #if ENABLE(DEBUG_JSSTACK)
@@ -123 +123 @@
         inline Register* topOfStackForCapacityCheck();
 
+#if ENABLE(LLINT_C_LOOP)
         Register* lowAddress() const
         {
-            return m_end;
+            return m_end + 1;
         }
 
@@ -132 +133 @@
             return reinterpret_cast_ptr<Register*>(static_cast<char*>(m_reservation.base()) + m_reservation.size());
         }
+#else
+        Register* lowAddress() const;
+        Register* highAddress() const;
+#endif // ENABLE(LLINT_C_LOOP)
 
         Register* reservationEnd() const