Changeset 58904 in webkit for trunk/JavaScriptCore

Timestamp:

May 6, 2010, 1:04:28 PM (15 years ago)

Author:

[email protected]

Message:

Fix ARM builds

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerARM.h (modified) (1 diff)
• assembler/MacroAssemblerARMv7.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-05-06  Oliver Hunt  <[email protected]>
+
+        Build fix
+
+        Fix ARM builds
+
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::load16):
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::load16):
+
 2010-05-06  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/assembler/MacroAssemblerARM.h

@@ -273 +273 @@
         else
             m_assembler.ldrh_d(dest, ARMRegisters::S0, ARMAssembler::getOp2Byte(-address.offset));
+    }
+    
+    void load16(ImplicitAddress address, RegisterID dest)
+    {
+        if (address.offset >= 0)
+            m_assembler.ldrh_u(dest, address.base, ARMAssembler::getOp2Byte(address.offset));
+        else
+            m_assembler.ldrh_d(dest, address.base, ARMAssembler::getOp2Byte(-address.offset));   
     }
 

trunk/JavaScriptCore/assembler/MacroAssemblerARMv7.h

@@ -457 +457 @@
         m_assembler.ldrh(dest, makeBaseIndexBase(address), address.index, address.scale);
     }
+    
+    void load16(ImplicitAddress address, RegisterID dest)
+    {
+        m_assembler.ldrh(dest, address.base, address.offset);
+    }
 
     DataLabel32 store32WithAddressOffsetPatch(RegisterID src, Address address)