<!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>[170107] 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/170107">170107</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 10:58:28 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove duplicate code using sdiv.
https://bugs.webkit.org/show_bug.cgi?id=133764
Reviewed by Daniel Bates.
Source/JavaScriptCore:
* assembler/ARMv7Assembler.h:
(JSC::ARMv7Assembler::sdiv):
Make sdiv a template to match arm64.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileArithDiv):
(JSC::DFG::SpeculativeJIT::compileArithMod):
Remove duplicate code that was identical except for sdiv not being a template.
Source/WebCore:
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):
Use template sdiv for apple armv7s and arm64.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (170106 => 170107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-06-18 17:53:33 UTC (rev 170106)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-06-18 17:58:28 UTC (rev 170107)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-18 Alex Christensen <achristensen@webkit.org>
+
+ Remove duplicate code using sdiv.
+ https://bugs.webkit.org/show_bug.cgi?id=133764
+
+ Reviewed by Daniel Bates.
+
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::sdiv):
+ Make sdiv a template to match arm64.
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileArithDiv):
+ (JSC::DFG::SpeculativeJIT::compileArithMod):
+ Remove duplicate code that was identical except for sdiv not being a template.
+
</ins><span class="cx"> 2014-06-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r170082.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (170106 => 170107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-06-18 17:53:33 UTC (rev 170106)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-06-18 17:58:28 UTC (rev 170107)
</span><span class="lines">@@ -1514,8 +1514,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if CPU(APPLE_ARMV7S)
</span><ins>+ template<int datasize>
</ins><span class="cx"> ALWAYS_INLINE void sdiv(RegisterID rd, RegisterID rn, RegisterID rm)
</span><span class="cx"> {
</span><ins>+ static_assert(datasize == 32, "sdiv datasize must be 32 for armv7s");
</ins><span class="cx"> ASSERT(!BadReg(rd));
</span><span class="cx"> ASSERT(!BadReg(rn));
</span><span class="cx"> ASSERT(!BadReg(rm));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (170106 => 170107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-06-18 17:53:33 UTC (rev 170106)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-06-18 17:58:28 UTC (rev 170107)
</span><span class="lines">@@ -3220,7 +3220,7 @@
</span><span class="cx">
</span><span class="cx"> done.link(&m_jit);
</span><span class="cx"> int32Result(eax.gpr(), node);
</span><del>-#elif CPU(APPLE_ARMV7S)
</del><ins>+#elif CPU(APPLE_ARMV7S) || CPU(ARM64)
</ins><span class="cx"> SpeculateInt32Operand op1(this, node->child1());
</span><span class="cx"> SpeculateInt32Operand op2(this, node->child2());
</span><span class="cx"> GPRReg op1GPR = op1.gpr();
</span><span class="lines">@@ -3236,32 +3236,6 @@
</span><span class="cx"> numeratorNonZero.link(&m_jit);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_jit.assembler().sdiv(quotient.gpr(), op1GPR, op2GPR);
-
- // Check that there was no remainder. If there had been, then we'd be obligated to
- // produce a double result instead.
- if (shouldCheckOverflow(node->arithMode())) {
- speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchMul32(JITCompiler::Overflow, quotient.gpr(), op2GPR, multiplyAnswer.gpr()));
- speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branch32(JITCompiler::NotEqual, multiplyAnswer.gpr(), op1GPR));
- }
-
- int32Result(quotient.gpr(), node);
-#elif CPU(ARM64)
- SpeculateInt32Operand op1(this, node->child1());
- SpeculateInt32Operand op2(this, node->child2());
- GPRReg op1GPR = op1.gpr();
- GPRReg op2GPR = op2.gpr();
- GPRTemporary quotient(this);
- GPRTemporary multiplyAnswer(this);
-
- // If the user cares about negative zero, then speculate that we're not about
- // to produce negative zero.
- if (shouldCheckNegativeZero(node->arithMode())) {
- MacroAssembler::Jump numeratorNonZero = m_jit.branchTest32(MacroAssembler::NonZero, op1GPR);
- speculationCheck(NegativeZero, JSValueRegs(), 0, m_jit.branch32(MacroAssembler::LessThan, op2GPR, TrustedImm32(0)));
- numeratorNonZero.link(&m_jit);
- }
-
</del><span class="cx"> m_jit.assembler().sdiv<32>(quotient.gpr(), op1GPR, op2GPR);
</span><span class="cx">
</span><span class="cx"> // Check that there was no remainder. If there had been, then we'd be obligated to
</span><span class="lines">@@ -3499,7 +3473,7 @@
</span><span class="cx"> done.link(&m_jit);
</span><span class="cx"> int32Result(edx.gpr(), node);
</span><span class="cx">
</span><del>-#elif CPU(APPLE_ARMV7S)
</del><ins>+#elif CPU(ARM64) || CPU(APPLE_ARMV7S)
</ins><span class="cx"> GPRTemporary temp(this);
</span><span class="cx"> GPRTemporary quotientThenRemainder(this);
</span><span class="cx"> GPRTemporary multiplyAnswer(this);
</span><span class="lines">@@ -3509,45 +3483,6 @@
</span><span class="cx"> GPRReg multiplyAnswerGPR = multiplyAnswer.gpr();
</span><span class="cx">
</span><span class="cx"> JITCompiler::JumpList done;
</span><del>-
- if (shouldCheckOverflow(node->arithMode()))
- speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchTest32(JITCompiler::Zero, divisorGPR));
- else {
- JITCompiler::Jump denominatorNotZero = m_jit.branchTest32(JITCompiler::NonZero, divisorGPR);
- m_jit.move(divisorGPR, quotientThenRemainderGPR);
- done.append(m_jit.jump());
- denominatorNotZero.link(&m_jit);
- }
-
- m_jit.assembler().sdiv(quotientThenRemainderGPR, dividendGPR, divisorGPR);
- // FIXME: It seems like there are cases where we don't need this? What if we have
- // arithMode() == Arith::Unchecked?
- // https://bugs.webkit.org/show_bug.cgi?id=126444
- speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchMul32(JITCompiler::Overflow, quotientThenRemainderGPR, divisorGPR, multiplyAnswerGPR));
- m_jit.assembler().sub(quotientThenRemainderGPR, dividendGPR, multiplyAnswerGPR);
-
- // If the user cares about negative zero, then speculate that we're not about
- // to produce negative zero.
- if (shouldCheckNegativeZero(node->arithMode())) {
- // Check that we're not about to create negative zero.
- JITCompiler::Jump numeratorPositive = m_jit.branch32(JITCompiler::GreaterThanOrEqual, dividendGPR, TrustedImm32(0));
- speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchTest32(JITCompiler::Zero, quotientThenRemainderGPR));
- numeratorPositive.link(&m_jit);
- }
-
- done.link(&m_jit);
-
- int32Result(quotientThenRemainderGPR, node);
-#elif CPU(ARM64)
- GPRTemporary temp(this);
- GPRTemporary quotientThenRemainder(this);
- GPRTemporary multiplyAnswer(this);
- GPRReg dividendGPR = op1.gpr();
- GPRReg divisorGPR = op2.gpr();
- GPRReg quotientThenRemainderGPR = quotientThenRemainder.gpr();
- GPRReg multiplyAnswerGPR = multiplyAnswer.gpr();
-
- JITCompiler::JumpList done;
</del><span class="cx">
</span><span class="cx"> if (shouldCheckOverflow(node->arithMode()))
</span><span class="cx"> speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchTest32(JITCompiler::Zero, divisorGPR));
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170106 => 170107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-18 17:53:33 UTC (rev 170106)
+++ trunk/Source/WebCore/ChangeLog 2014-06-18 17:58:28 UTC (rev 170107)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-06-18 Alex Christensen <achristensen@webkit.org>
+
+ Remove duplicate code using sdiv.
+ https://bugs.webkit.org/show_bug.cgi?id=133764
+
+ Reviewed by Daniel Bates.
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):
+ Use template sdiv for apple armv7s and arm64.
+
</ins><span class="cx"> 2014-06-18 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> ScriptExecutionContext::Task parameters should always be rvalue references
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (170106 => 170107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-18 17:53:33 UTC (rev 170106)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-18 17:58:28 UTC (rev 170107)
</span><span class="lines">@@ -1497,11 +1497,7 @@
</span><span class="cx"> m_assembler.move(Assembler::TrustedImm32(divisor), divisorRegister);
</span><span class="cx">
</span><span class="cx"> LocalRegister resultRegister(m_registerAllocator);
</span><del>-#if CPU(APPLE_ARMV7S)
- m_assembler.m_assembler.sdiv(resultRegister, inputDividend, divisorRegister);
-#elif CPU(ARM64)
</del><span class="cx"> m_assembler.m_assembler.sdiv<32>(resultRegister, inputDividend, divisorRegister);
</span><del>-#endif
</del><span class="cx"> m_assembler.mul32(divisorRegister, resultRegister);
</span><span class="cx"> return m_assembler.branchSub32(condition, inputDividend, resultRegister, resultRegister);
</span><span class="cx"> #elif CPU(ARM_THUMB2) && !CPU(APPLE_ARMV7S)
</span></span></pre>
</div>
</div>
</body>
</html>