<!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>[167397] 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/167397">167397</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-16 16:30:02 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allocate the data section on the heap again for FTL on ARM64
https://bugs.webkit.org/show_bug.cgi?id=130156
Patch by Juergen Ributzka <juergen@apple.com> on 2014-04-16
Reviewed by Geoffrey Garen and Filip Pizlo.
* ftl/FTLCompile.cpp:
(JSC::FTL::mmAllocateDataSection):
* ftl/FTLDataSection.cpp:
(JSC::FTL::DataSection::DataSection):
(JSC::FTL::DataSection::~DataSection):
* ftl/FTLDataSection.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLDataSectioncpp">trunk/Source/JavaScriptCore/ftl/FTLDataSection.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLDataSectionh">trunk/Source/JavaScriptCore/ftl/FTLDataSection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (167396 => 167397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-16 23:07:49 UTC (rev 167396)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-16 23:30:02 UTC (rev 167397)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-16 Juergen Ributzka <juergen@apple.com>
+
+ Allocate the data section on the heap again for FTL on ARM64
+ https://bugs.webkit.org/show_bug.cgi?id=130156
+
+ Reviewed by Geoffrey Garen and Filip Pizlo.
+
+ * ftl/FTLCompile.cpp:
+ (JSC::FTL::mmAllocateDataSection):
+ * ftl/FTLDataSection.cpp:
+ (JSC::FTL::DataSection::DataSection):
+ (JSC::FTL::DataSection::~DataSection):
+ * ftl/FTLDataSection.h:
+
</ins><span class="cx"> 2014-04-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in CodeBlock::setOptimizationThresholdBasedOnCompilationResult() when the debugger activates.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (167396 => 167397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2014-04-16 23:07:49 UTC (rev 167396)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2014-04-16 23:30:02 UTC (rev 167397)
</span><span class="lines">@@ -79,11 +79,14 @@
</span><span class="cx"> UNUSED_PARAM(sectionID);
</span><span class="cx"> UNUSED_PARAM(isReadOnly);
</span><span class="cx">
</span><ins>+ // Allocate the GOT in the code section to make it reachable for all code.
+ if (!strcmp(sectionName, "__got"))
+ return mmAllocateCodeSection(opaqueState, size, alignment, sectionID, sectionName);
+
</ins><span class="cx"> State& state = *static_cast<State*>(opaqueState);
</span><del>-
- RefPtr<DataSection> section = adoptRef(new DataSection(
- state.graph.m_vm, state.graph.m_codeBlock, size, alignment));
-
</del><ins>+
+ RefPtr<DataSection> section = adoptRef(new DataSection(size, alignment));
+
</ins><span class="cx"> if (!strcmp(sectionName, "__llvm_stackmaps"))
</span><span class="cx"> state.stackmapsSection = section;
</span><span class="cx"> else {
</span><span class="lines">@@ -94,7 +97,7 @@
</span><span class="cx"> state.compactUnwindSize = size;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return bitwise_cast<uint8_t*>(section->base());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLDataSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLDataSection.cpp (167396 => 167397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLDataSection.cpp 2014-04-16 23:07:49 UTC (rev 167396)
+++ trunk/Source/JavaScriptCore/ftl/FTLDataSection.cpp 2014-04-16 23:30:02 UTC (rev 167397)
</span><span class="lines">@@ -34,30 +34,9 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><del>-#if CPU(ARM64)
-// FIXME: We should undo this once we fix relocation issues.
-// https://bugs.webkit.org/show_bug.cgi?id=129756
-static const bool useExecutableMemory = true;
-#else
-static const bool useExecutableMemory = false;
-#endif
-
-DataSection::DataSection(VM& vm, CodeBlock* codeBlock, size_t size, unsigned alignment)
</del><ins>+DataSection::DataSection(size_t size, unsigned alignment)
</ins><span class="cx"> : m_size(size)
</span><span class="cx"> {
</span><del>- if (useExecutableMemory) {
- RELEASE_ASSERT(alignment < jitAllocationGranule);
-
- RefPtr<ExecutableMemoryHandle> result =
- vm.executableAllocator.allocate(
- vm, size, codeBlock, JITCompilationMustSucceed);
- m_base = result->start();
- m_size = result->sizeInBytes();
-
- m_allocationBase = result.release().leakRef();
- return;
- }
-
</del><span class="cx"> RELEASE_ASSERT(WTF::bitCount(alignment) == 1);
</span><span class="cx">
</span><span class="cx"> const unsigned nativeAlignment = 8;
</span><span class="lines">@@ -76,10 +55,7 @@
</span><span class="cx">
</span><span class="cx"> DataSection::~DataSection()
</span><span class="cx"> {
</span><del>- if (useExecutableMemory)
- static_cast<ExecutableMemoryHandle*>(m_allocationBase)->deref();
- else
- fastFree(m_allocationBase);
</del><ins>+ fastFree(m_allocationBase);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLDataSectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLDataSection.h (167396 => 167397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLDataSection.h 2014-04-16 23:07:49 UTC (rev 167396)
+++ trunk/Source/JavaScriptCore/ftl/FTLDataSection.h 2014-04-16 23:30:02 UTC (rev 167397)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> class DataSection : public RefCounted<DataSection> {
</span><span class="cx"> public:
</span><del>- DataSection(VM&, CodeBlock*, size_t, unsigned alignment);
</del><ins>+ DataSection(size_t, unsigned alignment);
</ins><span class="cx"> ~DataSection();
</span><span class="cx">
</span><span class="cx"> void* base() { return m_base; }
</span></span></pre>
</div>
</div>
</body>
</html>