<!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>[204009] trunk/Source</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/204009">204009</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-01 22:02:27 -0700 (Mon, 01 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC][ARM64] Fix branchTest32/64 taking an immediate as mask
https://bugs.webkit.org/show_bug.cgi?id=160439
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-08-01
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::branchTest64):
* b3/air/AirOpcode.opcodes:
Fix the ARM64 codegen to lower BitImm64 without using a scratch register.
Source/WTF:
* wtf/MathExtras.h:
(getLSBSet):
This was not working at all for MacroAssembler.
Since TrustedImm32/64 are signed integers, the arithmetic shift would
never get rid of the top bit and we get an infinite loop.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMathExtrash">trunk/Source/WTF/wtf/MathExtras.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204008 => 204009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-02 03:59:18 UTC (rev 204008)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-02 05:02:27 UTC (rev 204009)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-01 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC][ARM64] Fix branchTest32/64 taking an immediate as mask
+ https://bugs.webkit.org/show_bug.cgi?id=160439
+
+ Reviewed by Filip Pizlo.
+
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::branchTest64):
+ * b3/air/AirOpcode.opcodes:
+ Fix the ARM64 codegen to lower BitImm64 without using a scratch register.
+
</ins><span class="cx"> 2016-07-22 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> [B3] Fusing immediates into test instructions should work again
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (204008 => 204009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-08-02 03:59:18 UTC (rev 204008)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-08-02 05:02:27 UTC (rev 204009)
</span><span class="lines">@@ -2520,8 +2520,24 @@
</span><span class="cx">
</span><span class="cx"> Jump branchTest64(ResultCondition cond, RegisterID reg, TrustedImm64 mask)
</span><span class="cx"> {
</span><del>- move(mask, getCachedDataTempRegisterIDAndInvalidate());
- return branchTest64(cond, reg, dataTempRegister);
</del><ins>+ if (mask.m_value == -1) {
+ if ((cond == Zero) || (cond == NonZero))
+ return Jump(makeCompareAndBranch<64>(static_cast<ZeroCondition>(cond), reg));
+ m_assembler.tst<64>(reg, reg);
+ } else if (hasOneBitSet(mask.m_value) && ((cond == Zero) || (cond == NonZero)))
+ return Jump(makeTestBitAndBranch(reg, getLSBSet(mask.m_value), static_cast<ZeroCondition>(cond)));
+ else {
+ LogicalImmediate logicalImm = LogicalImmediate::create64(mask.m_value);
+
+ if (logicalImm.isValid()) {
+ m_assembler.tst<64>(reg, logicalImm);
+ return Jump(makeBranch(cond));
+ }
+
+ move(mask, getCachedDataTempRegisterIDAndInvalidate());
+ m_assembler.tst<64>(reg, dataTempRegister);
+ }
+ return Jump(makeBranch(cond));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Jump branchTest64(ResultCondition cond, Address address, RegisterID mask)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (204008 => 204009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-08-02 03:59:18 UTC (rev 204008)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-08-02 05:02:27 UTC (rev 204009)
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx">
</span><span class="cx"> BranchTest32 U:G:32, U:G:32, U:G:32 /branch
</span><span class="cx"> ResCond, Tmp, Tmp
</span><del>- x86: ResCond, Tmp, BitImm
</del><ins>+ ResCond, Tmp, BitImm
</ins><span class="cx"> x86: ResCond, Addr, BitImm
</span><span class="cx"> x86: ResCond, Index, BitImm
</span><span class="cx">
</span><span class="lines">@@ -688,6 +688,7 @@
</span><span class="cx"> # BranchTest32 in most cases where you use an immediate.
</span><span class="cx"> 64: BranchTest64 U:G:32, U:G:64, U:G:64 /branch
</span><span class="cx"> ResCond, Tmp, Tmp
</span><ins>+ arm64: ResCond, Tmp, BitImm64
</ins><span class="cx"> x86: ResCond, Tmp, BitImm
</span><span class="cx"> x86: ResCond, Addr, BitImm
</span><span class="cx"> x86: ResCond, Addr, Tmp
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (204008 => 204009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-08-02 03:59:18 UTC (rev 204008)
+++ trunk/Source/WTF/ChangeLog 2016-08-02 05:02:27 UTC (rev 204009)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-01 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC][ARM64] Fix branchTest32/64 taking an immediate as mask
+ https://bugs.webkit.org/show_bug.cgi?id=160439
+
+ Reviewed by Filip Pizlo.
+
+ * wtf/MathExtras.h:
+ (getLSBSet):
+ This was not working at all for MacroAssembler.
+ Since TrustedImm32/64 are signed integers, the arithmetic shift would
+ never get rid of the top bit and we get an infinite loop.
+
</ins><span class="cx"> 2016-07-29 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Make StringView capable of being passed or returned in only 2 registers.
</span></span></pre></div>
<a id="trunkSourceWTFwtfMathExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MathExtras.h (204008 => 204009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MathExtras.h 2016-08-02 03:59:18 UTC (rev 204008)
+++ trunk/Source/WTF/wtf/MathExtras.h 2016-08-02 05:02:27 UTC (rev 204009)
</span><span class="lines">@@ -215,9 +215,11 @@
</span><span class="cx">
</span><span class="cx"> template <typename T> inline unsigned getLSBSet(T value)
</span><span class="cx"> {
</span><ins>+ typedef typename std::make_unsigned<T>::type UnsignedT;
</ins><span class="cx"> unsigned result = 0;
</span><span class="cx">
</span><del>- while (value >>= 1)
</del><ins>+ UnsignedT unsignedValue = static_cast<UnsignedT>(value);
+ while (unsignedValue >>= 1)
</ins><span class="cx"> ++result;
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre>
</div>
</div>
</body>
</html>