Changeset 93277 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Aug 17, 2011, 7:56:13 PM (14 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=66379
implements load32WithCompactAddressOffsetPatch function
and fixes store32 and moveWithPatch functions for SH4 platforms.

Patch by Thouraya ANDOLSI <​[email protected]> on 2011-08-17
Reviewed by Gavin Barraclough.

• assembler/MacroAssemblerSH4.h:

(JSC::MacroAssemblerSH4::rshift32):
(JSC::MacroAssemblerSH4::store32):
(JSC::MacroAssemblerSH4::load32WithCompactAddressOffsetPatch):
(JSC::MacroAssemblerSH4::moveWithPatch):

• assembler/SH4Assembler.h:

(JSC::SH4Assembler::movlMemRegCompact):
(JSC::SH4Assembler::readPointer):
(JSC::SH4Assembler::repatchCompact):

• jit/JIT.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerSH4.h (modified) (7 diffs)
• assembler/SH4Assembler.h (modified) (5 diffs)
• jit/JIT.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-08-17  Thouraya ANDOLSI  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=66379
+        implements load32WithCompactAddressOffsetPatch function 
+        and fixes store32 and moveWithPatch functions for SH4 platforms.
+
+        Reviewed by Gavin Barraclough.
+
+        * assembler/MacroAssemblerSH4.h:
+        (JSC::MacroAssemblerSH4::rshift32):
+        (JSC::MacroAssemblerSH4::store32):
+        (JSC::MacroAssemblerSH4::load32WithCompactAddressOffsetPatch):
+        (JSC::MacroAssemblerSH4::moveWithPatch):
+        * assembler/SH4Assembler.h:
+        (JSC::SH4Assembler::movlMemRegCompact):
+        (JSC::SH4Assembler::readPointer):
+        (JSC::SH4Assembler::repatchCompact):
+        * jit/JIT.h:
+
 2011-08-17  Filip Pizlo  <[email protected]>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h

@@ -46 +46 @@
     static const RegisterID scratchReg3 = SH4Registers::r13;
 
-    static const int MaximumCompactPtrAlignedAddressOffset = 0x7FFFFFFF;
+    static const int MaximumCompactPtrAlignedAddressOffset = 60;
 
     enum RelationalCondition {
@@ -237 +237 @@
     }
 
+    void rshift32(RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        if (src != dest)
+            move(src, dest);
+        rshift32(imm, dest);
+    }
+
     void sub32(RegisterID src, RegisterID dest)
     {
@@ -712 +719 @@
         m_assembler.loadConstant((imm.m_value), scr);
         m_assembler.loadConstant(reinterpret_cast<uint32_t>(address), scr1);
-        m_assembler.movlMemReg(scr, scr1);
+        m_assembler.movlRegMem(scr, scr1);
         releaseScratch(scr);
         releaseScratch(scr1);
@@ -721 +728 @@
         RegisterID scr = claimScratch();
         m_assembler.loadConstant(reinterpret_cast<uint32_t>(address), scr);
-        m_assembler.movlMemReg(src, scr);
+        m_assembler.movlRegMem(src, scr);
         releaseScratch(scr);
     }
@@ -736 +743 @@
     }
     
-    DataLabel32 load32WithAddressOffsetPatch(Address address, RegisterID dest)
-    {
-        RegisterID scr = claimScratch();
-        DataLabelCompact label(this);
-        m_assembler.loadConstantUnReusable(address.offset, scr);
-        m_assembler.addlRegReg(address.base, scr);
-        m_assembler.movlMemReg(scr, dest);
-        releaseScratch(scr);
-        return label;
-    }
-
     DataLabel32 store32WithAddressOffsetPatch(RegisterID src, Address address)
     {
@@ -756 +752 @@
         releaseScratch(scr);
         return label;
+    }
+
+    DataLabelCompact load32WithCompactAddressOffsetPatch(Address address, RegisterID dest)
+    {
+        DataLabelCompact dataLabel(this);
+        ASSERT(address.offset <= MaximumCompactPtrAlignedAddressOffset);
+        ASSERT(address.offset >= 0);
+        m_assembler.movlMemRegCompact(address.offset >> 2, address.base, dest);
+        return dataLabel;
     }
 
@@ -1195 +1200 @@
     DataLabelPtr moveWithPatch(TrustedImmPtr initialValue, RegisterID dest)
     {
+        m_assembler.ensureSpace(m_assembler.maxInstructionSize, sizeof(uint32_t));
         DataLabelPtr dataLabel(this);
-        m_assembler.loadConstantUnReusable(reinterpret_cast<uint32_t>(initialValue.m_value), dest, true);
+        m_assembler.loadConstantUnReusable(reinterpret_cast<uint32_t>(initialValue.m_value), dest);
         return dataLabel;
     }

trunk/Source/JavaScriptCore/assembler/SH4Assembler.h

@@ -34 +34 @@
 #include <stdarg.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <wtf/Assertions.h>
 #include <wtf/Vector.h>
@@ -1064 +1065 @@
     }
 
+    void movlMemRegCompact(int offset, RegisterID base, RegisterID dst)
+    {
+        oneShortOp(getOpcodeGroup4(MOVL_READ_OFFRM_OPCODE, dst, base, offset));
+    }
+
     void movbMemReg(int offset, RegisterID base, RegisterID dst)
     {
@@ -1233 +1239 @@
         *reinterpret_cast<uint32_t*>(address) = newAddress;
     }
-    
+
     static uint32_t readPCrelativeAddress(int offset, uint16_t* instructionPtr)
     {
@@ -1355 +1361 @@
     static void* readPointer(void* code)
     {
-        return static_cast<void*>(readInt32(code));
+        return reinterpret_cast<void*>(readInt32(code));
     }
 
@@ -1366 +1372 @@
     static void repatchCompact(void* where, int32_t value)
     {
-        repatchInt32(where, value);
+        ASSERT(value >= 0);
+        ASSERT(value <= 60);
+        *reinterpret_cast<uint16_t*>(where) = ((*reinterpret_cast<uint16_t*>(where) & 0xfff0) | (value >> 2));
+        ExecutableAllocator::cacheFlush(reinterpret_cast<uint16_t*>(where), sizeof(uint16_t));
     }
 

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -489 +489 @@
         static const int patchOffsetGetByIdBranchToSlowCase = 10;
         static const int patchOffsetGetByIdPropertyMapOffset = 24;
-        static const int patchOffsetGetByIdPutResult = 32;
+        static const int patchOffsetGetByIdPutResult = 24;
 
         // sequenceOpCall
@@ -508 +508 @@
 
         static const int patchOffsetGetByIdPropertyMapOffset1 = 20;
-        static const int patchOffsetGetByIdPropertyMapOffset2 = 26;
+        static const int patchOffsetGetByIdPropertyMapOffset2 = 22;
 
         static const int patchOffsetPutByIdPropertyMapOffset1 = 20;