<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160824] branches/jsCStack/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160824">160824</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 22:12:09 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp">branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterJSStackh">branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterJSStackInlinesh">branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160823 => 160824)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-19 04:47:16 UTC (rev 160823)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-19 06:12:09 UTC (rev 160824)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2013-12-18 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> CStack: Fix baseline to DFG JIT OSR.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125969.
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp (160823 => 160824)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-19 04:47:16 UTC (rev 160823)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-19 06:12:09 UTC (rev 160824)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> updateStackLimit(highAddress());
</span><span class="cx"> m_commitEnd = highAddress();
</span><span class="cx">
</span><del>- m_lastStackTop = getBaseOfStack();
</del><ins>+ m_lastStackTop = baseOfStack();
</ins><span class="cx">
</span><span class="cx"> disableErrorStackReserve();
</span><span class="cx">
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(LLINT_CLOOP)
</span><del>- conservativeRoots.add(getBaseOfStack(), getTopOfStack());
</del><ins>+ conservativeRoots.add(baseOfStack(), topOfStack());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(conservativeRoots);
</span><span class="cx"> #endif
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(LLINT_CLOOP)
</span><del>- conservativeRoots.add(getBaseOfStack(), getTopOfStack(), jitStubRoutines, codeBlocks);
</del><ins>+ conservativeRoots.add(baseOfStack(), topOfStack(), jitStubRoutines, codeBlocks);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(conservativeRoots);
</span><span class="cx"> UNUSED_PARAM(jitStubRoutines);
</span><span class="lines">@@ -116,15 +116,15 @@
</span><span class="cx"> void JSStack::sanitizeStack()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(LLINT_CLOOP)
</span><del>- ASSERT(getTopOfStack() <= getBaseOfStack());
</del><ins>+ ASSERT(topOfStack() <= baseOfStack());
</ins><span class="cx">
</span><del>- if (m_lastStackTop < getTopOfStack()) {
</del><ins>+ if (m_lastStackTop < topOfStack()) {
</ins><span class="cx"> char* begin = reinterpret_cast<char*>(m_lastStackTop);
</span><del>- char* end = reinterpret_cast<char*>(getTopOfStack());
</del><ins>+ char* end = reinterpret_cast<char*>(topOfStack());
</ins><span class="cx"> memset(begin, 0, end - begin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_lastStackTop = getTopOfStack();
</del><ins>+ m_lastStackTop = topOfStack();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h (160823 => 160824)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h 2013-12-19 04:47:16 UTC (rev 160823)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h 2013-12-19 06:12:09 UTC (rev 160824)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&);
</span><span class="cx"> void sanitizeStack();
</span><span class="cx">
</span><del>- Register* getBaseOfStack() const
</del><ins>+ Register* baseOfStack() const
</ins><span class="cx"> {
</span><span class="cx"> return highAddress() - 1;
</span><span class="cx"> }
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx"> static size_t committedByteCount();
</span><span class="cx"> static void initializeThreading();
</span><span class="cx">
</span><del>- Register* getTopOfFrame(CallFrame*);
- Register* getStartOfFrame(CallFrame*);
- Register* getTopOfStack();
</del><ins>+ Register* topOfFrameFor(CallFrame*);
+ Register* startOfFrameFor(CallFrame*);
+ Register* topOfStack();
</ins><span class="cx">
</span><span class="cx"> bool entryCheck(class CodeBlock*, int);
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackInlinesh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h (160823 => 160824)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h 2013-12-19 04:47:16 UTC (rev 160823)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h 2013-12-19 06:12:09 UTC (rev 160824)
</span><span class="lines">@@ -33,27 +33,27 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-inline Register* JSStack::getTopOfFrame(CallFrame* frame)
</del><ins>+inline Register* JSStack::topOfFrameFor(CallFrame* frame)
</ins><span class="cx"> {
</span><span class="cx"> if (UNLIKELY(!frame))
</span><del>- return getBaseOfStack();
</del><ins>+ return baseOfStack();
</ins><span class="cx"> return frame->topOfFrame() - 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Register* JSStack::getTopOfStack()
</del><ins>+inline Register* JSStack::topOfStack()
</ins><span class="cx"> {
</span><del>- return getTopOfFrame(m_topCallFrame);
</del><ins>+ return topOfFrameFor(m_topCallFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline Register* JSStack::getStartOfFrame(CallFrame* frame)
</del><ins>+inline Register* JSStack::startOfFrameFor(CallFrame* frame)
</ins><span class="cx"> {
</span><span class="cx"> CallFrame* callerFrame = frame->callerFrameSkippingVMEntrySentinel();
</span><del>- return getTopOfFrame(callerFrame);
</del><ins>+ return topOfFrameFor(callerFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool JSStack::entryCheck(class CodeBlock* codeBlock, int argsCount)
</span><span class="cx"> {
</span><del>- Register* oldEnd = getTopOfStack();
</del><ins>+ Register* oldEnd = topOfStack();
</ins><span class="cx">
</span><span class="cx"> // Ensure that we have enough space for the parameters:
</span><span class="cx"> size_t paddedArgsCount = argsCount;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> inline CallFrame* JSStack::pushFrame(class CodeBlock* codeBlock, JSScope* scope, int argsCount, JSObject* callee)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!!scope);
</span><del>- Register* oldEnd = getTopOfStack();
</del><ins>+ Register* oldEnd = topOfStack();
</ins><span class="cx">
</span><span class="cx"> // Ensure that we have enough space for the parameters:
</span><span class="cx"> size_t paddedArgsCount = argsCount;
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> // this case, we're shrinking all the way to the beginning since there
</span><span class="cx"> // are no more frames on the stack.
</span><span class="cx"> if (!callerFrame)
</span><del>- shrink(getBaseOfStack());
</del><ins>+ shrink(baseOfStack());
</ins><span class="cx">
</span><span class="cx"> installTrapsAfterFrame(callerFrame);
</span><span class="cx"> }
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> if (newEnd >= m_end)
</span><span class="cx"> return;
</span><span class="cx"> updateStackLimit(newEnd);
</span><del>- if (m_end == getBaseOfStack() && (m_commitEnd - getBaseOfStack()) >= maxExcessCapacity)
</del><ins>+ if (m_end == baseOfStack() && (m_commitEnd - baseOfStack()) >= maxExcessCapacity)
</ins><span class="cx"> releaseExcessCapacity();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(function);
</span><span class="cx"> UNUSED_PARAM(lineNo);
</span><del>- Register* startOfFrame = getStartOfFrame(frame);
</del><ins>+ Register* startOfFrame = startOfFrameFor(frame);
</ins><span class="cx">
</span><span class="cx"> // The last argIndex is at:
</span><span class="cx"> size_t maxIndex = frame->argIndexForRegister(startOfFrame) + 1;
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> UNUSED_PARAM(function);
</span><span class="cx"> UNUSED_PARAM(lineNo);
</span><span class="cx"> ASSERT(!!frame->scope());
</span><del>- Register* startOfFrame = getStartOfFrame(frame);
</del><ins>+ Register* startOfFrame = startOfFrameFor(frame);
</ins><span class="cx"> size_t maxIndex = frame->argIndexForRegister(startOfFrame) + 1;
</span><span class="cx"> size_t startIndex = maxIndex - FenceSize;
</span><span class="cx"> for (size_t i = startIndex; i < maxIndex; ++i) {
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx">
</span><span class="cx"> inline void JSStack::installTrapsAfterFrame(CallFrame* frame)
</span><span class="cx"> {
</span><del>- Register* topOfFrame = getTopOfFrame(frame);
</del><ins>+ Register* topOfFrame = topOfFrameFor(frame);
</ins><span class="cx"> const int sizeOfTrap = 64;
</span><span class="cx"> int32_t* startOfTrap = reinterpret_cast<int32_t*>(topOfFrame);
</span><span class="cx"> int32_t* endOfTrap = startOfTrap - sizeOfTrap;
</span></span></pre>
</div>
</div>
</body>
</html>