<!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>[162595] 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/162595">162595</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 22:05:50 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL should support MakeRope
https://bugs.webkit.org/show_bug.cgi?id=127462
Not yet reviewed.
* ftl/FTLAbstractHeap.cpp:
(JSC::FTL::IndexedAbstractHeap::IndexedAbstractHeap):
(JSC::FTL::IndexedAbstractHeap::baseIndex):
(JSC::FTL::IndexedAbstractHeap::initialize):
(JSC::FTL::NumberedAbstractHeap::NumberedAbstractHeap):
(JSC::FTL::AbsoluteAbstractHeap::AbsoluteAbstractHeap):
* ftl/FTLAbstractHeap.h:
* ftl/FTLAbstractHeapRepository.cpp:
(JSC::FTL::AbstractHeapRepository::AbstractHeapRepository):
* ftl/FTLAbstractHeapRepository.h:
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLIntrinsicRepository.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileMakeRope):
(JSC::FTL::LowerDFGToLLVM::speculate):
* tests/stress/make-rope-2.js: Added.
(foo):
* tests/stress/make-rope-3.js: Added.
(foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLAbstractHeapcpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLAbstractHeaph">branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeap.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLAbstractHeapRepositorycpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLAbstractHeapRepositoryh">branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLCapabilitiescpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLIntrinsicRepositoryh">branches/jsCStack/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoretestsstressmakerope2js">branches/jsCStack/Source/JavaScriptCore/tests/stress/make-rope-2.js</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoretestsstressmakerope3js">branches/jsCStack/Source/JavaScriptCore/tests/stress/make-rope-3.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (162594 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-23 05:36:30 UTC (rev 162594)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-01-22 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL should support MakeRope
+ https://bugs.webkit.org/show_bug.cgi?id=127462
+
+ Not yet reviewed.
+
+ * ftl/FTLAbstractHeap.cpp:
+ (JSC::FTL::IndexedAbstractHeap::IndexedAbstractHeap):
+ (JSC::FTL::IndexedAbstractHeap::baseIndex):
+ (JSC::FTL::IndexedAbstractHeap::initialize):
+ (JSC::FTL::NumberedAbstractHeap::NumberedAbstractHeap):
+ (JSC::FTL::AbsoluteAbstractHeap::AbsoluteAbstractHeap):
+ * ftl/FTLAbstractHeap.h:
+ * ftl/FTLAbstractHeapRepository.cpp:
+ (JSC::FTL::AbstractHeapRepository::AbstractHeapRepository):
+ * ftl/FTLAbstractHeapRepository.h:
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLIntrinsicRepository.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::LowerDFGToLLVM::compileMakeRope):
+ (JSC::FTL::LowerDFGToLLVM::speculate):
+ * tests/stress/make-rope-2.js: Added.
+ (foo):
+ * tests/stress/make-rope-3.js: Added.
+ (foo):
+
+2014-01-22 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> FTL should support ToString
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127460
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLAbstractHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp (162594 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp 2014-01-23 05:36:30 UTC (rev 162594)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -53,9 +53,10 @@
</span><span class="cx"> setMetadata(instruction, repository.m_tbaaKind, tbaaMetadata(repository));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IndexedAbstractHeap::IndexedAbstractHeap(LContext context, AbstractHeap* parent, const char* heapName, size_t elementSize)
</del><ins>+IndexedAbstractHeap::IndexedAbstractHeap(LContext context, AbstractHeap* parent, const char* heapName, ptrdiff_t offset, size_t elementSize)
</ins><span class="cx"> : m_heapForAnyIndex(parent, heapName)
</span><span class="cx"> , m_heapNameLength(strlen(heapName))
</span><ins>+ , m_offset(offset)
</ins><span class="cx"> , m_elementSize(elementSize)
</span><span class="cx"> , m_scaleTerm(0)
</span><span class="cx"> , m_canShift(false)
</span><span class="lines">@@ -93,7 +94,7 @@
</span><span class="cx"> } else
</span><span class="cx"> result = out.add(base, out.mul(index, m_scaleTerm));
</span><span class="cx">
</span><del>- return TypedPointer(atAnyIndex(), out.addPtr(result, offset));
</del><ins>+ return TypedPointer(atAnyIndex(), out.addPtr(result, m_offset + offset));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AbstractField& IndexedAbstractHeap::atSlow(ptrdiff_t index)
</span><span class="lines">@@ -168,7 +169,7 @@
</span><span class="cx"> accumulator >>= 4;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- field.initialize(&m_heapForAnyIndex, characters, signedIndex * m_elementSize);
</del><ins>+ field.initialize(&m_heapForAnyIndex, characters, m_offset + signedIndex * m_elementSize);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -177,7 +178,7 @@
</span><span class="cx">
</span><span class="cx"> NumberedAbstractHeap::NumberedAbstractHeap(
</span><span class="cx"> LContext context, AbstractHeap* heap, const char* heapName)
</span><del>- : m_indexedHeap(context, heap, heapName, 1)
</del><ins>+ : m_indexedHeap(context, heap, heapName, 0, 1)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -187,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> AbsoluteAbstractHeap::AbsoluteAbstractHeap(
</span><span class="cx"> LContext context, AbstractHeap* heap, const char* heapName)
</span><del>- : m_indexedHeap(context, heap, heapName, 1)
</del><ins>+ : m_indexedHeap(context, heap, heapName, 0, 1)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLAbstractHeaph"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeap.h (162594 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeap.h 2014-01-23 05:36:30 UTC (rev 162594)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeap.h 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> class IndexedAbstractHeap {
</span><span class="cx"> public:
</span><del>- IndexedAbstractHeap(LContext, AbstractHeap* parent, const char* heapName, size_t elementSize);
</del><ins>+ IndexedAbstractHeap(LContext, AbstractHeap* parent, const char* heapName, ptrdiff_t offset, size_t elementSize);
</ins><span class="cx"> ~IndexedAbstractHeap();
</span><span class="cx">
</span><span class="cx"> const AbstractHeap& atAnyIndex() const { return m_heapForAnyIndex; }
</span><span class="lines">@@ -168,6 +168,7 @@
</span><span class="cx">
</span><span class="cx"> AbstractHeap m_heapForAnyIndex;
</span><span class="cx"> size_t m_heapNameLength;
</span><ins>+ ptrdiff_t m_offset;
</ins><span class="cx"> size_t m_elementSize;
</span><span class="cx"> LValue m_scaleTerm;
</span><span class="cx"> bool m_canShift;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLAbstractHeapRepositorycpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp (162594 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp 2014-01-23 05:36:30 UTC (rev 162594)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> , JSCell_freeListNext(JSCell_structure)
</span><span class="cx">
</span><del>-#define INDEXED_ABSTRACT_HEAP_INITIALIZATION(name, size) , name(context, &root, #name, size)
</del><ins>+#define INDEXED_ABSTRACT_HEAP_INITIALIZATION(name, offset, size) , name(context, &root, #name, offset, size)
</ins><span class="cx"> FOR_EACH_INDEXED_ABSTRACT_HEAP(INDEXED_ABSTRACT_HEAP_INITIALIZATION)
</span><span class="cx"> #undef INDEXED_ABSTRACT_HEAP_INITIALIZATION
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLAbstractHeapRepositoryh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h (162594 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h 2014-01-23 05:36:30 UTC (rev 162594)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> macro(JSFunction_scope, JSFunction::offsetOfScopeChain()) \
</span><span class="cx"> macro(JSObject_butterfly, JSObject::butterflyOffset()) \
</span><span class="cx"> macro(JSScope_next, JSScope::offsetOfNext()) \
</span><ins>+ macro(JSString_flags, JSString::offsetOfFlags()) \
</ins><span class="cx"> macro(JSString_length, JSString::offsetOfLength()) \
</span><span class="cx"> macro(JSString_value, JSString::offsetOfValue()) \
</span><span class="cx"> macro(JSVariableObject_registers, JSVariableObject::offsetOfRegisters()) \
</span><span class="lines">@@ -65,14 +66,15 @@
</span><span class="cx"> macro(Structure_typeInfoType, Structure::typeInfoTypeOffset())
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_INDEXED_ABSTRACT_HEAP(macro) \
</span><del>- macro(characters8, sizeof(LChar)) \
- macro(characters16, sizeof(UChar)) \
- macro(indexedInt32Properties, sizeof(EncodedJSValue)) \
- macro(indexedDoubleProperties, sizeof(double)) \
- macro(indexedContiguousProperties, sizeof(EncodedJSValue)) \
- macro(indexedArrayStorageProperties, sizeof(EncodedJSValue)) \
- macro(singleCharacterStrings, sizeof(JSString*)) \
- macro(variables, sizeof(Register))
</del><ins>+ macro(JSRopeString_fibers, JSRopeString::offsetOfFibers(), sizeof(WriteBarrier<JSString>)) \
+ macro(characters8, 0, sizeof(LChar)) \
+ macro(characters16, 0, sizeof(UChar)) \
+ macro(indexedInt32Properties, 0, sizeof(EncodedJSValue)) \
+ macro(indexedDoubleProperties, 0, sizeof(double)) \
+ macro(indexedContiguousProperties, 0, sizeof(EncodedJSValue)) \
+ macro(indexedArrayStorageProperties, 0, sizeof(EncodedJSValue)) \
+ macro(singleCharacterStrings, 0, sizeof(JSString*)) \
+ macro(variables, 0, sizeof(Register))
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_NUMBERED_ABSTRACT_HEAP(macro) \
</span><span class="cx"> macro(properties)
</span><span class="lines">@@ -98,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> AbstractField& JSCell_freeListNext;
</span><span class="cx">
</span><del>-#define INDEXED_ABSTRACT_HEAP_DECLARATION(name, size) IndexedAbstractHeap name;
</del><ins>+#define INDEXED_ABSTRACT_HEAP_DECLARATION(name, offset, size) IndexedAbstractHeap name;
</ins><span class="cx"> FOR_EACH_INDEXED_ABSTRACT_HEAP(INDEXED_ABSTRACT_HEAP_DECLARATION)
</span><span class="cx"> #undef INDEXED_ABSTRACT_HEAP_DECLARATION
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (162594 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-01-23 05:36:30 UTC (rev 162594)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -239,6 +239,7 @@
</span><span class="cx"> case CheckArgumentsNotCreated:
</span><span class="cx"> case GetCallee:
</span><span class="cx"> case ToString:
</span><ins>+ case MakeRope:
</ins><span class="cx"> if (!Options::enableExperimentalFTLCoverage())
</span><span class="cx"> return CannotCompile;
</span><span class="cx"> break;
</span><span class="lines">@@ -298,6 +299,7 @@
</span><span class="cx"> case ObjectUse:
</span><span class="cx"> case ObjectOrOtherUse:
</span><span class="cx"> case StringUse:
</span><ins>+ case KnownStringUse:
</ins><span class="cx"> case StringObjectUse:
</span><span class="cx"> case StringOrStringObjectUse:
</span><span class="cx"> case FinalObjectUse:
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLIntrinsicRepositoryh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h (162594 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2014-01-23 05:36:30 UTC (rev 162594)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx"> #define FOR_EACH_FUNCTION_TYPE(macro) \
</span><span class="cx"> macro(C_JITOperation_EC, functionType(intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(C_JITOperation_EJ, functionType(intPtr, intPtr, int64)) \
</span><ins>+ macro(C_JITOperation_EJssJss, functionType(intPtr, intPtr, intPtr, intPtr)) \
+ macro(C_JITOperation_EJssJssJss, functionType(intPtr, intPtr, intPtr, intPtr, intPtr)) \
</ins><span class="cx"> macro(C_JITOperation_ESt, functionType(intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(I_JITOperation_EJss, functionType(intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(J_JITOperation_E, functionType(int64, intPtr)) \
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (162594 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-23 05:36:30 UTC (rev 162594)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -428,6 +428,9 @@
</span><span class="cx"> case ToString:
</span><span class="cx"> compileToString();
</span><span class="cx"> break;
</span><ins>+ case MakeRope:
+ compileMakeRope();
+ break;
</ins><span class="cx"> case StringCharAt:
</span><span class="cx"> compileStringCharAt();
</span><span class="cx"> break;
</span><span class="lines">@@ -2331,6 +2334,73 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void compileMakeRope()
+ {
+ LValue kids[3];
+ unsigned numKids;
+ kids[0] = lowCell(m_node->child1());
+ kids[1] = lowCell(m_node->child2());
+ if (m_node->child3()) {
+ kids[2] = lowCell(m_node->child3());
+ numKids = 3;
+ } else {
+ kids[2] = 0;
+ numKids = 2;
+ }
+
+ LBasicBlock slowPath = FTL_NEW_BLOCK(m_out, ("MakeRope slow path"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("MakeRope continuation"));
+
+ LBasicBlock lastNext = m_out.insertNewBlocksBefore(slowPath);
+
+ MarkedAllocator& allocator =
+ vm().heap.allocatorForObjectWithImmortalStructureDestructor(sizeof(JSRopeString));
+
+ LValue result = allocateCell(
+ m_out.constIntPtr(&allocator),
+ m_out.constIntPtr(vm().stringStructure.get()),
+ slowPath);
+
+ m_out.storePtr(m_out.intPtrZero, result, m_heaps.JSString_value);
+ for (unsigned i = 0; i < numKids; ++i)
+ m_out.storePtr(kids[i], result, m_heaps.JSRopeString_fibers[i]);
+ for (unsigned i = numKids; i < JSRopeString::s_maxInternalRopeLength; ++i)
+ m_out.storePtr(m_out.intPtrZero, result, m_heaps.JSRopeString_fibers[i]);
+ LValue flags = m_out.load32(kids[0], m_heaps.JSString_flags);
+ LValue length = m_out.load32(kids[0], m_heaps.JSString_length);
+ for (unsigned i = 1; i < numKids; ++i) {
+ flags = m_out.bitAnd(flags, m_out.load32(kids[i], m_heaps.JSString_flags));
+ length = m_out.add(length, m_out.load32(kids[i], m_heaps.JSString_length));
+ }
+ m_out.store32(
+ m_out.bitAnd(m_out.constInt32(JSString::Is8Bit), flags),
+ result, m_heaps.JSString_flags);
+ m_out.store32(length, result, m_heaps.JSString_length);
+
+ ValueFromBlock fastResult = m_out.anchor(result);
+ m_out.jump(continuation);
+
+ m_out.appendTo(slowPath, continuation);
+ ValueFromBlock slowResult;
+ switch (numKids) {
+ case 2:
+ slowResult = m_out.anchor(vmCall(
+ m_out.operation(operationMakeRope2), m_callFrame, kids[0], kids[1]));
+ break;
+ case 3:
+ slowResult = m_out.anchor(vmCall(
+ m_out.operation(operationMakeRope3), m_callFrame, kids[0], kids[1], kids[2]));
+ break;
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ break;
+ }
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ setJSValue(m_out.phi(m_out.int64, fastResult, slowResult));
+ }
+
</ins><span class="cx"> void compileStringCharAt()
</span><span class="cx"> {
</span><span class="cx"> LValue base = lowCell(m_node->child1());
</span><span class="lines">@@ -3976,6 +4046,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case KnownInt32Use:
</span><span class="cx"> case KnownNumberUse:
</span><ins>+ case KnownStringUse:
</ins><span class="cx"> ASSERT(!m_interpreter.needsTypeCheck(edge));
</span><span class="cx"> break;
</span><span class="cx"> case Int32Use:
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoretestsstressmakerope2js"></a>
<div class="addfile"><h4>Added: branches/jsCStack/Source/JavaScriptCore/tests/stress/make-rope-2.js (0 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/tests/stress/make-rope-2.js (rev 0)
+++ branches/jsCStack/Source/JavaScriptCore/tests/stress/make-rope-2.js 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(x) {
+ return "hello" + x;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(" world");
+ if (typeof result != "string") {
+ describe(result);
+ throw "Error: bad result type: " + result;
+ }
+ if (result != "hello world")
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoretestsstressmakerope3js"></a>
<div class="addfile"><h4>Added: branches/jsCStack/Source/JavaScriptCore/tests/stress/make-rope-3.js (0 => 162595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/tests/stress/make-rope-3.js (rev 0)
+++ branches/jsCStack/Source/JavaScriptCore/tests/stress/make-rope-3.js 2014-01-23 06:05:50 UTC (rev 162595)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(x) {
+ return "hello" + x + "!!";
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(" world");
+ if (typeof result != "string") {
+ describe(result);
+ throw "Error: bad result type: " + result;
+ }
+ if (result != "hello world!!")
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>