Title: [151741] branches/dfgFourthTier/Source/_javascript_Core
- Revision
- 151741
- Author
- msab...@apple.com
- Date
- 2013-06-19 10:42:44 -0700 (Wed, 19 Jun 2013)
Log Message
FTL: arm build is broken in ToT
https://bugs.webkit.org/show_bug.cgi?id=117800
Unreviewed build fixes.
* assembler/ARMv7Assembler.h:
(ARMv7Assembler): Merge of r147941
* jit/JITArithmetic32_64.cpp:
(JSC::JIT::emit_op_mod): Moved variable declaration back inside #ifdef where used.
Modified Paths
Diff
Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (151740 => 151741)
--- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-06-19 17:40:25 UTC (rev 151740)
+++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-06-19 17:42:44 UTC (rev 151741)
@@ -1,3 +1,15 @@
+2013-06-19 Michael Saboff <msab...@apple.com>
+
+ FTL: arm build is broken in ToT
+ https://bugs.webkit.org/show_bug.cgi?id=117800
+
+ Unreviewed build fixes.
+
+ * assembler/ARMv7Assembler.h:
+ (ARMv7Assembler): Merge of r147941
+ * jit/JITArithmetic32_64.cpp:
+ (JSC::JIT::emit_op_mod): Moved variable declaration back inside #ifdef where used.
+
2013-06-17 Michael Saboff <msab...@apple.com>
FTL: Add another temp register regT4 to JSInterfaceJIT
Modified: branches/dfgFourthTier/Source/_javascript_Core/assembler/ARMv7Assembler.h (151740 => 151741)
--- branches/dfgFourthTier/Source/_javascript_Core/assembler/ARMv7Assembler.h 2013-06-19 17:40:25 UTC (rev 151740)
+++ branches/dfgFourthTier/Source/_javascript_Core/assembler/ARMv7Assembler.h 2013-06-19 17:42:44 UTC (rev 151741)
@@ -2810,7 +2810,7 @@
AssemblerBuffer m_buffer;
} m_formatter;
- Vector<LinkRecord> m_jumpsToLink;
+ Vector<LinkRecord, 0, UnsafeVectorOverflow> m_jumpsToLink;
Vector<int32_t> m_offsets;
int m_indexOfLastWatchpoint;
int m_indexOfTailOfLastWatchpoint;
Modified: branches/dfgFourthTier/Source/_javascript_Core/jit/JITArithmetic32_64.cpp (151740 => 151741)
--- branches/dfgFourthTier/Source/_javascript_Core/jit/JITArithmetic32_64.cpp 2013-06-19 17:40:25 UTC (rev 151740)
+++ branches/dfgFourthTier/Source/_javascript_Core/jit/JITArithmetic32_64.cpp 2013-06-19 17:42:44 UTC (rev 151741)
@@ -1112,11 +1112,11 @@
void JIT::emit_op_mod(Instruction* currentInstruction)
{
+#if CPU(X86) || CPU(X86_64)
unsigned dst = currentInstruction[1].u.operand;
unsigned op1 = currentInstruction[2].u.operand;
unsigned op2 = currentInstruction[3].u.operand;
-#if CPU(X86) || CPU(X86_64)
// Make sure registers are correct for x86 IDIV instructions.
ASSERT(regT0 == X86Registers::eax);
ASSERT(regT1 == X86Registers::edx);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
