Title: [179890] branches/safari-600.1.4.15-branch/Source/_javascript_Core
- Revision
- 179890
- Author
- [email protected]
- Date
- 2015-02-10 15:33:33 -0800 (Tue, 10 Feb 2015)
Log Message
Merged r179187. rdar://problem/19670901
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/_javascript_Core/ChangeLog (179889 => 179890)
--- branches/safari-600.1.4.15-branch/Source/_javascript_Core/ChangeLog 2015-02-10 23:27:27 UTC (rev 179889)
+++ branches/safari-600.1.4.15-branch/Source/_javascript_Core/ChangeLog 2015-02-10 23:33:33 UTC (rev 179890)
@@ -1,5 +1,19 @@
2015-02-10 Babak Shafiei <[email protected]>
+ Merge r179187.
+
+ 2015-01-27 Csaba Osztrogonác <[email protected]>
+
+ [ARM] Typo fix after r176083
+ https://bugs.webkit.org/show_bug.cgi?id=140937
+
+ Reviewed by Anders Carlsson.
+
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::ldrh):
+
+2015-02-10 Babak Shafiei <[email protected]>
+
Merge r176083.
2014-11-13 Benjamin Poulain <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/_javascript_Core/assembler/ARMv7Assembler.h (179889 => 179890)
--- branches/safari-600.1.4.15-branch/Source/_javascript_Core/assembler/ARMv7Assembler.h 2015-02-10 23:27:27 UTC (rev 179889)
+++ branches/safari-600.1.4.15-branch/Source/_javascript_Core/assembler/ARMv7Assembler.h 2015-02-10 23:33:33 UTC (rev 179890)
@@ -1194,7 +1194,7 @@
{
ASSERT(rn != ARMRegisters::pc); // LDR (literal)
ASSERT(imm.isUInt12());
- ASSERT(!(imm.isUInt12() & 1));
+ ASSERT(!(imm.getUInt12() & 1));
if (!((rt | rn) & 8) && imm.isUInt6())
m_formatter.oneWordOp5Imm5Reg3Reg3(OP_LDRH_imm_T1, imm.getUInt6() >> 1, rn, rt);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
