Diff
Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (152337 => 152338)
--- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-07-03 05:07:45 UTC (rev 152337)
+++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-07-03 05:21:08 UTC (rev 152338)
@@ -1,5 +1,17 @@
2013-07-02 Filip Pizlo <[email protected]>
+ Unreviewed, fix 32-bit build.
+
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::comparePtr):
+ (MacroAssembler):
+ * dfg/DFGBinarySwitch.cpp:
+ (JSC::DFG::BinarySwitch::advance):
+ * dfg/DFGBinarySwitch.h:
+ (JSC::DFG::BinarySwitch::caseValue):
+
+2013-07-02 Filip Pizlo <[email protected]>
+
fourthTier: Have fewer Arrayify's
https://bugs.webkit.org/show_bug.cgi?id=118335
Modified: branches/dfgFourthTier/Source/_javascript_Core/assembler/MacroAssembler.h (152337 => 152338)
--- branches/dfgFourthTier/Source/_javascript_Core/assembler/MacroAssembler.h 2013-07-03 05:07:45 UTC (rev 152337)
+++ branches/dfgFourthTier/Source/_javascript_Core/assembler/MacroAssembler.h 2013-07-03 05:21:08 UTC (rev 152338)
@@ -457,6 +457,11 @@
compare32(cond, left, right, dest);
}
+ void comparePtr(RelationalCondition cond, RegisterID left, RegisterID right, RegisterID dest)
+ {
+ compare32(cond, left, right, dest);
+ }
+
void storePtr(RegisterID src, ImplicitAddress address)
{
store32(src, address);
Modified: branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGBinarySwitch.cpp (152337 => 152338)
--- branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGBinarySwitch.cpp 2013-07-03 05:07:45 UTC (rev 152337)
+++ branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGBinarySwitch.cpp 2013-07-03 05:21:08 UTC (rev 152338)
@@ -66,7 +66,7 @@
case Int32:
m_fallThrough.append(jit.branch32(
MacroAssembler::NotEqual, m_value,
- MacroAssembler::Imm32(m_cases[code.index].value)));
+ MacroAssembler::Imm32(static_cast<int32_t>(m_cases[code.index].value))));
break;
case IntPtr:
m_fallThrough.append(jit.branchPtr(
@@ -80,7 +80,7 @@
case Int32:
m_jumpStack.append(jit.branch32(
MacroAssembler::NotEqual, m_value,
- MacroAssembler::Imm32(m_cases[code.index].value)));
+ MacroAssembler::Imm32(static_cast<int32_t>(m_cases[code.index].value))));
break;
case IntPtr:
m_jumpStack.append(jit.branchPtr(
@@ -94,7 +94,7 @@
case Int32:
m_jumpStack.append(jit.branch32(
MacroAssembler::LessThan, m_value,
- MacroAssembler::Imm32(m_cases[code.index].value)));
+ MacroAssembler::Imm32(static_cast<int32_t>(m_cases[code.index].value))));
break;
case IntPtr:
m_jumpStack.append(jit.branchPtr(
Modified: branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGBinarySwitch.h (152337 => 152338)
--- branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGBinarySwitch.h 2013-07-03 05:07:45 UTC (rev 152337)
+++ branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGBinarySwitch.h 2013-07-03 05:21:08 UTC (rev 152338)
@@ -69,7 +69,7 @@
BinarySwitch(GPRReg value, const Vector<int64_t>& cases, Type);
unsigned caseIndex() const { return m_cases[m_caseIndex].index; }
- int caseValue() const { return m_cases[m_caseIndex].value; }
+ int64_t caseValue() const { return m_cases[m_caseIndex].value; }
bool advance(MacroAssembler&);
Modified: branches/dfgFourthTier/Source/WTF/ChangeLog (152337 => 152338)
--- branches/dfgFourthTier/Source/WTF/ChangeLog 2013-07-03 05:07:45 UTC (rev 152337)
+++ branches/dfgFourthTier/Source/WTF/ChangeLog 2013-07-03 05:21:08 UTC (rev 152338)
@@ -1,5 +1,11 @@
2013-07-02 Filip Pizlo <[email protected]>
+ Unreviewed, fix 32-bit build.
+
+ * wtf/Platform.h:
+
+2013-07-02 Filip Pizlo <[email protected]>
+
fourthTier: FTL should use the equivalent of llvm opt -O2 by default
https://bugs.webkit.org/show_bug.cgi?id=118311
Modified: branches/dfgFourthTier/Source/WTF/wtf/Platform.h (152337 => 152338)
--- branches/dfgFourthTier/Source/WTF/wtf/Platform.h 2013-07-03 05:07:45 UTC (rev 152337)
+++ branches/dfgFourthTier/Source/WTF/wtf/Platform.h 2013-07-03 05:21:08 UTC (rev 152338)
@@ -759,8 +759,8 @@
#define ENABLE_JIT 1
#endif
-/* Do we have LLVM? On Mac, we now always do. */
-#if !defined(HAVE_LLVM) && PLATFORM(MAC)
+/* Do we have LLVM? On Mac 64-bit, we now always do. */
+#if !defined(HAVE_LLVM) && PLATFORM(MAC) && CPU(X86_64)
#define HAVE_LLVM 1
#endif
