<!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>[209296] trunk</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/209296">209296</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-12-02 23:28:25 -0800 (Fri, 02 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, fix git having a breakdown over trying to reland a rollout.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmFunctionParserh">trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (209295 => 209296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-12-03 06:40:37 UTC (rev 209295)
+++ trunk/JSTests/ChangeLog 2016-12-03 07:28:25 UTC (rev 209296)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-02 Keith Miller <keith_miller@apple.com>
+
+ Unreviewed, fix git having a breakdown over trying to reland a rollout.
+
+2016-12-02 Keith Miller <keith_miller@apple.com>
+
+ Add Wasm floating point nearest and trunc
+ https://bugs.webkit.org/show_bug.cgi?id=165339
+
+ Reviewed by Saam Barati.
+
+ * wasm/function-tests/nearest.js: Added.
+ * wasm/function-tests/trunc.js: Added.
+
</ins><span class="cx"> 2016-12-02 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] add additional bit to JSTokenType bitfield
</span><span class="lines">@@ -29,16 +43,6 @@
</span><span class="cx"> Add Wasm floating point nearest and trunc
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165339
</span><span class="cx">
</span><del>- Reviewed by Saam Barati.
-
- * wasm/function-tests/nearest.js: Added.
- * wasm/function-tests/trunc.js: Added.
-
-2016-12-02 Keith Miller <keith_miller@apple.com>
-
- Add Wasm floating point nearest and trunc
- https://bugs.webkit.org/show_bug.cgi?id=165339
-
</del><span class="cx"> Reviewed by Filip Pizlo.
</span><span class="cx">
</span><span class="cx"> * wasm/function-tests/nearest.js: Added.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209295 => 209296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-03 06:40:37 UTC (rev 209295)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-03 07:28:25 UTC (rev 209296)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-12-02 Keith Miller <keith_miller@apple.com>
+
+ Unreviewed, fix git having a breakdown over trying to reland a rollout.
+
+2016-12-02 Keith Miller <keith_miller@apple.com>
+
+ Add Wasm floating point nearest and trunc
+ https://bugs.webkit.org/show_bug.cgi?id=165339
+
+ Reviewed by Saam Barati.
+
+ This patch also allows any wasm primitive type to be passed as a
+ string.
+
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::nearestIntDouble):
+ (JSC::MacroAssemblerARM64::nearestIntFloat):
+ (JSC::MacroAssemblerARM64::truncDouble):
+ (JSC::MacroAssemblerARM64::truncFloat):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::nearestIntDouble):
+ (JSC::MacroAssemblerX86Common::nearestIntFloat):
+ * jsc.cpp:
+ (box):
+ * wasm/WasmB3IRGenerator.cpp:
+ (JSC::Wasm::B3IRGenerator::addOp<F64ConvertUI64>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::F32ConvertUI64>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::F64Nearest>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::F32Nearest>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::F64Trunc>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::F32Trunc>):
+ * wasm/WasmFunctionParser.h:
+ (JSC::Wasm::FunctionParser<Context>::parseExpression):
+
</ins><span class="cx"> 2016-12-02 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] add additional bit to JSTokenType bitfield
</span><span class="lines">@@ -50,36 +84,6 @@
</span><span class="cx">
</span><span class="cx"> 2016-12-02 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><del>- Add Wasm floating point nearest and trunc
- https://bugs.webkit.org/show_bug.cgi?id=165339
-
- Reviewed by Saam Barati.
-
- This patch also allows any wasm primitive type to be passed as a
- string.
-
- * assembler/MacroAssemblerARM64.h:
- (JSC::MacroAssemblerARM64::nearestIntDouble):
- (JSC::MacroAssemblerARM64::nearestIntFloat):
- (JSC::MacroAssemblerARM64::truncDouble):
- (JSC::MacroAssemblerARM64::truncFloat):
- * assembler/MacroAssemblerX86Common.h:
- (JSC::MacroAssemblerX86Common::nearestIntDouble):
- (JSC::MacroAssemblerX86Common::nearestIntFloat):
- * jsc.cpp:
- (box):
- * wasm/WasmB3IRGenerator.cpp:
- (JSC::Wasm::B3IRGenerator::addOp<F64ConvertUI64>):
- (JSC::Wasm::B3IRGenerator::addOp<OpType::F32ConvertUI64>):
- (JSC::Wasm::B3IRGenerator::addOp<OpType::F64Nearest>):
- (JSC::Wasm::B3IRGenerator::addOp<OpType::F32Nearest>):
- (JSC::Wasm::B3IRGenerator::addOp<OpType::F64Trunc>):
- (JSC::Wasm::B3IRGenerator::addOp<OpType::F32Trunc>):
- * wasm/WasmFunctionParser.h:
- (JSC::Wasm::FunctionParser<Context>::parseExpression):
-
-2016-12-02 Keith Miller <keith_miller@apple.com>
-
</del><span class="cx"> Unreviewed, forgot to change instruction after renaming.
</span><span class="cx">
</span><span class="cx"> * assembler/MacroAssemblerARM64.h:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (209295 => 209296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-12-03 06:40:37 UTC (rev 209295)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-12-03 07:28:25 UTC (rev 209296)
</span><span class="lines">@@ -2510,33 +2510,60 @@
</span><span class="cx">
</span><span class="cx"> static JSValue box(ExecState* exec, VM& vm, JSValue wasmValue)
</span><span class="cx"> {
</span><ins>+
</ins><span class="cx"> JSString* type = jsCast<JSString*>(wasmValue.get(exec, makeIdentifier(vm, "type")));
</span><span class="cx"> JSValue value = wasmValue.get(exec, makeIdentifier(vm, "value"));
</span><span class="cx">
</span><del>- const String& typeString = type->value(exec);
- if (typeString == "i64") {
- int64_t result;
</del><ins>+ auto unboxString = [&] (const char* hexFormat, const char* decFormat, auto& result) {
+ if (!value.isString())
+ return false;
+
</ins><span class="cx"> const char* str = toCString(jsCast<JSString*>(value)->value(exec)).data();
</span><span class="cx"> int scanResult;
</span><del>- if (std::strlen(str) > 2 && str[0] == '0' && str[1] == 'x')
- scanResult = sscanf(str, "%llx", &result);
</del><ins>+ int length = std::strlen(str);
+ if ((length > 2 && (str[0] == '0' && str[1] == 'x'))
+ || (length > 3 && (str[0] == '-' && str[1] == '0' && str[2] == 'x')))
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
+ scanResult = sscanf(str, hexFormat, &result);
</ins><span class="cx"> else
</span><del>- scanResult = sscanf(str, "%lld", &result);
</del><ins>+ scanResult = sscanf(str, decFormat, &result);
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
</ins><span class="cx"> RELEASE_ASSERT(scanResult != EOF);
</span><ins>+ return true;
+ };
+
+ const String& typeString = type->value(exec);
+ if (typeString == "i64") {
+ int64_t result;
+ if (!unboxString("%llx", "%lld", result))
+ CRASH();
</ins><span class="cx"> return JSValue::decode(result);
</span><span class="cx"> }
</span><del>- RELEASE_ASSERT(value.isNumber());
</del><span class="cx">
</span><span class="cx"> if (typeString == "i32") {
</span><del>- RELEASE_ASSERT(value.isInt32());
- return JSValue::decode(static_cast<uint32_t>(value.asInt32()));
</del><ins>+ int32_t result;
+ if (!unboxString("%x", "%d", result))
+ result = value.asInt32();
+ return JSValue::decode(static_cast<uint32_t>(result));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (typeString == "f32")
- return JSValue::decode(bitwise_cast<uint32_t>(value.toFloat(exec)));
</del><ins>+ if (typeString == "f32") {
+ float result;
+ if (!unboxString("%a", "%f", result))
+ result = value.toFloat(exec);
+ return JSValue::decode(bitwise_cast<uint32_t>(result));
+ }
</ins><span class="cx">
</span><span class="cx"> RELEASE_ASSERT(typeString == "f64");
</span><del>- return JSValue::decode(bitwise_cast<uint64_t>(value.asNumber()));
</del><ins>+ double result;
+ if (!unboxString("%la", "%lf", result))
+ result = value.asNumber();
+ return JSValue::decode(bitwise_cast<uint64_t>(result));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static JSValue callWasmFunction(VM* vm, const B3::Compilation& code, Vector<JSValue>& boxedArgs)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h (209295 => 209296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2016-12-03 06:40:37 UTC (rev 209295)
+++ trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2016-12-03 07:28:25 UTC (rev 209296)
</span><span class="lines">@@ -213,6 +213,10 @@
</span><span class="cx">
</span><span class="cx"> case OpType::F32ConvertUI64: return unaryCase<OpType::F32ConvertUI64>();
</span><span class="cx"> case OpType::F64ConvertUI64: return unaryCase<OpType::F64ConvertUI64>();
</span><ins>+ case OpType::F32Nearest: return unaryCase<OpType::F32Nearest>();
+ case OpType::F64Nearest: return unaryCase<OpType::F64Nearest>();
+ case OpType::F32Trunc: return unaryCase<OpType::F32Trunc>();
+ case OpType::F64Trunc: return unaryCase<OpType::F64Trunc>();
</ins><span class="cx"> #define CREATE_CASE(name, id, b3op) case OpType::name: return unaryCase<OpType::name>();
</span><span class="cx"> FOR_EACH_WASM_SIMPLE_UNARY_OP(CREATE_CASE)
</span><span class="cx"> #undef CREATE_CASE
</span></span></pre>
</div>
</div>
</body>
</html>