<!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>[160591] branches/jsCStack/Source</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/160591">160591</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 23:43:56 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: Remove WTF_USE_SEPARATE_C_AND_JS_STACK
https://bugs.webkit.org/show_bug.cgi?id=125733
Reviewed by Mark Lam.
WTF_USE_SEPARATE_C_AND_JS_STACK is only set for ENABLE(LLINT_C_LOOP) and is
therefore not needed. Replaced #if USE(SEPARATE_C_AND_JS_STACK) with
#if ENABLE(LLINT_C_LOOP) and eliminated WTF_USE_SEPARATE_C_AND_JS_STACK.
Source/JavaScriptCore:
* assembler/MaxFrameExtentForSlowPathCall.h:
* heap/Heap.cpp:
(JSC::Heap::markRoots):
* interpreter/JSStack.cpp:
(JSC::JSStack::gatherConservativeRoots):
* interpreter/JSStackInlines.h:
(JSC::JSStack::updateStackLimit):
* runtime/CommonSlowPaths.h:
(JSC::CommonSlowPaths::arityCheckFor):
* runtime/VM.cpp:
(JSC::VM::VM):
* runtime/VM.h:
Source/WTF:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreassemblerMaxFrameExtentForSlowPathCallh">branches/jsCStack/Source/JavaScriptCore/assembler/MaxFrameExtentForSlowPathCall.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreheapHeapcpp">branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp">branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterJSStackInlinesh">branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeCommonSlowPathsh">branches/jsCStack/Source/JavaScriptCore/runtime/CommonSlowPaths.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMcpp">branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMh">branches/jsCStack/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#branchesjsCStackSourceWTFChangeLog">branches/jsCStack/Source/WTF/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceWTFwtfPlatformh">branches/jsCStack/Source/WTF/wtf/Platform.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 (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2013-12-13 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ CStack Branch: Remove WTF_USE_SEPARATE_C_AND_JS_STACK
+ https://bugs.webkit.org/show_bug.cgi?id=125733
+
+ Reviewed by Mark Lam.
+
+ WTF_USE_SEPARATE_C_AND_JS_STACK is only set for ENABLE(LLINT_C_LOOP) and is
+ therefore not needed. Replaced #if USE(SEPARATE_C_AND_JS_STACK) with
+ #if ENABLE(LLINT_C_LOOP) and eliminated WTF_USE_SEPARATE_C_AND_JS_STACK.
+
+ * assembler/MaxFrameExtentForSlowPathCall.h:
+ * heap/Heap.cpp:
+ (JSC::Heap::markRoots):
+ * interpreter/JSStack.cpp:
+ (JSC::JSStack::gatherConservativeRoots):
+ * interpreter/JSStackInlines.h:
+ (JSC::JSStack::updateStackLimit):
+ * runtime/CommonSlowPaths.h:
+ (JSC::CommonSlowPaths::arityCheckFor):
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ * runtime/VM.h:
+
+2013-12-13 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> cStack: Crypto crashes in GC
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125730
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreassemblerMaxFrameExtentForSlowPathCallh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/assembler/MaxFrameExtentForSlowPathCall.h (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/assembler/MaxFrameExtentForSlowPathCall.h 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/JavaScriptCore/assembler/MaxFrameExtentForSlowPathCall.h 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> // that can be used for outgoing args when calling a slow path C function
</span><span class="cx"> // from JS code.
</span><span class="cx">
</span><del>-#if ENABLE(LLINT_C_LOOP) || USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> static const size_t maxFrameExtentForSlowPathCall = 0;
</span><span class="cx">
</span><span class="cx"> #elif CPU(X86_64) && OS(WINDOWS)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> m_machineThreads.gatherConservativeRoots(machineThreadRoots, &dummy);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_CLOOP)
</ins><span class="cx"> ConservativeRoots stackRoots(&m_objectSpace.blocks(), &m_storageSpace);
</span><span class="cx"> m_codeBlocks.clearMarks();
</span><span class="cx"> {
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> visitor.append(machineThreadRoots);
</span><span class="cx"> visitor.donateAndDrain();
</span><span class="cx"> }
</span><del>-#if USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_CLOOP)
</ins><span class="cx"> {
</span><span class="cx"> GCPHASE(VisitStackRoots);
</span><span class="cx"> MARK_LOG_ROOT(visitor, "Stack");
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots)
</span><span class="cx"> {
</span><del>-#if USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_CLOOP)
</ins><span class="cx"> conservativeRoots.add(getBaseOfStack(), getTopOfStack());
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(conservativeRoots);
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> void JSStack::gatherConservativeRoots(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks)
</span><span class="cx"> {
</span><del>-#if USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_CLOOP)
</ins><span class="cx"> conservativeRoots.add(getBaseOfStack(), getTopOfStack(), jitStubRoutines, codeBlocks);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(conservativeRoots);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackInlinesh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStackInlines.h 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> inline void JSStack::updateStackLimit(Register* newEnd)
</span><span class="cx"> {
</span><span class="cx"> m_end = newEnd;
</span><del>-#if USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> m_vm.setJSStackLimit(newEnd);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeCommonSlowPathsh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/CommonSlowPaths.h (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -60,14 +60,14 @@
</span><span class="cx"> int missingArgumentCount = newCodeBlock->numParameters() - argumentCountIncludingThis;
</span><span class="cx"> int paddedMissingArgumentCount = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), missingArgumentCount);
</span><span class="cx">
</span><del>-#if USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_CLOOP)
</ins><span class="cx"> if (!stack->grow(exec->registers() - paddedMissingArgumentCount))
</span><span class="cx"> return -1;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(stack);
</span><span class="cx"> if (!exec->vm().isSafeToRecurse(paddedMissingArgumentCount * sizeof(Register)))
</span><span class="cx"> return -1;
</span><del>-#endif // USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#endif // ENABLE(LLINT_CLOOP)
</ins><span class="cx">
</span><span class="cx"> return paddedMissingArgumentCount;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> , m_initializingObjectClass(0)
</span><span class="cx"> #endif
</span><span class="cx"> , m_stackLimit(0)
</span><del>-#if USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_CLOOP)
</ins><span class="cx"> , m_jsStackLimit(0)
</span><span class="cx"> #endif
</span><span class="cx"> , m_inDefineOwnProperty(false)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VM.h (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VM.h 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VM.h 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -494,7 +494,7 @@
</span><span class="cx"> const ClassInfo* m_initializingObjectClass;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(SEPARATE_C_AND_JS_STACK)
</del><ins>+#if ENABLE(LLINT_C_LOOP)
</ins><span class="cx"> struct {
</span><span class="cx"> void* m_stackLimit;
</span><span class="cx"> void* m_jsStackLimit;
</span></span></pre></div>
<a id="branchesjsCStackSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/WTF/ChangeLog (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/WTF/ChangeLog 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/WTF/ChangeLog 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2013-12-13 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ CStack Branch: Remove WTF_USE_SEPARATE_C_AND_JS_STACK
+ https://bugs.webkit.org/show_bug.cgi?id=125733
+
+ Reviewed by Mark Lam.
+
+ WTF_USE_SEPARATE_C_AND_JS_STACK is only set for ENABLE(LLINT_C_LOOP) and is
+ therefore not needed. Replaced #if USE(SEPARATE_C_AND_JS_STACK) with
+ #if ENABLE(LLINT_C_LOOP) and eliminated WTF_USE_SEPARATE_C_AND_JS_STACK.
+
+ * wtf/Platform.h:
+
+2013-12-13 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> cStack: Crypto crashes in GC
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125730
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/WTF/wtf/Platform.h (160590 => 160591)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/WTF/wtf/Platform.h 2013-12-14 07:29:30 UTC (rev 160590)
+++ branches/jsCStack/Source/WTF/wtf/Platform.h 2013-12-14 07:43:56 UTC (rev 160591)
</span><span class="lines">@@ -861,14 +861,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* FIXME: We currently unconditionally use spearate stacks. When we switch to using the
- C stack for JS frames, we'll need to make the following conditional on ENABLE(LLINT_CLOOP)
- only.
-*/
-#if ENABLE(LLINT_CLOOP)
-#define WTF_USE_SEPARATE_C_AND_JS_STACK 1
-#endif
-
</del><span class="cx"> /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
</span><span class="cx"> On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */
</span><span class="cx"> #if ENABLE(ASSEMBLER)
</span></span></pre>
</div>
</div>
</body>
</html>