Changeset 160824 in webkit

Timestamp:

Dec 18, 2013, 10:12:09 PM (12 years ago)

Author:

mark.lam@apple.com

Message:

CStack: Rename functions in JSStack to fit WebKit Coding Style.
​https://bugs.webkit.org/show_bug.cgi?id=125974.

Reviewed by Filip Pizlo.

This is a purely cosmetic change. There are no semantic changes.

• interpreter/JSStack.cpp:

(JSC::JSStack::JSStack):
(JSC::JSStack::gatherConservativeRoots):
(JSC::JSStack::sanitizeStack):

• interpreter/JSStack.h:

(JSC::JSStack::baseOfStack):

• interpreter/JSStackInlines.h:

(JSC::JSStack::topOfFrameFor):
(JSC::JSStack::topOfStack):
(JSC::JSStack::startOfFrameFor):
(JSC::JSStack::entryCheck):
(JSC::JSStack::pushFrame):
(JSC::JSStack::popFrame):
(JSC::JSStack::shrink):
(JSC::JSStack::installFence):
(JSC::JSStack::validateFence):
(JSC::JSStack::installTrapsAfterFrame):

Location:

branches/jsCStack/Source/JavaScriptCore

Files:

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

branches/jsCStack/Source/JavaScriptCore/ChangeLog ¶

@@ +1 @@
+2013-12-18  Mark Lam  <mark.lam@apple.com>
+
+        CStack: Rename functions in JSStack to fit WebKit Coding Style.
+        https://bugs.webkit.org/show_bug.cgi?id=125974.
+
+        Reviewed by Filip Pizlo.
+
+        This is a purely cosmetic change. There are no semantic changes.
+
+        * interpreter/JSStack.cpp:
+        (JSC::JSStack::JSStack):
+        (JSC::JSStack::gatherConservativeRoots):
+        (JSC::JSStack::sanitizeStack):
+        * interpreter/JSStack.h:
+        (JSC::JSStack::baseOfStack):
+        * interpreter/JSStackInlines.h:
+        (JSC::JSStack::topOfFrameFor):
+        (JSC::JSStack::topOfStack):
+        (JSC::JSStack::startOfFrameFor):
+        (JSC::JSStack::entryCheck):
+        (JSC::JSStack::pushFrame):
+        (JSC::JSStack::popFrame):
+        (JSC::JSStack::shrink):
+        (JSC::JSStack::installFence):
+        (JSC::JSStack::validateFence):
+        (JSC::JSStack::installTrapsAfterFrame):
+
 2013-12-18  Mark Lam  <mark.lam@apple.com>
 

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

@@ -54 +54 @@
     m_commitEnd = highAddress();
     
-    m_lastStackTop = getBaseOfStack();
+    m_lastStackTop = baseOfStack();
 
     disableErrorStackReserve();
