Title: [86923] trunk/Source/_javascript_Core
- Revision
- 86923
- Author
- [email protected]
- Date
- 2011-05-19 22:27:48 -0700 (Thu, 19 May 2011)
Log Message
Fix ARM build after r86919
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::nop):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (86922 => 86923)
--- trunk/Source/_javascript_Core/ChangeLog 2011-05-20 04:10:49 UTC (rev 86922)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-05-20 05:27:48 UTC (rev 86923)
@@ -1,3 +1,10 @@
+2011-05-19 Gabor Loki <[email protected]>
+
+ Fix ARM build after r86919
+
+ * assembler/ARMAssembler.h:
+ (JSC::ARMAssembler::nop):
+
2011-05-19 Oliver Hunt <[email protected]>
Reviewed by Gavin Barraclough.
Modified: trunk/Source/_javascript_Core/assembler/ARMAssembler.h (86922 => 86923)
--- trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2011-05-20 04:10:49 UTC (rev 86922)
+++ trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2011-05-20 05:27:48 UTC (rev 86923)
@@ -167,12 +167,12 @@
CLZ = 0x016f0f10,
BKPT = 0xe1200070,
BLX = 0x012fff30,
- NOP_T2 = 0xf3af8000,
#endif
#if WTF_ARM_ARCH_AT_LEAST(7)
MOVW = 0x03000000,
MOVT = 0x03400000,
#endif
+ NOP = 0xe1a00000,
};
enum {
@@ -572,10 +572,10 @@
dtr_dr(true, ARMRegisters::S0, ARMRegisters::S0, ARMRegisters::S0);
#endif
}
-
+
void nop()
{
- m_buffer.putInt(OP_NOP_T2);
+ m_buffer.putInt(NOP);
}
void bx(int rm, Condition cc = AL)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
