Title: [164433] trunk/Source/_javascript_Core
- Revision
- 164433
- Author
- [email protected]
- Date
- 2014-02-20 09:38:15 -0800 (Thu, 20 Feb 2014)
Log Message
ASSERTION FAILED: isUInt16() on ARMv7 after r113253.
https://bugs.webkit.org/show_bug.cgi?id=129101
Reviewed by Michael Saboff.
If the immediate value type is encoded then we shouldn't reach this assert.
Check the immediate type to avoid assertion in alignemnt check.
* assembler/ARMv7Assembler.h:
(JSC::ARMv7Assembler::add):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164432 => 164433)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-20 17:27:16 UTC (rev 164432)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-20 17:38:15 UTC (rev 164433)
@@ -1,3 +1,16 @@
+2014-02-20 Gabor Rapcsanyi <[email protected]>
+
+ ASSERTION FAILED: isUInt16() on ARMv7 after r113253.
+ https://bugs.webkit.org/show_bug.cgi?id=129101
+
+ Reviewed by Michael Saboff.
+
+ If the immediate value type is encoded then we shouldn't reach this assert.
+ Check the immediate type to avoid assertion in alignemnt check.
+
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::add):
+
2014-02-20 Csaba Osztrogonác <[email protected]>
Get rid of redundant Platform.h includes
Modified: trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h (164432 => 164433)
--- trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h 2014-02-20 17:27:16 UTC (rev 164432)
+++ trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h 2014-02-20 17:38:15 UTC (rev 164433)
@@ -857,7 +857,7 @@
ASSERT(rn != ARMRegisters::pc);
ASSERT(imm.isValid());
- if (rn == ARMRegisters::sp) {
+ if (rn == ARMRegisters::sp && imm.isUInt16()) {
ASSERT(!(imm.getUInt16() & 3));
if (!(rd & 8) && imm.isUInt10()) {
m_formatter.oneWordOp5Reg3Imm8(OP_ADD_SP_imm_T1, rd, static_cast<uint8_t>(imm.getUInt10() >> 2));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
