diff options
| author | Jiaxun Yang <jiaxun.yang@flygoat.com> | 2020-05-12 12:40:10 +0800 |
|---|---|---|
| committer | Jiaxun Yang <jiaxun.yang@flygoat.com> | 2020-05-14 16:31:57 +0800 |
| commit | b878a54a2f977bbc6761737284cc730a94643ae9 (patch) | |
| tree | 46dbbdca0060a5805e1a2474f0189efcc9095a00 /js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp | |
| parent | 2501df81955781747c4d35916fa4e17235c18b04 (diff) | |
| download | UXP-b878a54a2f977bbc6761737284cc730a94643ae9.tar UXP-b878a54a2f977bbc6761737284cc730a94643ae9.tar.gz UXP-b878a54a2f977bbc6761737284cc730a94643ae9.tar.lz UXP-b878a54a2f977bbc6761737284cc730a94643ae9.tar.xz UXP-b878a54a2f977bbc6761737284cc730a94643ae9.zip | |
Bug 1271968 - IonMonkey: MIPS: Refactor addMixedJump.
Tag: #1542
Diffstat (limited to 'js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp')
| -rw-r--r-- | js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp b/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp index 866a97dc8..38897de0d 100644 --- a/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp +++ b/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp @@ -665,14 +665,14 @@ MacroAssemblerMIPSShared::branchWithCode(InstImm code, Label* label, JumpKind ju InstImm inst_beq = InstImm(op_beq, zero, zero, BOffImm16(0)); if (code.encode() == inst_beq.encode()) { // Handle mixed jump - addMixedJump(nextOffset(), ImmPtr((void*)label->offset())); + addMixedJump(nextOffset(), label->offset()); as_j(JOffImm26(0)); as_nop(); return; } // Handle long conditional branch - addMixedJump(nextOffset(), ImmPtr((void*)label->offset()), MixedJumpPatch::CONDITIONAL); + addMixedJump(nextOffset(), label->offset(), MixedJumpPatch::CONDITIONAL); writeInst(code.encode()); as_nop(); return; @@ -785,7 +785,7 @@ MacroAssemblerMIPSShared::ma_jal(Label* label) { if (label->bound()) { // Generate the mixed jump. - addMixedJump(nextOffset(), ImmPtr((void*)label->offset())); + addMixedJump(nextOffset(), label->offset()); as_jal(JOffImm26(0)); as_nop(); return; @@ -1041,7 +1041,7 @@ MacroAssemblerMIPSShared::GenerateMixedJumps() // Generate all mixed jumps. for (size_t i = 0; i < numMixedJumps(); i++) { MixedJumpPatch& mjp = mixedJump(i); - if (MixedJumpPatch::NONE == mjp.kind && uintptr_t(mjp.target) <= size()) + if (MixedJumpPatch::NONE == mjp.kind && mjp.target <= size()) continue; BufferOffset bo = m_buffer.nextOffset(); if (MixedJumpPatch::CONDITIONAL & mjp.kind) { |