<!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>[181570] 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/181570">181570</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-16 11:44:46 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ARM] Enable generating idiv instructions if it is supported
https://bugs.webkit.org/show_bug.cgi?id=142725
Reviewed by Michael Saboff.
Source/JavaScriptCore:
* assembler/ARMAssembler.h: Added sdiv and udiv implementation for ARM Traditional instruction set.
(JSC::ARMAssembler::sdiv):
(JSC::ARMAssembler::udiv):
* assembler/ARMv7Assembler.h: Use HAVE(ARM_IDIV_INSTRUCTIONS) instead of CPU(APPLE_ARMV7S).
* assembler/AbstractMacroAssembler.h:
(JSC::isARMv7IDIVSupported):
(JSC::optimizeForARMv7IDIVSupported):
(JSC::isARMv7s): Renamed to isARMv7IDIVSupported().
(JSC::optimizeForARMv7s): Renamed to optimizeForARMv7IDIVSupported().
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileArithDiv):
(JSC::DFG::SpeculativeJIT::compileArithMod):
Source/WTF:
* wtf/Platform.h: Set HAVE_ARM_IDIV_INSTRUCTIONS based on GCC macro too.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMAssemblerh">trunk/Source/JavaScriptCore/assembler/ARMAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181569 => 181570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-16 18:30:34 UTC (rev 181569)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-16 18:44:46 UTC (rev 181570)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-03-16 Csaba Osztrogonác <ossy@webkit.org>
+
+ [ARM] Enable generating idiv instructions if it is supported
+ https://bugs.webkit.org/show_bug.cgi?id=142725
+
+ Reviewed by Michael Saboff.
+
+ * assembler/ARMAssembler.h: Added sdiv and udiv implementation for ARM Traditional instruction set.
+ (JSC::ARMAssembler::sdiv):
+ (JSC::ARMAssembler::udiv):
+ * assembler/ARMv7Assembler.h: Use HAVE(ARM_IDIV_INSTRUCTIONS) instead of CPU(APPLE_ARMV7S).
+ * assembler/AbstractMacroAssembler.h:
+ (JSC::isARMv7IDIVSupported):
+ (JSC::optimizeForARMv7IDIVSupported):
+ (JSC::isARMv7s): Renamed to isARMv7IDIVSupported().
+ (JSC::optimizeForARMv7s): Renamed to optimizeForARMv7IDIVSupported().
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileArithDiv):
+ (JSC::DFG::SpeculativeJIT::compileArithMod):
+
</ins><span class="cx"> 2015-03-15 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG::PutStackSinkingPhase should eliminate GetStacks that have an obviously known source, and emit GetStacks when the stack's value is needed and none is deferred
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMAssembler.h (181569 => 181570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2015-03-16 18:30:34 UTC (rev 181569)
+++ trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2015-03-16 18:44:46 UTC (rev 181570)
</span><span class="lines">@@ -216,6 +216,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> NOP = 0xe1a00000,
</span><span class="cx"> DMB_SY = 0xf57ff05f,
</span><ins>+#if HAVE(ARM_IDIV_INSTRUCTIONS)
+ SDIV = 0x0710f010,
+ UDIV = 0x0730f010,
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum {
</span><span class="lines">@@ -477,6 +481,26 @@
</span><span class="cx"> m_buffer.putInt(toARMWord(cc) | MULL | RN(rdhi) | RD(rdlo) | RS(rn) | RM(rm));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(ARM_IDIV_INSTRUCTIONS)
+ template<int datasize>
+ void sdiv(int rd, int rn, int rm, Condition cc = AL)
+ {
+ static_assert(datasize == 32, "sdiv datasize must be 32 for armv7s");
+ ASSERT(rd != ARMRegisters::pc);
+ ASSERT(rn != ARMRegisters::pc);
+ ASSERT(rm != ARMRegisters::pc);
+ m_buffer.putInt(toARMWord(cc) | SDIV | RN(rd) | RM(rn) | RS(rm));
+ }
+
+ void udiv(int rd, int rn, int rm, Condition cc = AL)
+ {
+ ASSERT(rd != ARMRegisters::pc);
+ ASSERT(rn != ARMRegisters::pc);
+ ASSERT(rm != ARMRegisters::pc);
+ m_buffer.putInt(toARMWord(cc) | UDIV | RN(rd) | RM(rn) | RS(rm));
+ }
+#endif
+
</ins><span class="cx"> void vmov_f64(int dd, int dm, Condition cc = AL)
</span><span class="cx"> {
</span><span class="cx"> emitDoublePrecisionInstruction(toARMWord(cc) | VMOV_F64, dd, 0, dm);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (181569 => 181570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2015-03-16 18:30:34 UTC (rev 181569)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2015-03-16 18:44:46 UTC (rev 181570)
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx"> OP_ROR_reg_T2 = 0xFA60,
</span><span class="cx"> OP_CLZ = 0xFAB0,
</span><span class="cx"> OP_SMULL_T1 = 0xFB80,
</span><del>-#if CPU(APPLE_ARMV7S)
</del><ins>+#if HAVE(ARM_IDIV_INSTRUCTIONS)
</ins><span class="cx"> OP_SDIV_T1 = 0xFB90,
</span><span class="cx"> OP_UDIV_T1 = 0xFBB0,
</span><span class="cx"> #endif
</span><span class="lines">@@ -1499,7 +1499,7 @@
</span><span class="cx"> m_formatter.twoWordOp16Imm16(OP_PUSH_T2, registerList);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if CPU(APPLE_ARMV7S)
</del><ins>+#if HAVE(ARM_IDIV_INSTRUCTIONS)
</ins><span class="cx"> template<int datasize>
</span><span class="cx"> ALWAYS_INLINE void sdiv(RegisterID rd, RegisterID rn, RegisterID rm)
</span><span class="cx"> {
</span><span class="lines">@@ -1847,7 +1847,7 @@
</span><span class="cx"> m_formatter.twoWordOp12Reg40Imm3Reg4Imm20Imm5(OP_UBFX_T1, rd, rn, (lsb & 0x1c) << 10, (lsb & 0x3) << 6, (width - 1) & 0x1f);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if CPU(APPLE_ARMV7S)
</del><ins>+#if HAVE(ARM_IDIV_INSTRUCTIONS)
</ins><span class="cx"> ALWAYS_INLINE void udiv(RegisterID rd, RegisterID rn, RegisterID rm)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!BadReg(rd));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h (181569 => 181570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2015-03-16 18:30:34 UTC (rev 181569)
+++ trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2015-03-16 18:44:46 UTC (rev 181570)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-inline bool isARMv7s()
</del><ins>+inline bool isARMv7IDIVSupported()
</ins><span class="cx"> {
</span><del>-#if CPU(APPLE_ARMV7S)
</del><ins>+#if HAVE(ARM_IDIV_INSTRUCTIONS)
</ins><span class="cx"> return true;
</span><span class="cx"> #else
</span><span class="cx"> return false;
</span><span class="lines">@@ -66,9 +66,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool optimizeForARMv7s()
</del><ins>+inline bool optimizeForARMv7IDIVSupported()
</ins><span class="cx"> {
</span><del>- return isARMv7s() && Options::enableArchitectureSpecificOptimizations();
</del><ins>+ return isARMv7IDIVSupported() && Options::enableArchitectureSpecificOptimizations();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool optimizeForARM64()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (181569 => 181570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-03-16 18:30:34 UTC (rev 181569)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-03-16 18:44:46 UTC (rev 181570)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> case ArithMod: {
</span><span class="cx"> if (Node::shouldSpeculateInt32OrBooleanForArithmetic(node->child1().node(), node->child2().node())
</span><span class="cx"> && node->canSpeculateInt32(FixupPass)) {
</span><del>- if (optimizeForX86() || optimizeForARM64() || optimizeForARMv7s()) {
</del><ins>+ if (optimizeForX86() || optimizeForARM64() || optimizeForARMv7IDIVSupported()) {
</ins><span class="cx"> fixIntOrBooleanEdge(node->child1());
</span><span class="cx"> fixIntOrBooleanEdge(node->child2());
</span><span class="cx"> if (bytecodeCanTruncateInteger(node->arithNodeFlags()))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (181569 => 181570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-03-16 18:30:34 UTC (rev 181569)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-03-16 18:44:46 UTC (rev 181570)
</span><span class="lines">@@ -3198,7 +3198,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) || CPU(ARM64)
</del><ins>+#elif HAVE(ARM_IDIV_INSTRUCTIONS) || 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">@@ -3451,7 +3451,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(ARM64) || CPU(APPLE_ARMV7S)
</del><ins>+#elif HAVE(ARM_IDIV_INSTRUCTIONS) || CPU(ARM64)
</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">@@ -3476,7 +3476,7 @@
</span><span class="cx"> // arithMode() == Arith::Unchecked?
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=126444
</span><span class="cx"> speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchMul32(JITCompiler::Overflow, quotientThenRemainderGPR, divisorGPR, multiplyAnswerGPR));
</span><del>-#if CPU(APPLE_ARMV7S)
</del><ins>+#if HAVE(ARM_IDIV_INSTRUCTIONS)
</ins><span class="cx"> m_jit.assembler().sub(quotientThenRemainderGPR, dividendGPR, multiplyAnswerGPR);
</span><span class="cx"> #else
</span><span class="cx"> m_jit.assembler().sub<32>(quotientThenRemainderGPR, dividendGPR, multiplyAnswerGPR);
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (181569 => 181570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-03-16 18:30:34 UTC (rev 181569)
+++ trunk/Source/WTF/ChangeLog 2015-03-16 18:44:46 UTC (rev 181570)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-03-16 Csaba Osztrogonác <ossy@webkit.org>
+
+ [ARM] Enable generating idiv instructions if it is supported
+ https://bugs.webkit.org/show_bug.cgi?id=142725
+
+ Reviewed by Michael Saboff.
+
+ * wtf/Platform.h: Set HAVE_ARM_IDIV_INSTRUCTIONS based on GCC macro too.
+
</ins><span class="cx"> 2015-03-16 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix StringView after r181525
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (181569 => 181570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-03-16 18:30:34 UTC (rev 181569)
+++ trunk/Source/WTF/wtf/Platform.h 2015-03-16 18:44:46 UTC (rev 181570)
</span><span class="lines">@@ -334,6 +334,10 @@
</span><span class="cx"> #define WTF_CPU_APPLE_ARMV7S 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__ARM_ARCH_EXT_IDIV__) || CPU(APPLE_ARMV7S)
+#define HAVE_ARM_IDIV_INSTRUCTIONS 1
+#endif
+
</ins><span class="cx"> #endif /* ARM */
</span><span class="cx">
</span><span class="cx"> #if CPU(ARM) || CPU(MIPS) || CPU(SH4)
</span></span></pre>
</div>
</div>
</body>
</html>