<!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>[160694] 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/160694">160694</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 22:09:43 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: Need an implementation of sanitizeStack for C stack
https://bugs.webkit.org/show_bug.cgi?id=125719
Reviewed by Geoffrey Garen.
Implemented sanitizeStackForVM() as a LLInt stub. It clears memory beyond
the top of stack through the last stack top, which is stored in the VM.
* dfg/DFGOSREntry.cpp:
(JSC::DFG::prepareOSREntry):
* heap/Heap.cpp:
(JSC::Heap::markRoots):
* interpreter/JSStack.cpp:
(JSC::JSStack::sanitizeStack):
* llint/LowLevelInterpreter.asm:
* runtime/VM.cpp:
(JSC::VM::VM):
(JSC::sanitizeStackForVM):
* runtime/VM.h:
(JSC::VM::lastStackTop):
(JSC::VM::setLastStackTop):
* runtime/VMEntryScope.cpp:
(JSC::VMEntryScope::VMEntryScope):
(JSC::VMEntryScope::~VMEntryScope):
* runtime/VMEntryScope.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGOSREntrycpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntry.cpp</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="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</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="#branchesjsCStackSourceJavaScriptCoreruntimeVMEntryScopecpp">branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMEntryScopeh">branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.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 (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2013-12-16 Michael Saboff <msaboff@apple.com>
+
+ CStack Branch: Need an implementation of sanitizeStack for C stack
+ https://bugs.webkit.org/show_bug.cgi?id=125719
+
+ Reviewed by Geoffrey Garen.
+
+ Implemented sanitizeStackForVM() as a LLInt stub. It clears memory beyond
+ the top of stack through the last stack top, which is stored in the VM.
+
+ * dfg/DFGOSREntry.cpp:
+ (JSC::DFG::prepareOSREntry):
+ * heap/Heap.cpp:
+ (JSC::Heap::markRoots):
+ * interpreter/JSStack.cpp:
+ (JSC::JSStack::sanitizeStack):
+ * llint/LowLevelInterpreter.asm:
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ (JSC::sanitizeStackForVM):
+ * runtime/VM.h:
+ (JSC::VM::lastStackTop):
+ (JSC::VM::setLastStackTop):
+ * runtime/VMEntryScope.cpp:
+ (JSC::VMEntryScope::VMEntryScope):
+ (JSC::VMEntryScope::~VMEntryScope):
+ * runtime/VMEntryScope.h:
+
</ins><span class="cx"> 2013-12-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Merged r160665 from trunk.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGOSREntrycpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntry.cpp (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntry.cpp 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGOSREntry.cpp 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VM* vm = &exec->vm();
</span><ins>+
+ sanitizeStackForVM(vm);
</ins><span class="cx">
</span><del>- vm->interpreter->stack().sanitizeStack();
-
</del><span class="cx"> if (codeBlock->jitType() != JITCode::DFGJIT) {
</span><span class="cx"> RELEASE_ASSERT(codeBlock->jitType() == JITCode::FTLJIT);
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/heap/Heap.cpp 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -464,10 +464,11 @@
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(GatherStackRoots);
</span><span class="cx"> stack().gatherConservativeRoots(stackRoots, m_jitStubRoutines, m_codeBlocks);
</span><del>- stack().sanitizeStack();
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ sanitizeStackForVM(m_vm);
+
</ins><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> ConservativeRoots scratchBufferRoots(&m_objectSpace.blocks(), &m_storageSpace);
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> void JSStack::sanitizeStack()
</span><span class="cx"> {
</span><del>-#if 0 // FIXME: CStack - To be addressed later
</del><ins>+#if ENABLE(LLINT_CLOOP)
</ins><span class="cx"> ASSERT(getTopOfStack() <= getBaseOfStack());
</span><span class="cx">
</span><span class="cx"> if (m_lastStackTop < getTopOfStack()) {
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -471,8 +471,39 @@
</span><span class="cx"> _callToJavaScript:
</span><span class="cx"> doCallToJavaScript(makeJavaScriptCall)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> _callToNativeFunction:
</span><span class="cx"> doCallToJavaScript(makeHostFunctionCall)
</span><ins>+
+
+# void sanitizeStackForVM(VM* vm)
+_sanitizeStackForVM:
+ if X86_64
+ const vm = t5
+ const address = t1
+ const zeroValue = t0
+ elsif X86
+ const vm = t5
+ const address = t1
+ const zeroValue = t0
+ else
+ const vm = a0
+ const address = t1
+ const zeroValue = t2
+ end
+
+ loadp VM::m_lastStackTop[vm], address
+ bpaeq address, sp, .zeroFillDone
+
+ move 0, zeroValue
+.zeroFillLoop:
+ storep zeroValue, [address]
+ subp PtrSize, address
+ bpb address, sp, .zeroFillDone
+
+.zeroFillDone:
+ storep sp, VM::m_lastStackTop[vm]
+ ret
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> # Indicate the beginning of LLInt.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -226,6 +226,7 @@
</span><span class="cx"> interpreter = new Interpreter(*this);
</span><span class="cx"> StackBounds stack = wtfThreadData().stack();
</span><span class="cx"> setStackLimit(stack.recursionLimit());
</span><ins>+ setLastStackTop(stack.origin());
</ins><span class="cx">
</span><span class="cx"> // Need to be careful to keep everything consistent here
</span><span class="cx"> JSLockHolder lock(this);
</span><span class="lines">@@ -732,6 +733,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(LLINT_C_LOOP)
+void sanitizeStackForVM(VM* vm)
+{
+ vm->interpreter->stack().sanitizeStack();
+}
+#endif
+
</ins><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> void VM::addRegExpToTrace(RegExp* regExp)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VM.h (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VM.h 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VM.h 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -378,6 +378,9 @@
</span><span class="cx"> return curr >= limit && static_cast<size_t>(curr - limit) >= neededStackInBytes;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void* lastStackTop() { return m_lastStackTop; }
+ void setLastStackTop(void* lastStackTop) { m_lastStackTop = lastStackTop; }
+
</ins><span class="cx"> const ClassInfo* const jsArrayClassInfo;
</span><span class="cx"> const ClassInfo* const jsFinalObjectClassInfo;
</span><span class="cx">
</span><span class="lines">@@ -504,6 +507,7 @@
</span><span class="cx"> void* m_jsStackLimit;
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><ins>+ void* m_lastStackTop;
</ins><span class="cx"> JSValue m_exception;
</span><span class="cx"> bool m_inDefineOwnProperty;
</span><span class="cx"> OwnPtr<CodeCache> m_codeCache;
</span><span class="lines">@@ -527,6 +531,14 @@
</span><span class="cx"> return &m_vm->heap;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(LLINT)
+#if ENABLE(LLINT_C_LOOP)
+ void sanitizeStackForVM(VM*);
+#else
+ extern "C" void sanitizeStackForVM(VM*);
+#endif
+#endif
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // VM_h
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMEntryScopecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> , m_globalObject(globalObject)
</span><span class="cx"> , m_prev(vm.entryScope)
</span><span class="cx"> , m_prevStackLimit(vm.stackLimit())
</span><ins>+ , m_prevLastStackTop(vm.lastStackTop())
</ins><span class="cx"> {
</span><span class="cx"> if (!vm.entryScope) {
</span><span class="cx"> #if ENABLE(ASSEMBLER)
</span><span class="lines">@@ -54,12 +55,14 @@
</span><span class="cx">
</span><span class="cx"> void* limit = m_stack.recursionLimit(requiredCapacity());
</span><span class="cx"> vm.setStackLimit(limit);
</span><ins>+ vm.setLastStackTop(m_stack.origin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VMEntryScope::~VMEntryScope()
</span><span class="cx"> {
</span><span class="cx"> m_vm.entryScope = m_prev;
</span><span class="cx"> m_vm.setStackLimit(m_prevStackLimit);
</span><ins>+ m_vm.setLastStackTop(m_prevLastStackTop);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t VMEntryScope::requiredCapacity() const
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMEntryScopeh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h (160693 => 160694)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h 2013-12-17 04:12:19 UTC (rev 160693)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h 2013-12-17 06:09:43 UTC (rev 160694)
</span><span class="lines">@@ -50,9 +50,10 @@
</span><span class="cx"> StackBounds m_stack;
</span><span class="cx"> JSGlobalObject* m_globalObject;
</span><span class="cx">
</span><del>- // m_prev and m_prevStackLimit may belong to a different thread's stack.
</del><ins>+ // m_prev, m_prevStackLimit & m_prevLastStackTop may belong to a different thread's stack.
</ins><span class="cx"> VMEntryScope* m_prev;
</span><span class="cx"> void* m_prevStackLimit;
</span><ins>+ void* m_prevLastStackTop;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>