Bug 1271968 - IonMonkey: MIPS: Refactor addMixedJump.

Tag: #1542

1 files changed, 7 insertions, 7 deletions

diff --git a/js/src/jit/mips-shared/Assembler-mips-shared.cpp b/js/src/jit/mips-shared/Assembler-mips-shared.cpp
index 63edc0b02..97f27c2e6 100644
--- a/js/src/jit/mips-shared/Assembler-mips-shared.cpp
+++ b/js/src/jit/mips-shared/Assembler-mips-shared.cpp
@@ -104,7 +104,7 @@ AssemblerMIPSShared::asmMergeWith(const AssemblerMIPSShared& other)
     for (size_t i = 0; i < other.numMixedJumps(); i++) {
         const MixedJumpPatch& mjp = other.mixedJumps_[i];
         addMixedJump(BufferOffset(size() + mjp.src.getOffset()),
-                     ImmPtr(size() + mjp.target), mjp.kind);
+                     size() + mjp.target, mjp.kind);
     }
     return m_buffer.appendBuffer(other.m_buffer);
 }
@@ -1608,7 +1608,7 @@ AssemblerMIPSShared::bind(InstImm* inst, uintptr_t branch, uintptr_t target)
 
     // Generate the patchable mixed jump for call.
     if (inst->extractOpcode() == ((uint32_t)op_jal >> OpcodeShift)) {
-        addMixedJump(BufferOffset(branch), ImmPtr((void*)target));
+        addMixedJump(BufferOffset(branch), target);
         return;
     }
 
@@ -1631,7 +1631,7 @@ AssemblerMIPSShared::bind(InstImm* inst, uintptr_t branch, uintptr_t target)
     if (inst[0].encode() != inst_beq.encode())
         kind = MixedJumpPatch::CONDITIONAL;
 
-    addMixedJump(BufferOffset(branch), ImmPtr((const void*)target), kind);
+    addMixedJump(BufferOffset(branch), target, kind);
 }
 
 void
@@ -1650,7 +1650,7 @@ AssemblerMIPSShared::bind(RepatchLabel* label)
         // If second instruction is lui, then this is a loop backedge.
         if (inst[0].extractOpcode() == (uint32_t(op_j) >> OpcodeShift)) {
             // For unconditional mixed branches generated by jumpWithPatch
-            addMixedJump(b, ImmPtr((void*)dest.getOffset()), MixedJumpPatch::PATCHABLE);
+            addMixedJump(b, dest.getOffset(), MixedJumpPatch::PATCHABLE);
         } else if (inst[1].extractOpcode() == (uint32_t(op_lui) >> OpcodeShift) ||
                    BOffImm16::IsInRange(offset))
         {
@@ -1668,7 +1668,7 @@ AssemblerMIPSShared::bind(RepatchLabel* label)
             // We need to add it to mixed jumps array here.
             // See MacroAssemblerMIPS::branchWithCode().
             MOZ_ASSERT(inst[1].encode() == NopInst);
-            addMixedJump(b, ImmPtr((void*)dest.getOffset()), MixedJumpPatch::PATCHABLE);
+            addMixedJump(b, dest.getOffset(), MixedJumpPatch::PATCHABLE);
             inst[0] = InstJump(op_j, JOffImm26(0)).encode();
         } else {
             // Handle open mixed conditional jumps created by
@@ -1680,7 +1680,7 @@ AssemblerMIPSShared::bind(RepatchLabel* label)
             MOZ_ASSERT(inst[1].encode() == NopInst);
             MOZ_ASSERT(inst[2].encode() == NopInst);
             MOZ_ASSERT(inst[3].encode() == NopInst);
-            addMixedJump(b, ImmPtr((void*)dest.getOffset()), MixedJumpPatch::PATCHABLE);
+            addMixedJump(b, dest.getOffset(), MixedJumpPatch::PATCHABLE);
             inst[2] = InstJump(op_j, JOffImm26(0)).encode();
         }
     }
@@ -1840,7 +1840,7 @@ AssemblerMIPSShared::PatchMixedJumps(uint8_t* buffer)
         MixedJumpPatch& mjp = mixedJump(i);
         uint8_t* src = buffer + mjp.src.getOffset();
         uint8_t* mid = nullptr;
-        uint8_t* target = buffer + uintptr_t(mjp.target);
+        uint8_t* target = buffer + mjp.target;
         InstImm* b = (InstImm*)src;
 
         if (mjp.mid.assigned()) {