@@ -97 +97 @@
 {
 #if ENABLE(LLINT_CLOOP)
-    conservativeRoots.add(getBaseOfStack(), getTopOfStack());
+    conservativeRoots.add(baseOfStack(), topOfStack());
 #else
     UNUSED_PARAM(conservativeRoots);
@@ -106 +106 @@
 {
 #if ENABLE(LLINT_CLOOP)
-    conservativeRoots.add(getBaseOfStack(), getTopOfStack(), jitStubRoutines, codeBlocks);
+    conservativeRoots.add(baseOfStack(), topOfStack(), jitStubRoutines, codeBlocks);
 #else
     UNUSED_PARAM(conservativeRoots);
@@ -117 +117 @@
 {
 #if ENABLE(LLINT_CLOOP)
-    ASSERT(getTopOfStack() <= getBaseOfStack());
+    ASSERT(topOfStack() <= baseOfStack());
     
-    if (m_lastStackTop < getTopOfStack()) {
+    if (m_lastStackTop < topOfStack()) {
         char* begin = reinterpret_cast<char*>(m_lastStackTop);
-        char* end = reinterpret_cast<char*>(getTopOfStack());
+        char* end = reinterpret_cast<char*>(topOfStack());
         memset(begin, 0, end - begin);
     }
     
-    m_lastStackTop = getTopOfStack();
+    m_lastStackTop = topOfStack();
 #endif
 }

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

@@ -86 +86 @@
         void sanitizeStack();
 
-        Register* getBaseOfStack() const
+        Register* baseOfStack() const
         {
             return highAddress() - 1;
@@ -98 +98 @@
         static void initializeThreading();
 
-        Register* getTopOfFrame(CallFrame*);
-        Register* getStartOfFrame(CallFrame*);
-        Register* getTopOfStack();
+        Register* topOfFrameFor(CallFrame*);
+        Register* startOfFrameFor(CallFrame*);
+        Register* topOfStack();
 
         bool entryCheck(class CodeBlock*, int);

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

@@ -34 +34 @@
 namespace JSC {
 
-inline Register* JSStack::getTopOfFrame(CallFrame* frame)
+inline Register* JSStack::topOfFrameFor(CallFrame* frame)
 {
     if (UNLIKELY(!frame))
-        return getBaseOfStack();
+        return baseOfStack();
     return frame->topOfFrame() - 1;
 }
 
-inline Register* JSStack::getTopOfStack()
-{
-    return getTopOfFrame(m_topCallFrame);
-}
-
-inline Register* JSStack::getStartOfFrame(CallFrame* frame)
+inline Register* JSStack::topOfStack()
+{
+    return topOfFrameFor(m_topCallFrame);
+}
+
+inline Register* JSStack::startOfFrameFor(CallFrame* frame)
 {
     CallFrame* callerFrame = frame->callerFrameSkippingVMEntrySentinel();
-    return getTopOfFrame(callerFrame);
+    return topOfFrameFor(callerFrame);
 }
 
 inline bool JSStack::entryCheck(class CodeBlock* codeBlock, int argsCount)
 {
-    Register* oldEnd = getTopOfStack();
+    Register* oldEnd = topOfStack();
 
     // Ensure that we have enough space for the parameters:
@@ -84 +84 @@
 {
     ASSERT(!!scope);
-    Register* oldEnd = getTopOfStack();
+    Register* oldEnd = topOfStack();
 
     // Ensure that we have enough space for the parameters:
@@ -160 +160 @@
     // are no more frames on the stack.
     if (!callerFrame)
-        shrink(getBaseOfStack());
+        shrink(baseOfStack());
 
     installTrapsAfterFrame(callerFrame);
@@ -170 +170 @@
         return;
     updateStackLimit(newEnd);
-    if (m_end == getBaseOfStack() && (m_commitEnd - getBaseOfStack()) >= maxExcessCapacity)
+    if (m_end == baseOfStack() && (m_commitEnd - baseOfStack()) >= maxExcessCapacity)
         releaseExcessCapacity();
 }
@@ -228 +228 @@
     UNUSED_PARAM(function);
     UNUSED_PARAM(lineNo);
-    Register* startOfFrame = getStartOfFrame(frame);
+    Register* startOfFrame = startOfFrameFor(frame);
 
     // The last argIndex is at:
@@ -244 +244 @@
     UNUSED_PARAM(lineNo);
     ASSERT(!!frame->scope());
-    Register* startOfFrame = getStartOfFrame(frame);
+    Register* startOfFrame = startOfFrameFor(frame);
     size_t maxIndex = frame->argIndexForRegister(startOfFrame) + 1;
     size_t startIndex = maxIndex - FenceSize;
@@ -274 +274 @@
 inline void JSStack::installTrapsAfterFrame(CallFrame* frame)
 {
-    Register* topOfFrame = getTopOfFrame(frame);
+    Register* topOfFrame = topOfFrameFor(frame);
     const int sizeOfTrap = 64;
     int32_t* startOfTrap = reinterpret_cast<int32_t*>(topOfFrame);