<!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>[210416] branches/safari-603-branch</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/210416">210416</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 17:48:52 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210228">r210228</a>. rdar://problem/29841541</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestsChangeLog">branches/safari-603-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchJSTestswasmyaml">branches/safari-603-branch/JSTests/wasm.yaml</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCorewasmWasmB3IRGeneratorcpp">branches/safari-603-branch/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestswasmfunctiontestsloadoffsetjs">branches/safari-603-branch/JSTests/wasm/function-tests/load-offset.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/JSTests/ChangeLog (210415 => 210416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/ChangeLog 2017-01-06 01:48:48 UTC (rev 210415)
+++ branches/safari-603-branch/JSTests/ChangeLog 2017-01-06 01:48:52 UTC (rev 210416)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210228. rdar://problem/29841541
+
+ 2017-01-02 Saam Barati <sbarati@apple.com>
+
+ WebAssembly: Some loads don't take into account the offset
+ https://bugs.webkit.org/show_bug.cgi?id=166616
+ <rdar://problem/29841541>
+
+ Reviewed by Keith Miller.
+
+ * wasm/function-tests/load-offset.js: Added.
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210204. rdar://problem/29814999
</span><span class="cx">
</span><span class="cx"> 2016-12-29 Saam Barati <sbarati@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchJSTestswasmfunctiontestsloadoffsetjs"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/JSTests/wasm/function-tests/load-offset.js (0 => 210416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/wasm/function-tests/load-offset.js (rev 0)
+++ branches/safari-603-branch/JSTests/wasm/function-tests/load-offset.js 2017-01-06 01:48:52 UTC (rev 210416)
</span><span class="lines">@@ -0,0 +1,165 @@
</span><ins>+import Builder from '../Builder.js'
+import * as assert from '../assert.js'
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: 1})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32"], ret: "i32"})
+ .GetLocal(0)
+ .I32Load(2, 4)
+ .Return()
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const memory = new WebAssembly.Memory({initial: 1});
+ const instance = new WebAssembly.Instance(module, {imp: {mem: memory}});
+
+ const number = 0x0abbccdd;
+ (new Uint32Array(memory.buffer))[1] = number;
+ assert.eq(instance.exports.foo(0), number);
+}
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: 1})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32"], ret: "i32"})
+ .GetLocal(0)
+ .I64Load32U(2, 4)
+ .I64Popcnt()
+ .I32WrapI64()
+ .Return()
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const memory = new WebAssembly.Memory({initial: 1});
+ const instance = new WebAssembly.Instance(module, {imp: {mem: memory}});
+
+ const number = 2**32 - 1;
+ (new Uint32Array(memory.buffer))[1] = number;
+ assert.eq(instance.exports.foo(0), 32);
+}
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: 1})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32"], ret: "i32"})
+ .GetLocal(0)
+ .I64Load32S(2, 4)
+ .I64Popcnt()
+ .I32WrapI64()
+ .Return()
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const memory = new WebAssembly.Memory({initial: 1});
+ const instance = new WebAssembly.Instance(module, {imp: {mem: memory}});
+
+ const number = 2**32 - 1;
+ (new Uint32Array(memory.buffer))[1] = number;
+ assert.eq(instance.exports.foo(0), 64);
+}
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: 1})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32"], ret: "i32"})
+ .GetLocal(0)
+ .I64Load(2, 4)
+ .I64Popcnt()
+ .I32WrapI64()
+ .Return()
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const memory = new WebAssembly.Memory({initial: 1});
+ const instance = new WebAssembly.Instance(module, {imp: {mem: memory}});
+
+ const number = 2**32 - 1;
+ (new Uint32Array(memory.buffer))[1] = number;
+ (new Uint32Array(memory.buffer))[2] = 0xff00ff00;
+ assert.eq(instance.exports.foo(0), 32 + 16);
+}
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: 1})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32"], ret: "f32"})
+ .GetLocal(0)
+ .F32Load(2, 4)
+ .Return()
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const memory = new WebAssembly.Memory({initial: 1});
+ const instance = new WebAssembly.Instance(module, {imp: {mem: memory}});
+
+ const number = Math.PI;
+ (new Float32Array(memory.buffer))[1] = number;
+ assert.eq(instance.exports.foo(0), Math.fround(number));
+}
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: 1})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32"], ret: "f64"})
+ .GetLocal(0)
+ .F64Load(2, 8)
+ .Return()
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const memory = new WebAssembly.Memory({initial: 1});
+ const instance = new WebAssembly.Instance(module, {imp: {mem: memory}});
+
+ const number = Math.PI;
+ (new Float64Array(memory.buffer))[1] = number;
+ assert.eq(instance.exports.foo(0), number);
+}
</ins></span></pre></div>
<a id="branchessafari603branchJSTestswasmyaml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/JSTests/wasm.yaml (210415 => 210416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/wasm.yaml 2017-01-06 01:48:48 UTC (rev 210415)
+++ branches/safari-603-branch/JSTests/wasm.yaml 2017-01-06 01:48:52 UTC (rev 210416)
</span><span class="lines">@@ -149,10 +149,10 @@
</span><span class="cx"> cmd: runWebAssemblySpecTest :skip
</span><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/nop.wast.js
</span><del>- cmd: runWebAssemblySpecTest :skip
</del><ins>+ cmd: runWebAssemblySpecTest :normal
</ins><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/resizing.wast.js
</span><del>- cmd: runWebAssemblySpecTest :skip
</del><ins>+ cmd: runWebAssemblySpecTest :normal
</ins><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/return.wast.js
</span><span class="cx"> cmd: runWebAssemblySpecTest :normal
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (210415 => 210416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-06 01:48:48 UTC (rev 210415)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-06 01:48:52 UTC (rev 210416)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210228. rdar://problem/29841541
+
+ 2017-01-02 Saam Barati <sbarati@apple.com>
+
+ WebAssembly: Some loads don't take into account the offset
+ https://bugs.webkit.org/show_bug.cgi?id=166616
+ <rdar://problem/29841541>
+
+ Reviewed by Keith Miller.
+
+ * wasm/WasmB3IRGenerator.cpp:
+ (JSC::Wasm::B3IRGenerator::emitLoadOp):
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210203. rdar://problem/29815000
</span><span class="cx">
</span><span class="cx"> 2016-12-28 Saam Barati <sbarati@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (210415 => 210416)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2017-01-06 01:48:48 UTC (rev 210415)
+++ branches/safari-603-branch/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2017-01-06 01:48:52 UTC (rev 210416)
</span><span class="lines">@@ -420,29 +420,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case LoadOpType::I32Load: {
</span><del>- return m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Int32, origin, pointer);
</del><ins>+ return m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Int32, origin, pointer, offset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case LoadOpType::I64Load32U: {
</span><del>- Value* value = m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Int32, origin, pointer);
</del><ins>+ Value* value = m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Int32, origin, pointer, offset);
</ins><span class="cx"> return m_currentBlock->appendNew<Value>(m_proc, ZExt32, origin, value);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case LoadOpType::I64Load32S: {
</span><del>- Value* value = m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Int32, origin, pointer);
</del><ins>+ Value* value = m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Int32, origin, pointer, offset);
</ins><span class="cx"> return m_currentBlock->appendNew<Value>(m_proc, SExt32, origin, value);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case LoadOpType::I64Load: {
</span><del>- return m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Int64, origin, pointer);
</del><ins>+ return m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Int64, origin, pointer, offset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case LoadOpType::F32Load: {
</span><del>- return m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Float, origin, pointer);
</del><ins>+ return m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Float, origin, pointer, offset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case LoadOpType::F64Load: {
</span><del>- return m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Double, origin, pointer);
</del><ins>+ return m_currentBlock->appendNew<MemoryValue>(m_proc, Load, Double, origin, pointer, offset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: B3 doesn't support Load16Z yet. We should lower to that value when
</span></span></pre>
</div>
</div>
</body>
</html>