Modified: trunk/Source/_javascript_Core/ChangeLog (208790 => 208791)
--- trunk/Source/_javascript_Core/ChangeLog 2016-11-16 14:00:37 UTC (rev 208790)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-11-16 16:18:16 UTC (rev 208791)
@@ -1,3 +1,12 @@
+2016-11-16 Keith Miller <[email protected]>
+
+ Unreviewed, ARM build fix.
+
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::lower):
+ (JSC::B3::Air::LowerToAir::lowerX86Div):
+ (JSC::B3::Air::LowerToAir::lowerX86UDiv):
+
2016-11-15 Mark Lam <[email protected]>
Make JSC test functions more robust.
Modified: trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp (208790 => 208791)
--- trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2016-11-16 14:00:37 UTC (rev 208790)
+++ trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2016-11-16 16:18:16 UTC (rev 208791)
@@ -2096,8 +2096,7 @@
if (m_value->isChill())
RELEASE_ASSERT(isARM64());
if (isInt(m_value->type()) && isX86()) {
- lowerX86Div();
- append(Move, Tmp(X86Registers::eax), tmp(m_value));
+ lowerX86Div(Div);
return;
}
ASSERT(!isX86() || isFloat(m_value->type()));
@@ -2108,8 +2107,7 @@
case UDiv: {
if (isInt(m_value->type()) && isX86()) {
- lowerX86UDiv();
- append(Move, Tmp(X86Registers::eax), tmp(m_value));
+ lowerX86UDiv(UDiv);
return;
}
@@ -2123,19 +2121,13 @@
case Mod: {
RELEASE_ASSERT(isX86());
RELEASE_ASSERT(!m_value->isChill());
-#if CPU(X86) || CPU(X86_64)
- lowerX86Div();
- append(Move, Tmp(X86Registers::edx), tmp(m_value));
-#endif
+ lowerX86Div(Mod);
return;
}
case UMod: {
RELEASE_ASSERT(isX86());
-#if CPU(X86) || CPU(X86_64)
- lowerX86UDiv();
- append(Move, Tmp(X86Registers::edx), tmp(m_value));
-#endif
+ lowerX86UDiv(UMod);
return;
}
@@ -2795,7 +2787,7 @@
RELEASE_ASSERT_NOT_REACHED();
}
- void lowerX86Div()
+ void lowerX86Div(B3::Opcode op)
{
#if CPU(X86) || CPU(X86_64)
Tmp eax = Tmp(X86Registers::eax);
@@ -2816,16 +2808,22 @@
RELEASE_ASSERT_NOT_REACHED();
return;
}
-
+
+ ASSERT(op == Div || op == Mod);
+ X86Registers::RegisterID result = op == Div ? X86Registers::eax : X86Registers::edx;
+
append(Move, tmp(m_value->child(0)), eax);
append(convertToDoubleWord, eax, edx);
append(div, eax, edx, tmp(m_value->child(1)));
+ append(Move, Tmp(result), tmp(m_value));
+
#else
+ UNUSED_PARAM(op);
UNREACHABLE_FOR_PLATFORM();
#endif
}
- void lowerX86UDiv()
+ void lowerX86UDiv(B3::Opcode op)
{
#if CPU(X86) || CPU(X86_64)
Tmp eax = Tmp(X86Registers::eax);
@@ -2833,10 +2831,15 @@
Air::Opcode div = m_value->type() == Int32 ? X86UDiv32 : X86UDiv64;
+ ASSERT(op == UDiv || op == UMod);
+ X86Registers::RegisterID result = op == Div ? X86Registers::eax : X86Registers::edx;
+
append(Move, tmp(m_value->child(0)), eax);
append(Xor64, edx, edx);
append(div, eax, edx, tmp(m_value->child(1)));
+ append(Move, Tmp(result), tmp(m_value));
#else
+ UNUSED_PARAM(op);
UNREACHABLE_FOR_PLATFORM();
#endif
}