Diff
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (160823 => 160824)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-19 04:47:16 UTC (rev 160823)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-19 06:12:09 UTC (rev 160824)
@@ -1,5 +1,32 @@
2013-12-18 Mark Lam <[email protected]>
+ 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 <[email protected]>
+
CStack: Fix baseline to DFG JIT OSR.
https://bugs.webkit.org/show_bug.cgi?id=125969.
Modified: branches/jsCStack/Source/_javascript_Core/interpreter/JSStack.cpp (160823 => 160824)
--- branches/jsCStack/Source/_javascript_Core/interpreter/JSStack.cpp 2013-12-19 04:47:16 UTC (rev 160823)
+++ branches/jsCStack/Source/_javascript_Core/interpreter/JSStack.cpp 2013-12-19 06:12:09 UTC (rev 160824)
@@ -53,7 +53,7 @@
updateStackLimit(highAddress());
m_commitEnd = highAddress();
- m_lastStackTop = getBaseOfStack();
+ m_lastStackTop = baseOfStack();
disableErrorStackReserve();
@@ -96,7 +96,7 @@
void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots)
{
#if ENABLE(LLINT_CLOOP)
- conservativeRoots.add(getBaseOfStack(), getTopOfStack());
+ conservativeRoots.add(baseOfStack(), topOfStack());
#else
UNUSED_PARAM(conservativeRoots);
#endif
@@ -105,7 +105,7 @@
void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)
{
#if ENABLE(LLINT_CLOOP)
- conservativeRoots.add(getBaseOfStack(), getTopOfStack(), jitStubRoutines, codeBlocks);
+ conservativeRoots.add(baseOfStack(), topOfStack(), jitStubRoutines, codeBlocks);
#else
UNUSED_PARAM(conservativeRoots);
UNUSED_PARAM(jitStubRoutines);
@@ -116,15 +116,15 @@
void JSStack::sanitizeStack()
{
#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
}
Modified: branches/jsCStack/Source/_javascript_Core/interpreter/JSStack.h (160823 => 160824)
--- branches/jsCStack/Source/_javascript_Core/interpreter/JSStack.h 2013-12-19 04:47:16 UTC (rev 160823)
+++ branches/jsCStack/Source/_javascript_Core/interpreter/JSStack.h 2013-12-19 06:12:09 UTC (rev 160824)
@@ -85,7 +85,7 @@
void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&);
void sanitizeStack();
- Register* getBaseOfStack() const
+ Register* baseOfStack() const
{
return highAddress() - 1;
}
@@ -97,9 +97,9 @@
static size_t committedByteCount();
static void initializeThreading();
- Register* getTopOfFrame(CallFrame*);
- Register* getStartOfFrame(CallFrame*);
- Register* getTopOfStack();
+ Register* topOfFrameFor(CallFrame*);
+ Register* startOfFrameFor(CallFrame*);
+ Register* topOfStack();
bool entryCheck(class CodeBlock*, int);
Modified: branches/jsCStack/Source/_javascript_Core/interpreter/JSStackInlines.h (160823 => 160824)
--- branches/jsCStack/Source/_javascript_Core/interpreter/JSStackInlines.h 2013-12-19 04:47:16 UTC (rev 160823)
+++ branches/jsCStack/Source/_javascript_Core/interpreter/JSStackInlines.h 2013-12-19 06:12:09 UTC (rev 160824)
@@ -33,27 +33,27 @@
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()
+inline Register* JSStack::topOfStack()
{
- return getTopOfFrame(m_topCallFrame);
+ return topOfFrameFor(m_topCallFrame);
}
-inline Register* JSStack::getStartOfFrame(CallFrame* frame)
+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:
size_t paddedArgsCount = argsCount;
@@ -83,7 +83,7 @@
inline CallFrame* JSStack::pushFrame(class CodeBlock* codeBlock, JSScope* scope, int argsCount, JSObject* callee)
{
ASSERT(!!scope);
- Register* oldEnd = getTopOfStack();
+ Register* oldEnd = topOfStack();
// Ensure that we have enough space for the parameters:
size_t paddedArgsCount = argsCount;
@@ -159,7 +159,7 @@
// this case, we're shrinking all the way to the beginning since there
// are no more frames on the stack.
if (!callerFrame)
- shrink(getBaseOfStack());
+ shrink(baseOfStack());
installTrapsAfterFrame(callerFrame);
}
@@ -169,7 +169,7 @@
if (newEnd >= m_end)
return;
updateStackLimit(newEnd);
- if (m_end == getBaseOfStack() && (m_commitEnd - getBaseOfStack()) >= maxExcessCapacity)
+ if (m_end == baseOfStack() && (m_commitEnd - baseOfStack()) >= maxExcessCapacity)
releaseExcessCapacity();
}
@@ -227,7 +227,7 @@
{
UNUSED_PARAM(function);
UNUSED_PARAM(lineNo);
- Register* startOfFrame = getStartOfFrame(frame);
+ Register* startOfFrame = startOfFrameFor(frame);
// The last argIndex is at:
size_t maxIndex = frame->argIndexForRegister(startOfFrame) + 1;
@@ -243,7 +243,7 @@
UNUSED_PARAM(function);
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;
for (size_t i = startIndex; i < maxIndex; ++i) {
@@ -273,7 +273,7 @@
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);
int32_t* endOfTrap = startOfTrap - sizeOfTrap;
