[webkit-changes] [121887] trunk/Source/JavaScriptCore

Thu, 05 Jul 2012 00:54:12 -0700

Title: [121887] trunk/Source/_javascript_Core
Revision
121887
Author
[email protected]
Date
2012-07-05 00:53:51 -0700 (Thu, 05 Jul 2012)

Log Message

[Qt] Unreviewed buildfix after r121886. Typo fix.

* assembler/MacroAssemblerARM.cpp:
(JSC::MacroAssemblerARM::load32WithUnalignedHalfWords):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (121886 => 121887)


--- trunk/Source/_javascript_Core/ChangeLog	2012-07-05 07:24:21 UTC (rev 121886)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-07-05 07:53:51 UTC (rev 121887)
@@ -1,5 +1,12 @@
 2012-07-05  Zoltan Herczeg  <[email protected]>
 
+        [Qt] Unreviewed buildfix after r121886. Typo fix.
+
+        * assembler/MacroAssemblerARM.cpp:
+        (JSC::MacroAssemblerARM::load32WithUnalignedHalfWords):
+
+2012-07-05  Zoltan Herczeg  <[email protected]>
+
         Port DFG JIT to traditional ARM
         https://bugs.webkit.org/show_bug.cgi?id=90198

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp (121886 => 121887)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp	2012-07-05 07:24:21 UTC (rev 121886)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp	2012-07-05 07:53:51 UTC (rev 121887)
@@ -77,18 +77,18 @@
 
     if (address.offset >= 0 && address.offset + 0x2 <= 0xff) {
         m_assembler.add_r(ARMRegisters::S0, address.base, op2);
-        m_assembler.dtrh_u(LoadUint16, dest, ARMRegisters::S0, ARMAssembler::getOp2Half(address.offset));
-        m_assembler.dtrh_u(LoadUint16, ARMRegisters::S0, ARMRegisters::S0, ARMAssembler::getOp2Half(address.offset + 0x2));
+        m_assembler.dtrh_u(ARMAssembler::LoadUint16, dest, ARMRegisters::S0, ARMAssembler::getOp2Half(address.offset));
+        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(LoadUint16, dest, ARMRegisters::S0, ARMAssembler::getOp2Byte(-address.offset));
-        m_assembler.dtrh_d(LoadUint16, ARMRegisters::S0, ARMRegisters::S0, ARMAssembler::getOp2Byte(-address.offset - 0x2));
+        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));
     } else {
         m_assembler.moveImm(address.offset, ARMRegisters::S0);
         m_assembler.add_r(ARMRegisters::S0, ARMRegisters::S0, op2);
-        m_assembler.dtrh_r(true, TYPE_UH, dest, address.base, ARMRegisters::S0);
+        m_assembler.dtrh_ur(ARMAssembler::LoadUint16, dest, address.base, ARMRegisters::S0);
         m_assembler.add_r(ARMRegisters::S0, ARMRegisters::S0, ARMAssembler::OP2_IMM | 0x2);
-        m_assembler.dtrh_r(true, TYPE_UH, ARMRegisters::S0, address.base, ARMRegisters::S0);
+        m_assembler.dtrh_ur(ARMAssembler::LoadUint16, ARMRegisters::S0, address.base, ARMRegisters::S0);
     }
     m_assembler.orr_r(dest, dest, m_assembler.lsl(ARMRegisters::S0, 16));
 }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to