Title: [121948] trunk/Source/_javascript_Core
- Revision
- 121948
- Author
- zherc...@webkit.org
- Date
- 2012-07-06 01:42:29 -0700 (Fri, 06 Jul 2012)
Log Message
[Qt][ARM] REGRESSION(r121885): It broke 30 jsc tests, 500+ layout tests
https://bugs.webkit.org/show_bug.cgi?id=90656
Reviewed by Csaba Osztrogonác.
Typo fixes.
* assembler/MacroAssemblerARM.cpp:
(JSC::MacroAssemblerARM::load32WithUnalignedHalfWords):
Rename getOp2Byte() -> getOp2Half()
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::convertibleLoadPtr):
Add a necessary space.
* jit/JITStubs.cpp:
(JSC):
Revert INLINE_ARM_FUNCTION macro.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (121947 => 121948)
--- trunk/Source/_javascript_Core/ChangeLog 2012-07-06 07:17:22 UTC (rev 121947)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-07-06 08:42:29 UTC (rev 121948)
@@ -1,3 +1,22 @@
+2012-07-06 Zoltan Herczeg <zherc...@webkit.org>
+
+ [Qt][ARM] REGRESSION(r121885): It broke 30 jsc tests, 500+ layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=90656
+
+ Reviewed by Csaba Osztrogonác.
+
+ Typo fixes.
+
+ * assembler/MacroAssemblerARM.cpp:
+ (JSC::MacroAssemblerARM::load32WithUnalignedHalfWords):
+ Rename getOp2Byte() -> getOp2Half()
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::convertibleLoadPtr):
+ Add a necessary space.
+ * jit/JITStubs.cpp:
+ (JSC):
+ Revert INLINE_ARM_FUNCTION macro.
+
2012-07-05 Filip Pizlo <fpi...@apple.com>
REGRESSION(r121925): It broke 5 sputnik tests on x86 platforms
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp (121947 => 121948)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2012-07-06 07:17:22 UTC (rev 121947)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2012-07-06 08:42:29 UTC (rev 121948)
@@ -81,8 +81,8 @@
m_assembler.dtrh_u(ARMAssembler::LoadUint16, ARMRegisters::S0, ARMRegisters::S0, ARMAssembler::getOp2Half(address.offset + 0x2));
} else if (address.offset < 0 && address.offset >= -0xff) {
m_assembler.add_r(ARMRegisters::S0, address.base, op2);
- m_assembler.dtrh_d(ARMAssembler::LoadUint16, dest, ARMRegisters::S0, ARMAssembler::getOp2Byte(-address.offset));
- m_assembler.dtrh_d(ARMAssembler::LoadUint16, ARMRegisters::S0, ARMRegisters::S0, ARMAssembler::getOp2Byte(-address.offset - 0x2));
+ m_assembler.dtrh_d(ARMAssembler::LoadUint16, dest, ARMRegisters::S0, ARMAssembler::getOp2Half(-address.offset));
+ m_assembler.dtrh_d(ARMAssembler::LoadUint16, ARMRegisters::S0, ARMRegisters::S0, ARMAssembler::getOp2Half(-address.offset - 0x2));
} else {
m_assembler.moveImm(address.offset, ARMRegisters::S0);
m_assembler.add_r(ARMRegisters::S0, ARMRegisters::S0, op2);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (121947 => 121948)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2012-07-06 07:17:22 UTC (rev 121947)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2012-07-06 08:42:29 UTC (rev 121948)
@@ -604,7 +604,7 @@
ConvertibleLoadLabel convertibleLoadPtr(Address address, RegisterID dest)
{
ConvertibleLoadLabel result(this);
- ASSERT(address.offset >=0 && address.offset <= 255);
+ ASSERT(address.offset >= 0 && address.offset <= 255);
m_assembler.ldrWide8BitImmediate(dest, address.base, address.offset);
return result;
}
Modified: trunk/Source/_javascript_Core/jit/JITStubs.cpp (121947 => 121948)
--- trunk/Source/_javascript_Core/jit/JITStubs.cpp 2012-07-06 07:17:22 UTC (rev 121947)
+++ trunk/Source/_javascript_Core/jit/JITStubs.cpp 2012-07-06 08:42:29 UTC (rev 121948)
@@ -1086,7 +1086,8 @@
".align 2" "\n" \
".globl " SYMBOL_STRING(cti_##op) "\n" \
HIDE_SYMBOL(cti_##op) "\n" \
- INLINE_ARM_FUNCTION(cti_##op) \
+ ".thumb" "\n" \
+ ".thumb_func " THUMB_FUNC_PARAM(cti_##op) "\n" \
SYMBOL_STRING(cti_##op) ":" "\n" \
"str lr, [sp, #" STRINGIZE_VALUE_OF(THUNK_RETURN_ADDRESS_OFFSET) "]" "\n" \
"bl " SYMBOL_STRING(JITStubThunked_##op) "\n" \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
