<!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>[194312] 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/194312">194312</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-19 01:01:00 -0800 (Sat, 19 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] B3: Add indexed addressing when lowering BitwiseCast
https://bugs.webkit.org/show_bug.cgi?id=152432

Patch by Benjamin Poulain &lt;bpoulain@apple.com&gt; on 2015-12-19
Reviewed by Geoffrey Garen.

The MacroAssembler supports it, we should use it.

* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testBitwiseCastOnDoubleInMemoryIndexed):
(JSC::B3::testBitwiseCastOnInt64InMemoryIndexed):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194311 => 194312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-12-19 06:44:50 UTC (rev 194311)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-12-19 09:01:00 UTC (rev 194312)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-19  Benjamin Poulain  &lt;bpoulain@apple.com&gt;
+
+        [JSC] B3: Add indexed addressing when lowering BitwiseCast
+        https://bugs.webkit.org/show_bug.cgi?id=152432
+
+        Reviewed by Geoffrey Garen.
+
+        The MacroAssembler supports it, we should use it.
+
+        * b3/air/AirOpcode.opcodes:
+        * b3/testb3.cpp:
+        (JSC::B3::testBitwiseCastOnDoubleInMemoryIndexed):
+        (JSC::B3::testBitwiseCastOnInt64InMemoryIndexed):
+
</ins><span class="cx"> 2015-12-18  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Make JSString::SafeView less of a footgun.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (194311 => 194312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes        2015-12-19 06:44:50 UTC (rev 194311)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes        2015-12-19 09:01:00 UTC (rev 194312)
</span><span class="lines">@@ -380,18 +380,22 @@
</span><span class="cx"> 64: Move64ToDouble U:G, D:F
</span><span class="cx">     Tmp, Tmp
</span><span class="cx">     Addr, Tmp as loadDouble
</span><ins>+    Index, Tmp as loadDouble
</ins><span class="cx"> 
</span><span class="cx"> MoveInt32ToPacked U:G, D:F
</span><span class="cx">     Tmp, Tmp
</span><span class="cx">     Addr, Tmp as loadFloat
</span><ins>+    Index, Tmp as loadFloat
</ins><span class="cx"> 
</span><span class="cx"> 64: MoveDoubleTo64 U:F, D:G
</span><span class="cx">     Tmp, Tmp
</span><span class="cx">     Addr, Tmp as load64
</span><ins>+    Index, Tmp as load64
</ins><span class="cx"> 
</span><span class="cx"> MovePackedToInt32 U:F, D:G
</span><span class="cx">     Tmp, Tmp
</span><span class="cx">     Addr, Tmp as load32
</span><ins>+    Index, Tmp as load32
</ins><span class="cx"> 
</span><span class="cx"> Load8 U:G, D:G
</span><span class="cx">     Addr, Tmp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (194311 => 194312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp        2015-12-19 06:44:50 UTC (rev 194311)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp        2015-12-19 09:01:00 UTC (rev 194312)
</span><span class="lines">@@ -3570,6 +3570,23 @@
</span><span class="cx">     CHECK(isIdentical(compileAndRun&lt;int64_t&gt;(proc, &amp;value), bitwise_cast&lt;int64_t&gt;(value)));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void testBitwiseCastOnDoubleInMemoryIndexed(double value)
+{
+    Procedure proc;
+    BasicBlock* root = proc.addBlock();
+    Value* base = root-&gt;appendNew&lt;ArgumentRegValue&gt;(proc, Origin(), GPRInfo::argumentGPR0);
+    Value* offset = root-&gt;appendNew&lt;ArgumentRegValue&gt;(proc, Origin(), GPRInfo::argumentGPR1);
+    Value* scaledOffset = root-&gt;appendNew&lt;Value&gt;(proc, Shl, Origin(),
+        offset,
+        root-&gt;appendNew&lt;Const32Value&gt;(proc, Origin(), 3));
+    Value* address = root-&gt;appendNew&lt;Value&gt;(proc, Add, Origin(), base, scaledOffset);
+    MemoryValue* loadDouble = root-&gt;appendNew&lt;MemoryValue&gt;(proc, Load, Double, Origin(), address);
+    Value* cast = root-&gt;appendNew&lt;Value&gt;(proc, BitwiseCast, Origin(), loadDouble);
+    root-&gt;appendNew&lt;ControlValue&gt;(proc, Return, Origin(), cast);
+
+    CHECK(isIdentical(compileAndRun&lt;int64_t&gt;(proc, &amp;value, 0), bitwise_cast&lt;int64_t&gt;(value)));
+}
+
</ins><span class="cx"> void testInt64BArgToDoubleBitwiseCast(int64_t value)
</span><span class="cx"> {
</span><span class="cx">     Procedure proc;
</span><span class="lines">@@ -3622,6 +3639,23 @@
</span><span class="cx">     CHECK(isIdentical(compileAndRun&lt;double&gt;(proc, &amp;value), bitwise_cast&lt;double&gt;(value)));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void testBitwiseCastOnInt64InMemoryIndexed(int64_t value)
+{
+    Procedure proc;
+    BasicBlock* root = proc.addBlock();
+    Value* base = root-&gt;appendNew&lt;ArgumentRegValue&gt;(proc, Origin(), GPRInfo::argumentGPR0);
+    Value* offset = root-&gt;appendNew&lt;ArgumentRegValue&gt;(proc, Origin(), GPRInfo::argumentGPR1);
+    Value* scaledOffset = root-&gt;appendNew&lt;Value&gt;(proc, Shl, Origin(),
+        offset,
+        root-&gt;appendNew&lt;Const32Value&gt;(proc, Origin(), 3));
+    Value* address = root-&gt;appendNew&lt;Value&gt;(proc, Add, Origin(), base, scaledOffset);
+    MemoryValue* loadDouble = root-&gt;appendNew&lt;MemoryValue&gt;(proc, Load, Int64, Origin(), address);
+    Value* cast = root-&gt;appendNew&lt;Value&gt;(proc, BitwiseCast, Origin(), loadDouble);
+    root-&gt;appendNew&lt;ControlValue&gt;(proc, Return, Origin(), cast);
+
+    CHECK(isIdentical(compileAndRun&lt;double&gt;(proc, &amp;value, 0), bitwise_cast&lt;double&gt;(value)));
+}
+
</ins><span class="cx"> void testFloatImmToInt32BitwiseCast(float value)
</span><span class="cx"> {
</span><span class="cx">     Procedure proc;
</span><span class="lines">@@ -9019,10 +9053,12 @@
</span><span class="cx">     RUN_UNARY(testDoubleImmToInt64BitwiseCast, floatingPointOperands&lt;double&gt;());
</span><span class="cx">     RUN_UNARY(testTwoBitwiseCastOnDouble, floatingPointOperands&lt;double&gt;());
</span><span class="cx">     RUN_UNARY(testBitwiseCastOnDoubleInMemory, floatingPointOperands&lt;double&gt;());
</span><ins>+    RUN_UNARY(testBitwiseCastOnDoubleInMemoryIndexed, floatingPointOperands&lt;double&gt;());
</ins><span class="cx">     RUN_UNARY(testInt64BArgToDoubleBitwiseCast, int64Operands());
</span><span class="cx">     RUN_UNARY(testInt64BImmToDoubleBitwiseCast, int64Operands());
</span><span class="cx">     RUN_UNARY(testTwoBitwiseCastOnInt64, int64Operands());
</span><span class="cx">     RUN_UNARY(testBitwiseCastOnInt64InMemory, int64Operands());
</span><ins>+    RUN_UNARY(testBitwiseCastOnInt64InMemoryIndexed, int64Operands());
</ins><span class="cx">     RUN_UNARY(testFloatImmToInt32BitwiseCast, floatingPointOperands&lt;float&gt;());
</span><span class="cx">     RUN_UNARY(testBitwiseCastOnFloatInMemory, floatingPointOperands&lt;float&gt;());
</span><span class="cx">     RUN_UNARY(testInt32BArgToFloatBitwiseCast, int32Operands());
</span></span></pre>
</div>
</div>

</body>
</html>