<!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>[194915] 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/194915">194915</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-12 12:05:52 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Remove some invalid immediate instruction forms from ARM64 Air
https://bugs.webkit.org/show_bug.cgi?id=153024
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-01-12
Reviewed by Michael Saboff.
* b3/B3BasicBlock.h:
Export the symbols for testb3.
* b3/air/AirOpcode.opcodes:
We had 2 invalid opcodes:
-Compare with immediate just does not exist.
-Test64 with immediate exists but Air does not recognize
the valid form of bit-immediates.
* b3/testb3.cpp:
(JSC::B3::genericTestCompare):
(JSC::B3::testCompareImpl):
Extend the tests to cover what was invalid.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3BasicBlockh">trunk/Source/JavaScriptCore/b3/B3BasicBlock.h</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 (194914 => 194915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-12 19:31:40 UTC (rev 194914)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-12 20:05:52 UTC (rev 194915)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-01-12 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [JSC] Remove some invalid immediate instruction forms from ARM64 Air
+ https://bugs.webkit.org/show_bug.cgi?id=153024
+
+ Reviewed by Michael Saboff.
+
+ * b3/B3BasicBlock.h:
+ Export the symbols for testb3.
+
+ * b3/air/AirOpcode.opcodes:
+ We had 2 invalid opcodes:
+ -Compare with immediate just does not exist.
+ -Test64 with immediate exists but Air does not recognize
+ the valid form of bit-immediates.
+
+ * b3/testb3.cpp:
+ (JSC::B3::genericTestCompare):
+ (JSC::B3::testCompareImpl):
+ Extend the tests to cover what was invalid.
+
+2016-01-12 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [JSC] JSC does not build with FTL_USES_B3 on ARM64
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153011
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3BasicBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3BasicBlock.h (194914 => 194915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3BasicBlock.h 2016-01-12 19:31:40 UTC (rev 194914)
+++ trunk/Source/JavaScriptCore/b3/B3BasicBlock.h 2016-01-12 20:05:52 UTC (rev 194915)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> template<typename ValueType, typename... Arguments>
</span><span class="cx"> ValueType* appendNew(Procedure&, Arguments...);
</span><span class="cx">
</span><del>- Value* appendIntConstant(Procedure&, Origin, Type, int64_t value);
</del><ins>+ JS_EXPORT_PRIVATE Value* appendIntConstant(Procedure&, Origin, Type, int64_t value);
</ins><span class="cx"> Value* appendIntConstant(Procedure&, Value* likeValue, int64_t value);
</span><span class="cx">
</span><span class="cx"> void removeLast(Procedure&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (194914 => 194915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-01-12 19:31:40 UTC (rev 194914)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-01-12 20:05:52 UTC (rev 194915)
</span><span class="lines">@@ -517,15 +517,15 @@
</span><span class="cx"> x86: RelCond, Tmp, Imm, Tmp
</span><span class="cx">
</span><span class="cx"> 64: Compare64 U:G:32, U:G:64, U:G:64, ZD:G:32
</span><del>- RelCond, Tmp, Imm, Tmp
</del><span class="cx"> RelCond, Tmp, Tmp, Tmp
</span><ins>+ x86: RelCond, Tmp, Imm, Tmp
</ins><span class="cx">
</span><span class="cx"> Test32 U:G:32, U:G:32, U:G:32, ZD:G:32
</span><span class="cx"> x86: ResCond, Addr, Imm, Tmp
</span><span class="cx"> ResCond, Tmp, Tmp, Tmp
</span><span class="cx">
</span><span class="cx"> 64: Test64 U:G:32, U:G:64, U:G:64, ZD:G:32
</span><del>- ResCond, Tmp, Imm, Tmp
</del><ins>+ x86: ResCond, Tmp, Imm, Tmp
</ins><span class="cx"> ResCond, Tmp, Tmp, Tmp
</span><span class="cx">
</span><span class="cx"> CompareDouble U:G:32, U:F:64, U:F:64, ZD:G:32
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (194914 => 194915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-01-12 19:31:40 UTC (rev 194914)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-01-12 20:05:52 UTC (rev 194915)
</span><span class="lines">@@ -7436,10 +7436,10 @@
</span><span class="cx"> CHECK(invoke<int>(*code) == 42);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename LeftFunctor, typename RightFunctor>
</del><ins>+template<typename LeftFunctor, typename RightFunctor, typename InputType>
</ins><span class="cx"> void genericTestCompare(
</span><span class="cx"> B3::Opcode opcode, const LeftFunctor& leftFunctor, const RightFunctor& rightFunctor,
</span><del>- int left, int right, int result)
</del><ins>+ InputType left, InputType right, int result)
</ins><span class="cx"> {
</span><span class="cx"> // Using a compare.
</span><span class="cx"> {
</span><span class="lines">@@ -7448,13 +7448,14 @@
</span><span class="cx">
</span><span class="cx"> Value* leftValue = leftFunctor(root, proc);
</span><span class="cx"> Value* rightValue = rightFunctor(root, proc);
</span><ins>+ Value* comparisonResult = root->appendNew<Value>(proc, opcode, Origin(), leftValue, rightValue);
</ins><span class="cx">
</span><span class="cx"> root->appendNew<ControlValue>(
</span><span class="cx"> proc, Return, Origin(),
</span><span class="cx"> root->appendNew<Value>(
</span><span class="cx"> proc, NotEqual, Origin(),
</span><del>- root->appendNew<Value>(proc, opcode, Origin(), leftValue, rightValue),
- root->appendNew<Const32Value>(proc, Origin(), 0)));
</del><ins>+ comparisonResult,
+ root->appendIntConstant(proc, Origin(), comparisonResult->type(), 0)));
</ins><span class="cx">
</span><span class="cx"> CHECK(compileAndRun<int>(proc, left, right) == result);
</span><span class="cx"> }
</span><span class="lines">@@ -7608,7 +7609,7 @@
</span><span class="cx"> left, left, modelCompare(opcode, modelLoad<T>(left), modelLoad<T>(left)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void testCompareImpl(B3::Opcode opcode, int left, int right)
</del><ins>+void testCompareImpl(B3::Opcode opcode, int64_t left, int64_t right)
</ins><span class="cx"> {
</span><span class="cx"> int result = modelCompare(opcode, left, right);
</span><span class="cx">
</span><span class="lines">@@ -7616,6 +7617,15 @@
</span><span class="cx"> genericTestCompare(
</span><span class="cx"> opcode,
</span><span class="cx"> [&] (BasicBlock* block, Procedure& proc) {
</span><ins>+ return block->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ },
+ [&] (BasicBlock* block, Procedure& proc) {
+ return block->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+ },
+ left, right, result);
+ genericTestCompare(
+ opcode,
+ [&] (BasicBlock* block, Procedure& proc) {
</ins><span class="cx"> return block->appendNew<Value>(
</span><span class="cx"> proc, Trunc, Origin(),
</span><span class="cx"> block->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
</span><span class="lines">@@ -7631,6 +7641,15 @@
</span><span class="cx"> genericTestCompare(
</span><span class="cx"> opcode,
</span><span class="cx"> [&] (BasicBlock* block, Procedure& proc) {
</span><ins>+ return block->appendNew<Const64Value>(proc, Origin(), left);
+ },
+ [&] (BasicBlock* block, Procedure& proc) {
+ return block->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+ },
+ left, right, result);
+ genericTestCompare(
+ opcode,
+ [&] (BasicBlock* block, Procedure& proc) {
</ins><span class="cx"> return block->appendNew<Const32Value>(proc, Origin(), left);
</span><span class="cx"> },
</span><span class="cx"> [&] (BasicBlock* block, Procedure& proc) {
</span><span class="lines">@@ -7644,6 +7663,15 @@
</span><span class="cx"> genericTestCompare(
</span><span class="cx"> opcode,
</span><span class="cx"> [&] (BasicBlock* block, Procedure& proc) {
</span><ins>+ return block->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ },
+ [&] (BasicBlock* block, Procedure& proc) {
+ return block->appendNew<Const64Value>(proc, Origin(), right);
+ },
+ left, right, result);
+ genericTestCompare(
+ opcode,
+ [&] (BasicBlock* block, Procedure& proc) {
</ins><span class="cx"> return block->appendNew<Value>(
</span><span class="cx"> proc, Trunc, Origin(),
</span><span class="cx"> block->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
</span><span class="lines">@@ -7657,6 +7685,15 @@
</span><span class="cx"> genericTestCompare(
</span><span class="cx"> opcode,
</span><span class="cx"> [&] (BasicBlock* block, Procedure& proc) {
</span><ins>+ return block->appendNew<Const64Value>(proc, Origin(), left);
+ },
+ [&] (BasicBlock* block, Procedure& proc) {
+ return block->appendNew<Const64Value>(proc, Origin(), right);
+ },
+ left, right, result);
+ genericTestCompare(
+ opcode,
+ [&] (BasicBlock* block, Procedure& proc) {
</ins><span class="cx"> return block->appendNew<Const32Value>(proc, Origin(), left);
</span><span class="cx"> },
</span><span class="cx"> [&] (BasicBlock* block, Procedure& proc) {
</span></span></pre>
</div>
</div>
</body>
</html>