<!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>[192609] 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/192609">192609</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-18 20:15:04 -0800 (Wed, 18 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] Add some missing load/store to FTLB3Output
https://bugs.webkit.org/show_bug.cgi?id=151427

Patch by Benjamin Poulain &lt;bpoulain@apple.com&gt; on 2015-11-18
Reviewed by Filip Pizlo.

* ftl/FTLB3Output.cpp:
(JSC::FTL::Output::load8SignExt32):
(JSC::FTL::Output::load8ZeroExt32):
(JSC::FTL::Output::load16SignExt32):
(JSC::FTL::Output::load16ZeroExt32):
(JSC::FTL::Output::loadFloatToDouble):
* ftl/FTLB3Output.h:
(JSC::FTL::Output::load32):
(JSC::FTL::Output::loadPtr):
(JSC::FTL::Output::loadDouble):
(JSC::FTL::Output::load8SignExt32): Deleted.
(JSC::FTL::Output::load8ZeroExt32): Deleted.
(JSC::FTL::Output::load16SignExt32): Deleted.
(JSC::FTL::Output::load16ZeroExt32): Deleted.
(JSC::FTL::Output::loadFloatToDouble): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLB3Outputcpp">trunk/Source/JavaScriptCore/ftl/FTLB3Output.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLB3Outputh">trunk/Source/JavaScriptCore/ftl/FTLB3Output.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192608 => 192609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-11-19 04:14:24 UTC (rev 192608)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-11-19 04:15:04 UTC (rev 192609)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-11-18  Benjamin Poulain  &lt;bpoulain@apple.com&gt;
+
+        [JSC] Add some missing load/store to FTLB3Output
+        https://bugs.webkit.org/show_bug.cgi?id=151427
+
+        Reviewed by Filip Pizlo.
+
+        * ftl/FTLB3Output.cpp:
+        (JSC::FTL::Output::load8SignExt32):
+        (JSC::FTL::Output::load8ZeroExt32):
+        (JSC::FTL::Output::load16SignExt32):
+        (JSC::FTL::Output::load16ZeroExt32):
+        (JSC::FTL::Output::loadFloatToDouble):
+        * ftl/FTLB3Output.h:
+        (JSC::FTL::Output::load32):
+        (JSC::FTL::Output::loadPtr):
+        (JSC::FTL::Output::loadDouble):
+        (JSC::FTL::Output::load8SignExt32): Deleted.
+        (JSC::FTL::Output::load8ZeroExt32): Deleted.
+        (JSC::FTL::Output::load16SignExt32): Deleted.
+        (JSC::FTL::Output::load16ZeroExt32): Deleted.
+        (JSC::FTL::Output::loadFloatToDouble): Deleted.
+
</ins><span class="cx"> 2015-11-18  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix typos in r192605
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.cpp (192608 => 192609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.cpp        2015-11-19 04:14:24 UTC (rev 192608)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.cpp        2015-11-19 04:15:04 UTC (rev 192609)
</span><span class="lines">@@ -69,6 +69,41 @@
</span><span class="cx">     return load;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+LValue Output::load8SignExt32(TypedPointer pointer)
+{
+    LValue load = m_block-&gt;appendNew&lt;B3::MemoryValue&gt;(m_proc, B3::Load8S, B3::Int32, origin(), pointer.value());
+    pointer.heap().decorateInstruction(load, *m_heaps);
+    return load;
+}
+
+LValue Output::load8ZeroExt32(TypedPointer pointer)
+{
+    LValue load = m_block-&gt;appendNew&lt;B3::MemoryValue&gt;(m_proc, B3::Load8Z, B3::Int32, origin(), pointer.value());
+    pointer.heap().decorateInstruction(load, *m_heaps);
+    return load;
+}
+
+LValue Output::load16SignExt32(TypedPointer pointer)
+{
+    LValue load = m_block-&gt;appendNew&lt;B3::MemoryValue&gt;(m_proc, B3::Load16S, B3::Int32, origin(), pointer.value());
+    pointer.heap().decorateInstruction(load, *m_heaps);
+    return load;
+}
+
+LValue Output::load16ZeroExt32(TypedPointer pointer)
+{
+    LValue load = m_block-&gt;appendNew&lt;B3::MemoryValue&gt;(m_proc, B3::Load16Z, B3::Int32, origin(), pointer.value());
+    pointer.heap().decorateInstruction(load, *m_heaps);
+    return load;
+}
+
+LValue Output::loadFloatToDouble(TypedPointer pointer)
+{
+    LValue load = m_block-&gt;appendNew&lt;B3::MemoryValue&gt;(m_proc, B3::LoadFloat, B3::Double, origin(), pointer.value());
+    pointer.heap().decorateInstruction(load, *m_heaps);
+    return load;
+}
+
</ins><span class="cx"> void Output::store(LValue value, TypedPointer pointer)
</span><span class="cx"> {
</span><span class="cx">     LValue store = m_block-&gt;appendNew&lt;B3::MemoryValue&gt;(m_proc, B3::Store, origin(), value, pointer.value());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.h (192608 => 192609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.h        2015-11-19 04:14:24 UTC (rev 192608)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.h        2015-11-19 04:15:04 UTC (rev 192609)
</span><span class="lines">@@ -210,15 +210,15 @@
</span><span class="cx">     LValue load(TypedPointer, LType);
</span><span class="cx">     void store(LValue, TypedPointer);
</span><span class="cx"> 
</span><del>-    LValue load8SignExt32(TypedPointer) { CRASH(); }
-    LValue load8ZeroExt32(TypedPointer) { CRASH(); }
-    LValue load16SignExt32(TypedPointer) { CRASH(); }
-    LValue load16ZeroExt32(TypedPointer) { CRASH(); }
-    LValue load32(TypedPointer pointer) { CRASH(); }
</del><ins>+    LValue load8SignExt32(TypedPointer);
+    LValue load8ZeroExt32(TypedPointer);
+    LValue load16SignExt32(TypedPointer);
+    LValue load16ZeroExt32(TypedPointer);
+    LValue load32(TypedPointer pointer) { return load(pointer, B3::Int32); }
</ins><span class="cx">     LValue load64(TypedPointer pointer) { return load(pointer, B3::Int64); }
</span><del>-    LValue loadPtr(TypedPointer pointer) { CRASH(); }
-    LValue loadFloatToDouble(TypedPointer pointer) { CRASH(); }
-    LValue loadDouble(TypedPointer pointer) { CRASH(); }
</del><ins>+    LValue loadPtr(TypedPointer pointer) { return load(pointer, B3::pointerType()); }
+    LValue loadFloatToDouble(TypedPointer);
+    LValue loadDouble(TypedPointer pointer) { return load(pointer, B3::Double); }
</ins><span class="cx">     void store32(LValue value, TypedPointer pointer) { store(value, pointer); }
</span><span class="cx">     void store64(LValue value, TypedPointer pointer) { store(value, pointer); }
</span><span class="cx">     void storePtr(LValue value, TypedPointer pointer) { store(value, pointer); }
</span></span></pre>
</div>
</div>

</body>
</html>