<!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>[160982] 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/160982">160982</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2013-12-22 16:02:40 -0800 (Sun, 22 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack: Add #if ENABLE(LLINT_C_LOOP) to C loop LLINT only parts of JSStack.
https://bugs.webkit.org/show_bug.cgi?id=126140.
Not yet reviewed.
Also moved startOfFrameFor() to the ENABLE(DEBUG_JSSTACK) section because
it's only needed there.
* interpreter/JSStack.cpp:
(JSC::JSStack::JSStack):
(JSC::JSStack::gatherConservativeRoots):
(JSC::JSStack::sanitizeStack):
* interpreter/JSStack.h:
(JSC::JSStack::gatherConservativeRoots):
(JSC::JSStack::sanitizeStack):
(JSC::JSStack::initializeThreading):
* interpreter/JSStackInlines.h:
(JSC::JSStack::topOfFrameFor):</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 (160981 => 160982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-22 22:26:23 UTC (rev 160981)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-23 00:02:40 UTC (rev 160982)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2013-12-22 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ CStack: Add #if ENABLE(LLINT_C_LOOP) to C loop LLINT only parts of JSStack.
+ https://bugs.webkit.org/show_bug.cgi?id=126140.
+
+ Not yet reviewed.
+
+ Also moved startOfFrameFor() to the ENABLE(DEBUG_JSSTACK) section because
+ it's only needed there.
+
+ * interpreter/JSStack.cpp:
+ (JSC::JSStack::JSStack):
+ (JSC::JSStack::gatherConservativeRoots):
+ (JSC::JSStack::sanitizeStack):
+ * interpreter/JSStack.h:
+ (JSC::JSStack::gatherConservativeRoots):
+ (JSC::JSStack::sanitizeStack):
+ (JSC::JSStack::initializeThreading):
+ * interpreter/JSStackInlines.h:
+ (JSC::JSStack::topOfFrameFor):
+
+2013-12-22 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> CStack: Fixed some JSStack on C Stack boundary computations.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126139.
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp (160981 => 160982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-22 22:26:23 UTC (rev 160981)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-23 00:02:40 UTC (rev 160982)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> static size_t committedBytesCount = 0;
</span><span class="cx">
</span><span class="cx"> static Mutex& stackStatisticsMutex()
</span><span class="lines">@@ -42,12 +43,17 @@
</span><span class="cx"> DEFINE_STATIC_LOCAL(Mutex, staticMutex, ());
</span><span class="cx"> return staticMutex;
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(LLINT_C_LOOP)
</ins><span class="cx">
</span><del>-JSStack::JSStack(VM& vm, size_t capacity)
</del><ins>+JSStack::JSStack(VM& vm)
</ins><span class="cx"> : m_vm(vm)
</span><del>- , m_end(0)
</del><span class="cx"> , m_topCallFrame(vm.topCallFrame)
</span><ins>+#if ENABLE(LLINT_C_LOOP)
+ , m_end(0)
+#endif
</ins><span class="cx"> {
</span><ins>+#if ENABLE(LLINT_C_LOOP)
+ size_t capacity = defaultCapacity;
</ins><span class="cx"> ASSERT(capacity && isPageAligned(capacity));
</span><span class="cx">
</span><span class="cx"> m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages);
</span><span class="lines">@@ -57,10 +63,12 @@
</span><span class="cx"> m_lastStackTop = baseOfStack();
</span><span class="cx">
</span><span class="cx"> disableErrorStackReserve();
</span><ins>+#endif // ENABLE(LLINT_C_LOOP)
</ins><span class="cx">
</span><span class="cx"> m_topCallFrame = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> JSStack::~JSStack()
</span><span class="cx"> {
</span><span class="cx"> void* highAddress = reinterpret_cast<void*>(static_cast<char*>(m_reservation.base()) + m_reservation.size());
</span><span class="lines">@@ -96,27 +104,16 @@
</span><span class="cx">
</span><span class="cx"> void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots)
</span><span class="cx"> {
</span><del>-#if ENABLE(LLINT_CLOOP)
</del><span class="cx"> conservativeRoots.add(baseOfStack(), topOfStack());
</span><del>-#else
- UNUSED_PARAM(conservativeRoots);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)
</span><span class="cx"> {
</span><del>-#if ENABLE(LLINT_CLOOP)
</del><span class="cx"> conservativeRoots.add(baseOfStack(), topOfStack(), jitStubRoutines, codeBlocks);
</span><del>-#else
- UNUSED_PARAM(conservativeRoots);
- UNUSED_PARAM(jitStubRoutines);
- UNUSED_PARAM(codeBlocks);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSStack::sanitizeStack()
</span><span class="cx"> {
</span><del>-#if ENABLE(LLINT_CLOOP)
</del><span class="cx"> ASSERT(topOfStack() <= baseOfStack());
</span><span class="cx">
</span><span class="cx"> if (m_lastStackTop < topOfStack()) {
</span><span class="lines">@@ -126,7 +123,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_lastStackTop = topOfStack();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSStack::releaseExcessCapacity()
</span><span class="lines">@@ -169,6 +165,7 @@
</span><span class="cx"> shrink(m_useableEnd);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(LLINT_C_LOOP)
</ins><span class="cx">
</span><span class="cx"> #if !ENABLE(LLINT_C_LOOP)
</span><span class="cx"> Register* JSStack::lowAddress() const
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h (160981 => 160982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h 2013-12-22 22:26:23 UTC (rev 160981)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h 2013-12-23 00:02:40 UTC (rev 160982)
</span><span class="lines">@@ -35,10 +35,12 @@
</span><span class="cx"> #include <wtf/PageReservation.h>
</span><span class="cx"> #include <wtf/VMTags.h>
</span><span class="cx">
</span><ins>+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> #define ENABLE_DEBUG_JSSTACK 0
</span><span class="cx"> #if !defined(NDEBUG) && !defined(ENABLE_DEBUG_JSSTACK)
</span><span class="cx"> #define ENABLE_DEBUG_JSSTACK 1
</span><span class="cx"> #endif
</span><ins>+#endif // ENABLE(LLINT_C_LOOP)
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -78,8 +80,7 @@
</span><span class="cx"> // Allow 8k of excess registers before we start trying to reap the stack
</span><span class="cx"> static const ptrdiff_t maxExcessCapacity = 8 * 1024;
</span><span class="cx">
</span><del>- JSStack(VM&, size_t capacity = defaultCapacity);
- ~JSStack();
</del><ins>+ JSStack(VM&);
</ins><span class="cx">
</span><span class="cx"> bool ensureCapacityFor(Register* newTopOfStack);
</span><span class="cx">
</span><span class="lines">@@ -88,6 +89,14 @@
</span><span class="cx"> bool containsAddress(Register* address) { return (lowAddress() <= address && address < highAddress()); }
</span><span class="cx"> static size_t committedByteCount();
</span><span class="cx">
</span><ins>+#if !ENABLE(LLINT_C_LOOP)
+ void gatherConservativeRoots(ConservativeRoots&) { }
+ void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&) { }
+ void sanitizeStack() { }
+ static void initializeThreading() { }
+#else
+ ~JSStack();
+
</ins><span class="cx"> void gatherConservativeRoots(ConservativeRoots&);
</span><span class="cx"> void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&);
</span><span class="cx"> void sanitizeStack();
</span><span class="lines">@@ -101,8 +110,6 @@
</span><span class="cx">
</span><span class="cx"> static void initializeThreading();
</span><span class="cx">
</span><del>- Register* startOfFrameFor(CallFrame*);
-
</del><span class="cx"> CallFrame* pushFrame(class CodeBlock*, JSScope*, int argsCount, JSObject* callee);
</span><span class="cx">
</span><span class="cx"> void popFrame(CallFrame*);
</span><span class="lines">@@ -115,6 +122,7 @@
</span><span class="cx"> void installFence(CallFrame*, const char* = "", int = 0) { }
</span><span class="cx"> void validateFence(CallFrame*, const char* = "", int = 0) { }
</span><span class="cx"> #endif // !ENABLE(DEBUG_JSSTACK)
</span><ins>+#endif // ENABLE(LLINT_C_LOOP)
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span><span class="lines">@@ -137,6 +145,7 @@
</span><span class="cx"> Register* highAddress() const;
</span><span class="cx"> #endif // ENABLE(LLINT_C_LOOP)
</span><span class="cx">
</span><ins>+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> Register* reservationEnd() const
</span><span class="cx"> {
</span><span class="cx"> char* reservationEnd = static_cast<char*>(m_reservation.base());
</span><span class="lines">@@ -146,6 +155,7 @@
</span><span class="cx"> #if ENABLE(DEBUG_JSSTACK)
</span><span class="cx"> static JSValue generateFenceValue(size_t argIndex);
</span><span class="cx"> void installTrapsAfterFrame(CallFrame*);
</span><ins>+ Register* startOfFrameFor(CallFrame*);
</ins><span class="cx"> #else
</span><span class="cx"> void installTrapsAfterFrame(CallFrame*) { }
</span><span class="cx"> #endif
</span><span class="lines">@@ -157,17 +167,20 @@
</span><span class="cx"> void addToCommittedByteCount(long);
</span><span class="cx">
</span><span class="cx"> void setStackLimit(Register* newEnd);
</span><ins>+#endif // ENABLE(LLINT_C_LOOP)
</ins><span class="cx">
</span><span class="cx"> void enableErrorStackReserve();
</span><span class="cx"> void disableErrorStackReserve();
</span><span class="cx">
</span><span class="cx"> VM& m_vm;
</span><ins>+ CallFrame*& m_topCallFrame;
+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> Register* m_end;
</span><span class="cx"> Register* m_commitEnd;
</span><span class="cx"> Register* m_useableEnd;
</span><span class="cx"> PageReservation m_reservation;
</span><del>- CallFrame*& m_topCallFrame;
</del><span class="cx"> Register* m_lastStackTop;
</span><ins>+#endif // ENABLE(LLINT_C_LOOP)
</ins><span class="cx">
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackInlinesh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h (160981 => 160982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h 2013-12-22 22:26:23 UTC (rev 160981)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h 2013-12-23 00:02:40 UTC (rev 160982)
</span><span class="lines">@@ -65,8 +65,10 @@
</span><span class="cx">
</span><span class="cx"> inline Register* JSStack::topOfFrameFor(CallFrame* frame)
</span><span class="cx"> {
</span><ins>+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> if (UNLIKELY(!frame))
</span><span class="cx"> return baseOfStack();
</span><ins>+#endif
</ins><span class="cx"> return frame->topOfFrame() - 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -75,11 +77,15 @@
</span><span class="cx"> return topOfFrameFor(m_topCallFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(LLINT_C_LOOP)
+
+#if ENABLE(DEBUG_JSSTACK)
</ins><span class="cx"> inline Register* JSStack::startOfFrameFor(CallFrame* frame)
</span><span class="cx"> {
</span><span class="cx"> CallFrame* callerFrame = frame->callerFrameSkippingVMEntrySentinel();
</span><span class="cx"> return topOfFrameFor(callerFrame);
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(DEBUG_JSSTACK)
</ins><span class="cx">
</span><span class="cx"> inline CallFrame* JSStack::pushFrame(class CodeBlock* codeBlock, JSScope* scope, int argsCount, JSObject* callee)
</span><span class="cx"> {
</span><span class="lines">@@ -291,6 +297,7 @@
</span><span class="cx"> *p-- = 0xabadcafe; // A bad word to trigger a crash if deref'ed.
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(DEBUG_JSSTACK)
</span><ins>+#endif // ENABLE(LLINT_C_LOOP)
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>