Changeset 60577 in webkit for trunk/JavaScriptCore/assembler/MacroAssemblerARMv7.h

Timestamp:

Jun 2, 2010, 1:56:16 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=40011

Reviewed by Gavin Barraclough.

Thumb-2 build fix: The offset parameter of ldrh should be encoded as an
imm12 immediate constant in load16. If it is not fit in the instruction
a temporary register has to be used.

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::load16):

File:

• trunk/JavaScriptCore/assembler/MacroAssemblerARMv7.h (modified) (1 diff)

trunk/JavaScriptCore/assembler/MacroAssemblerARMv7.h

@@ -460 +460 @@
     void load16(ImplicitAddress address, RegisterID dest)
     {
-        m_assembler.ldrh(dest, address.base, address.offset);
+        ARMThumbImmediate armImm = ARMThumbImmediate::makeUInt12(address.offset);
+        if (armImm.isValid())
+            m_assembler.ldrh(dest, address.base, armImm);
+        else {
+            move(Imm32(address.offset), dataTempRegister);
+            m_assembler.ldrh(dest, address.base, dataTempRegister);
+        }
     }