<!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>[164548] 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/164548">164548</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-22 11:55:12 -0800 (Sat, 22 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>It should be possible for a LinkBuffer to outlive the MacroAssembler and still be useful
https://bugs.webkit.org/show_bug.cgi?id=124733
Reviewed by Oliver Hunt.
This also takes the opportunity to de-duplicate some branch compaction code.
* assembler/ARM64Assembler.h:
* assembler/ARMv7Assembler.h:
(JSC::ARMv7Assembler::buffer):
* assembler/AssemblerBuffer.h:
(JSC::AssemblerData::AssemblerData):
(JSC::AssemblerBuffer::AssemblerBuffer):
(JSC::AssemblerBuffer::storage):
(JSC::AssemblerBuffer::grow):
* assembler/LinkBuffer.h:
(JSC::LinkBuffer::LinkBuffer):
(JSC::LinkBuffer::executableOffsetFor):
(JSC::LinkBuffer::applyOffset):
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::link):
* assembler/MacroAssemblerARMv7.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARM64Assemblerh">trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerAssemblerBufferh">trunk/Source/JavaScriptCore/assembler/AssemblerBuffer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerLinkBuffercpp">trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerLinkBufferh">trunk/Source/JavaScriptCore/assembler/LinkBuffer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164547 => 164548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-22 19:55:12 UTC (rev 164548)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-02-21 Filip Pizlo <fpizlo@apple.com>
+
+ It should be possible for a LinkBuffer to outlive the MacroAssembler and still be useful
+ https://bugs.webkit.org/show_bug.cgi?id=124733
+
+ Reviewed by Oliver Hunt.
+
+ This also takes the opportunity to de-duplicate some branch compaction code.
+
+ * assembler/ARM64Assembler.h:
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::buffer):
+ * assembler/AssemblerBuffer.h:
+ (JSC::AssemblerData::AssemblerData):
+ (JSC::AssemblerBuffer::AssemblerBuffer):
+ (JSC::AssemblerBuffer::storage):
+ (JSC::AssemblerBuffer::grow):
+ * assembler/LinkBuffer.h:
+ (JSC::LinkBuffer::LinkBuffer):
+ (JSC::LinkBuffer::executableOffsetFor):
+ (JSC::LinkBuffer::applyOffset):
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::link):
+ * assembler/MacroAssemblerARMv7.h:
+
</ins><span class="cx"> 2014-02-21 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Extend media support for WebVTT sources
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARM64Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h (164547 => 164548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2014-02-22 19:55:12 UTC (rev 164548)
</span><span class="lines">@@ -2590,13 +2590,6 @@
</span><span class="cx"> return b.m_offset - a.m_offset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int executableOffsetFor(int location)
- {
- if (!location)
- return 0;
- return static_cast<int32_t*>(m_buffer.data())[location / sizeof(int32_t) - 1];
- }
-
</del><span class="cx"> void* unlinkedCode() { return m_buffer.data(); }
</span><span class="cx"> size_t codeSize() const { return m_buffer.codeSize(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (164547 => 164548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-02-22 19:55:12 UTC (rev 164548)
</span><span class="lines">@@ -583,6 +583,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ AssemblerBuffer& buffer() { return m_formatter.m_buffer; }
+
</ins><span class="cx"> private:
</span><span class="cx">
</span><span class="cx"> // ARMv7, Appx-A.6.3
</span><span class="lines">@@ -2059,13 +2061,6 @@
</span><span class="cx"> return b.m_offset - a.m_offset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int executableOffsetFor(int location)
- {
- if (!location)
- return 0;
- return static_cast<int32_t*>(m_formatter.data())[location / sizeof(int32_t) - 1];
- }
-
</del><span class="cx"> int jumpSizeDelta(JumpType jumpType, JumpLinkType jumpLinkType) { return JUMP_ENUM_SIZE(jumpType) - JUMP_ENUM_SIZE(jumpLinkType); }
</span><span class="cx">
</span><span class="cx"> // Assembler admin methods:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAssemblerBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AssemblerBuffer.h (164547 => 164548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AssemblerBuffer.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/JavaScriptCore/assembler/AssemblerBuffer.h 2014-02-22 19:55:12 UTC (rev 164548)
</span><span class="lines">@@ -59,13 +59,21 @@
</span><span class="cx"> uint32_t m_offset;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ struct AssemblerData : public RefCounted<AssemblerData> {
+ static const int inlineCapacity = 128;
+
+ AssemblerData() : m_data(inlineCapacity) { }
+
+ typedef Vector<char, inlineCapacity, UnsafeVectorOverflow> DataVector;
+ DataVector m_data;
+ };
+
</ins><span class="cx"> class AssemblerBuffer {
</span><del>- static const int inlineCapacity = 128;
</del><span class="cx"> public:
</span><span class="cx"> AssemblerBuffer()
</span><del>- : m_storage(inlineCapacity)
- , m_buffer(m_storage.begin())
- , m_capacity(inlineCapacity)
</del><ins>+ : m_storage(adoptRef(new AssemblerData()))
+ , m_buffer(m_storage->m_data.begin())
+ , m_capacity(AssemblerData::inlineCapacity)
</ins><span class="cx"> , m_index(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -130,6 +138,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned debugOffset() { return m_index; }
</span><ins>+
+ AssemblerData* storage() { return m_storage.get(); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void append(const char* data, int size)
</span><span class="lines">@@ -145,12 +155,12 @@
</span><span class="cx"> {
</span><span class="cx"> m_capacity += m_capacity / 2 + extraCapacity;
</span><span class="cx">
</span><del>- m_storage.grow(m_capacity);
- m_buffer = m_storage.begin();
</del><ins>+ m_storage->m_data.grow(m_capacity);
+ m_buffer = m_storage->m_data.begin();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Vector<char, inlineCapacity, UnsafeVectorOverflow> m_storage;
</del><ins>+ RefPtr<AssemblerData> m_storage;
</ins><span class="cx"> char* m_buffer;
</span><span class="cx"> int m_capacity;
</span><span class="cx"> int m_index;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerLinkBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp (164547 => 164548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp 2014-02-22 19:55:12 UTC (rev 164548)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> if (jumpsToLink[i].to() >= jumpsToLink[i].from())
</span><span class="cx"> target = outData + jumpsToLink[i].to() - offset; // Compensate for what we have collapsed so far
</span><span class="cx"> else
</span><del>- target = outData + jumpsToLink[i].to() - m_assembler->executableOffsetFor(jumpsToLink[i].to());
</del><ins>+ target = outData + jumpsToLink[i].to() - executableOffsetFor(jumpsToLink[i].to());
</ins><span class="cx">
</span><span class="cx"> JumpLinkType jumpLinkType = m_assembler->computeJumpType(jumpsToLink[i], outData + writePtr, target);
</span><span class="cx"> // Compact branch if we can...
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < jumpCount; ++i) {
</span><span class="cx"> uint8_t* location = outData + jumpsToLink[i].from();
</span><del>- uint8_t* target = outData + jumpsToLink[i].to() - m_assembler->executableOffsetFor(jumpsToLink[i].to());
</del><ins>+ uint8_t* target = outData + jumpsToLink[i].to() - executableOffsetFor(jumpsToLink[i].to());
</ins><span class="cx"> m_assembler->link(jumpsToLink[i], location, target);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerLinkBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/LinkBuffer.h (164547 => 164548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/LinkBuffer.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/JavaScriptCore/assembler/LinkBuffer.h 2014-02-22 19:55:12 UTC (rev 164548)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_didAllocate(false)
</span><span class="cx"> , m_code(0)
</span><ins>+ , m_storage(masm->m_assembler.buffer().storage())
</ins><span class="cx"> , m_assembler(masm)
</span><span class="cx"> , m_vm(&vm)
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -103,6 +104,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_didAllocate(false)
</span><span class="cx"> , m_code(code)
</span><ins>+ , m_storage(masm->m_assembler.buffer().storage())
</ins><span class="cx"> , m_assembler(masm)
</span><span class="cx"> , m_vm(&vm)
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -257,10 +259,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if ENABLE(BRANCH_COMPACTION)
+ int executableOffsetFor(int location)
+ {
+ if (!location)
+ return 0;
+ return bitwise_cast<int32_t*>(m_storage->m_data.begin())[location / sizeof(int32_t) - 1];
+ }
+#endif
+
</ins><span class="cx"> template <typename T> T applyOffset(T src)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(BRANCH_COMPACTION)
</span><del>- src.m_offset -= m_assembler->executableOffsetFor(src.m_offset);
</del><ins>+ src.m_offset -= executableOffsetFor(src.m_offset);
</ins><span class="cx"> #endif
</span><span class="cx"> return src;
</span><span class="cx"> }
</span><span class="lines">@@ -297,6 +308,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool m_didAllocate;
</span><span class="cx"> void* m_code;
</span><ins>+ RefPtr<AssemblerData> m_storage;
</ins><span class="cx"> MacroAssembler* m_assembler;
</span><span class="cx"> VM* m_vm;
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (164547 => 164548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-02-22 19:55:12 UTC (rev 164548)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> void recordLinkOffsets(int32_t regionStart, int32_t regionEnd, int32_t offset) {return m_assembler.recordLinkOffsets(regionStart, regionEnd, offset); }
</span><span class="cx"> int jumpSizeDelta(JumpType jumpType, JumpLinkType jumpLinkType) { return m_assembler.jumpSizeDelta(jumpType, jumpLinkType); }
</span><span class="cx"> void link(LinkRecord& record, uint8_t* from, uint8_t* to) { return m_assembler.link(record, from, to); }
</span><del>- int executableOffsetFor(int location) { return m_assembler.executableOffsetFor(location); }
</del><span class="cx">
</span><span class="cx"> static const Scale ScalePtr = TimesEight;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (164547 => 164548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-02-22 19:55:12 UTC (rev 164548)
</span><span class="lines">@@ -1790,11 +1790,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- int executableOffsetFor(int location)
- {
- return m_assembler.executableOffsetFor(location);
- }
-
</del><span class="cx"> static FunctionPtr readCallTarget(CodeLocationCall call)
</span><span class="cx"> {
</span><span class="cx"> return FunctionPtr(reinterpret_cast<void(*)()>(ARMv7Assembler::readCallTarget(call.dataLocation())));
</span></span></pre>
</div>
</div>
</body>
</html>