Changeset 158915 in webkit

Timestamp:

Nov 8, 2013 3:22:04 AM (10 years ago)

Author:

Csaba Osztrogonác

Message:

[arm] Use specific PatchableJump implementation for CPU(ARM_TRADITIONAL).
​https://bugs.webkit.org/show_bug.cgi?id=123891

Patch by Julien Brianceau <​jbriance@cisco.com> on 2013-11-08
Reviewed by Michael Saboff.

Although patchableBranch32 is implemented in MacroAssemblerARM.h, the used implementation
is the generic one in MacroAssembler.h. This patch fixes it and also implements the
patchableJump() function for CPU(ARM_TRADITIONAL). These specific implementations are
needed for this architecture backend to ensure that these jumps can be relinked.

• assembler/MacroAssembler.h:
• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::patchableJump):

• jit/GPRInfo.h: Remove static_cast that are generating warnings in debug builds.

(JSC::GPRInfo::toIndex):
(JSC::GPRInfo::debugName):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssembler.h (modified) (2 diffs)
• assembler/MacroAssemblerARM.h (modified) (1 diff)
• jit/GPRInfo.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-11-08  Julien Brianceau  <jbriance@cisco.com>
+
+        [arm] Use specific PatchableJump implementation for CPU(ARM_TRADITIONAL).
+        https://bugs.webkit.org/show_bug.cgi?id=123891
+
+        Reviewed by Michael Saboff.
+
+        Although patchableBranch32 is implemented in MacroAssemblerARM.h, the used implementation
+        is the generic one in MacroAssembler.h. This patch fixes it and also implements the
+        patchableJump() function for CPU(ARM_TRADITIONAL). These specific implementations are
+        needed for this architecture backend to ensure that these jumps can be relinked.
+
+        * assembler/MacroAssembler.h:
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::patchableJump):
+        * jit/GPRInfo.h: Remove static_cast that are generating warnings in debug builds.
+        (JSC::GPRInfo::toIndex):
+        (JSC::GPRInfo::debugName):
+
 2013-11-07  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssembler.h

@@ -360 +360 @@
     }
 
+#if !CPU(ARM_TRADITIONAL)
     PatchableJump patchableJump()
     {
@@ -374 +375 @@
         return PatchableJump(branch32(cond, reg, imm));
     }
+#endif
 #endif
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h

@@ -822 +822 @@
     }
 
+    PatchableJump patchableJump()
+    {
+        return PatchableJump(m_assembler.jmp(ARMAssembler::AL, 1));
+    }
+
     PatchableJump patchableBranch32(RelationalCondition cond, RegisterID reg, TrustedImm32 imm)
     {

trunk/Source/JavaScriptCore/jit/GPRInfo.h

@@ -497 +497 @@
     static unsigned toIndex(GPRReg reg)
     {
-        ASSERT(static_cast<unsigned>(reg) != InvalidGPRReg);
-        ASSERT(static_cast<unsigned>(reg) < 16);
+        ASSERT(reg != InvalidGPRReg);
+        ASSERT(reg < 16);
         static const unsigned indexForRegister[16] = { 0, 1, 2, 8, 3, 9, InvalidIndex, InvalidIndex, 4, 5, 6, 7, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex };
         unsigned result = indexForRegister[reg];
@@ -507 +507 @@
     static const char* debugName(GPRReg reg)
     {
-        ASSERT(static_cast<unsigned>(reg) != InvalidGPRReg);
-        ASSERT(static_cast<unsigned>(reg) < 16);
+        ASSERT(reg != InvalidGPRReg);
+        ASSERT(reg < 16);
         static const char* nameForRegister[16] = {
             "r0", "r1", "r2", "r3",