<!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>[161240] trunk/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/161240">161240</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 16:24:14 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for StoreBarrier and friends to the FTL
https://bugs.webkit.org/show_bug.cgi?id=126040
Reviewed by Filip Pizlo.
* ftl/FTLAbstractHeapRepository.h:
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLIntrinsicRepository.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileStoreBarrier):
(JSC::FTL::LowerDFGToLLVM::compileConditionalStoreBarrier):
(JSC::FTL::LowerDFGToLLVM::compileStoreBarrierWithNullCheck):
(JSC::FTL::LowerDFGToLLVM::loadMarkByte):
(JSC::FTL::LowerDFGToLLVM::emitStoreBarrier):
* heap/Heap.cpp:
(JSC::Heap::Heap):
* heap/Heap.h:
(JSC::Heap::writeBarrierBuffer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositoryh">trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLIntrinsicRepositoryh">trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161239 => 161240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-03 00:10:48 UTC (rev 161239)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-03 00:24:14 UTC (rev 161240)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-01-02 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><ins>+ Add support for StoreBarrier and friends to the FTL
+ https://bugs.webkit.org/show_bug.cgi?id=126040
+
+ Reviewed by Filip Pizlo.
+
+ * ftl/FTLAbstractHeapRepository.h:
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLIntrinsicRepository.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::LowerDFGToLLVM::compileStoreBarrier):
+ (JSC::FTL::LowerDFGToLLVM::compileConditionalStoreBarrier):
+ (JSC::FTL::LowerDFGToLLVM::compileStoreBarrierWithNullCheck):
+ (JSC::FTL::LowerDFGToLLVM::loadMarkByte):
+ (JSC::FTL::LowerDFGToLLVM::emitStoreBarrier):
+ * heap/Heap.cpp:
+ (JSC::Heap::Heap):
+ * heap/Heap.h:
+ (JSC::Heap::writeBarrierBuffer):
+
+2014-01-02 Mark Hahnenberg <mhahnenberg@apple.com>
+
</ins><span class="cx"> Storing new CopiedSpace memory into a JSObject should fire a write barrier
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126025
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h (161239 => 161240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h 2014-01-03 00:10:48 UTC (rev 161239)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h 2014-01-03 00:24:14 UTC (rev 161240)
</span><span class="lines">@@ -37,7 +37,8 @@
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_ABSTRACT_HEAP(macro) \
</span><span class="cx"> macro(length) \
</span><del>- macro(typedArrayProperties)
</del><ins>+ macro(typedArrayProperties) \
+ macro(WriteBarrierBuffer_bufferContents)
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_ABSTRACT_FIELD(macro) \
</span><span class="cx"> macro(Butterfly_publicLength, Butterfly::offsetOfPublicLength()) \
</span><span class="lines">@@ -53,6 +54,7 @@
</span><span class="cx"> macro(JSString_value, JSString::offsetOfValue()) \
</span><span class="cx"> macro(JSVariableObject_registers, JSVariableObject::offsetOfRegisters()) \
</span><span class="cx"> macro(MarkedAllocator_freeListHead, MarkedAllocator::offsetOfFreeListHead()) \
</span><ins>+ macro(MarkedBlock_markBits, MarkedBlock::offsetOfMarks()) \
</ins><span class="cx"> macro(StringImpl_data, StringImpl::dataOffset()) \
</span><span class="cx"> macro(StringImpl_hashAndFlags, StringImpl::flagsOffset()) \
</span><span class="cx"> macro(Structure_classInfo, Structure::classInfoOffset()) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (161239 => 161240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-01-03 00:10:48 UTC (rev 161239)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-01-03 00:24:14 UTC (rev 161240)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> case TypedArrayWatchpoint:
</span><span class="cx"> case VariableWatchpoint:
</span><span class="cx"> case NotifyWrite:
</span><ins>+ case StoreBarrier:
+ case ConditionalStoreBarrier:
+ case StoreBarrierWithNullCheck:
</ins><span class="cx"> case ValueToInt32:
</span><span class="cx"> case Branch:
</span><span class="cx"> case LogicalNot:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLIntrinsicRepositoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h (161239 => 161240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2014-01-03 00:10:48 UTC (rev 161239)
+++ trunk/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2014-01-03 00:24:14 UTC (rev 161240)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> macro(V_JITOperation_EJJJ, functionType(voidType, intPtr, int64, int64, int64)) \
</span><span class="cx"> macro(V_JITOperation_EOZD, functionType(voidType, intPtr, intPtr, int32, doubleType)) \
</span><span class="cx"> macro(V_JITOperation_EOZJ, functionType(voidType, intPtr, intPtr, int32, int64)) \
</span><ins>+ macro(V_JITOperation_EC, functionType(voidType, intPtr, intPtr)) \
</ins><span class="cx"> macro(V_JITOperation_EVws, functionType(voidType, intPtr, intPtr)) \
</span><span class="cx"> macro(Z_JITOperation_D, functionType(int32, doubleType))
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (161239 => 161240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-03 00:10:48 UTC (rev 161239)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-03 00:24:14 UTC (rev 161240)
</span><span class="lines">@@ -466,6 +466,15 @@
</span><span class="cx"> case Int52ToValue:
</span><span class="cx"> compileInt52ToValue();
</span><span class="cx"> break;
</span><ins>+ case StoreBarrier:
+ compileStoreBarrier();
+ break;
+ case ConditionalStoreBarrier:
+ compileConditionalStoreBarrier();
+ break;
+ case StoreBarrierWithNullCheck:
+ compileStoreBarrierWithNullCheck();
+ break;
</ins><span class="cx"> case Flush:
</span><span class="cx"> case PhantomLocal:
</span><span class="cx"> case SetArgument:
</span><span class="lines">@@ -584,6 +593,34 @@
</span><span class="cx"> setJSValue(lowJSValue(m_node->child1()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void compileStoreBarrier()
+ {
+ emitStoreBarrier(lowCell(m_node->child1()));
+ }
+
+ void compileConditionalStoreBarrier()
+ {
+ LValue base = lowCell(m_node->child1());
+ LValue value = lowJSValue(m_node->child2());
+ emitStoreBarrier(base, value, m_node->child2());
+ }
+
+ void compileStoreBarrierWithNullCheck()
+ {
+#if ENABLE(GGC)
+ LBasicBlock isNotNull = FTL_NEW_BLOCK(m_out, ("Store barrier with null check value not null"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("Store barrier continuation"));
+
+ LValue base = lowJSValue(m_node->child1());
+ m_out.branch(m_out.isZero64(base), continuation, isNotNull);
+ LBasicBlock lastNext = m_out.appendTo(isNotNull, continuation);
+ emitStoreBarrier(base);
+ m_out.appendTo(continuation, lastNext);
+#else
+ speculate(m_node->child1());
+#endif
+ }
+
</ins><span class="cx"> void compileUpsilon()
</span><span class="cx"> {
</span><span class="cx"> LValue destination = m_phis.get(m_node->phi());
</span><span class="lines">@@ -3947,6 +3984,72 @@
</span><span class="cx"> return m_graph.masqueradesAsUndefinedWatchpointIsStillValid(m_node->codeOrigin);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ LValue loadMarkByte(LValue base)
+ {
+ LValue markedBlock = m_out.bitAnd(base, m_out.constInt64(MarkedBlock::blockMask));
+ LValue baseOffset = m_out.bitAnd(base, m_out.constInt64(~MarkedBlock::blockMask));
+ LValue markByteIndex = m_out.lShr(baseOffset, m_out.constInt64(MarkedBlock::atomShiftAmount + MarkedBlock::markByteShiftAmount));
+ return m_out.load8(m_out.baseIndex(m_heaps.MarkedBlock_markBits, markedBlock, markByteIndex, ScaleOne, MarkedBlock::offsetOfMarks()));
+ }
+
+ void emitStoreBarrier(LValue base, LValue value, Edge& valueEdge)
+ {
+#if ENABLE(GGC)
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("Store barrier continuation"));
+ LBasicBlock isCell = FTL_NEW_BLOCK(m_out, ("Store barrier is cell block"));
+
+ if (m_state.forNode(valueEdge.node()).couldBeType(SpecCell))
+ m_out.branch(isNotCell(value), continuation, isCell);
+ else
+ m_out.jump(isCell);
+
+ LBasicBlock lastNext = m_out.appendTo(isCell, continuation);
+ emitStoreBarrier(base);
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+#else
+ UNUSED_PARAM(base);
+ UNUSED_PARAM(value);
+ UNUSED_PARAM(valueEdge);
+#endif
+ }
+
+ void emitStoreBarrier(LValue base)
+ {
+#if ENABLE(GGC)
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("Store barrier continuation"));
+ LBasicBlock isMarked = FTL_NEW_BLOCK(m_out, ("Store barrier is marked block"));
+ LBasicBlock bufferHasSpace = FTL_NEW_BLOCK(m_out, ("Store barrier buffer is full"));
+ LBasicBlock bufferIsFull = FTL_NEW_BLOCK(m_out, ("Store barrier buffer is full"));
+
+ // Check the mark byte.
+ m_out.branch(m_out.isZero8(loadMarkByte(base)), continuation, isMarked);
+
+ // Append to the write barrier buffer.
+ LBasicBlock lastNext = m_out.appendTo(isMarked, bufferHasSpace);
+ LValue currentBufferIndex = m_out.load32(m_out.absolute(&vm().heap.writeBarrierBuffer().m_currentIndex));
+ LValue bufferCapacity = m_out.load32(m_out.absolute(&vm().heap.writeBarrierBuffer().m_capacity));
+ m_out.branch(m_out.lessThan(currentBufferIndex, bufferCapacity), bufferHasSpace, bufferIsFull);
+
+ // Buffer has space, store to it.
+ m_out.appendTo(bufferHasSpace, bufferIsFull);
+ LValue writeBarrierBufferBase = m_out.loadPtr(m_out.absolute(&vm().heap.writeBarrierBuffer().m_buffer));
+ m_out.storePtr(base, m_out.baseIndex(m_heaps.WriteBarrierBuffer_bufferContents, writeBarrierBufferBase, m_out.zeroExt(currentBufferIndex, m_out.intPtr), ScalePtr));
+ m_out.store32(m_out.add(currentBufferIndex, m_out.constInt32(1)), m_out.absolute(&vm().heap.writeBarrierBuffer().m_currentIndex));
+ m_out.jump(continuation);
+
+ // Buffer is out of space, flush it.
+ m_out.appendTo(bufferIsFull, continuation);
+ vmCall(m_out.operation(operationFlushWriteBarrierBuffer), m_callFrame, base);
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+#else
+ UNUSED_PARAM(base);
+#endif
+ }
+
</ins><span class="cx"> enum ExceptionCheckMode { NoExceptions, CheckExceptions };
</span><span class="cx">
</span><span class="cx"> LValue vmCall(LValue function, ExceptionCheckMode mode = CheckExceptions)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (161239 => 161240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-01-03 00:10:48 UTC (rev 161239)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-01-03 00:24:14 UTC (rev 161240)
</span><span class="lines">@@ -269,9 +269,7 @@
</span><span class="cx"> , m_copyVisitor(m_sharedData)
</span><span class="cx"> , m_handleSet(vm)
</span><span class="cx"> , m_isSafeToCollect(false)
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> , m_writeBarrierBuffer(128)
</span><del>-#endif
</del><span class="cx"> , m_vm(vm)
</span><span class="cx"> , m_lastGCLength(0)
</span><span class="cx"> , m_lastCodeDiscardTime(WTF::monotonicallyIncreasingTime())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (161239 => 161240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2014-01-03 00:10:48 UTC (rev 161239)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2014-01-03 00:24:14 UTC (rev 161240)
</span><span class="lines">@@ -100,9 +100,7 @@
</span><span class="cx"> static void writeBarrier(const JSCell*, JSCell*);
</span><span class="cx"> static uint8_t* addressOfCardFor(JSCell*);
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> WriteBarrierBuffer& writeBarrierBuffer() { return m_writeBarrierBuffer; }
</span><del>-#endif
</del><span class="cx"> void flushWriteBarrierBuffer(JSCell*);
</span><span class="cx">
</span><span class="cx"> Heap(VM*, HeapType);
</span><span class="lines">@@ -292,9 +290,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_isSafeToCollect;
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> WriteBarrierBuffer m_writeBarrierBuffer;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> VM* m_vm;
</span><span class="cx"> double m_lastGCLength;
</span></span></pre>
</div>
</div>
</body>
</html>