summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiaxun Yang <jiaxun.yang@flygoat.com>2020-05-12 12:40:09 +0800
committerJiaxun Yang <jiaxun.yang@flygoat.com>2020-05-14 16:31:57 +0800
commit2501df81955781747c4d35916fa4e17235c18b04 (patch)
tree49a99cd919d82b1cd046b8674260b7174d6c4477
parent79834afa6289979883ca5e119569624b72d2f94a (diff)
downloadUXP-2501df81955781747c4d35916fa4e17235c18b04.tar
UXP-2501df81955781747c4d35916fa4e17235c18b04.tar.gz
UXP-2501df81955781747c4d35916fa4e17235c18b04.tar.lz
UXP-2501df81955781747c4d35916fa4e17235c18b04.tar.xz
UXP-2501df81955781747c4d35916fa4e17235c18b04.zip
Bug 1271968 - wasm: MIPS: Port mixed jump for wasm.
Tag: #1542
-rw-r--r--js/src/jit/mips-shared/Assembler-mips-shared.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/src/jit/mips-shared/Assembler-mips-shared.cpp b/js/src/jit/mips-shared/Assembler-mips-shared.cpp
index e78d33549..63edc0b02 100644
--- a/js/src/jit/mips-shared/Assembler-mips-shared.cpp
+++ b/js/src/jit/mips-shared/Assembler-mips-shared.cpp
@@ -101,6 +101,11 @@ AssemblerMIPSShared::asmMergeWith(const AssemblerMIPSShared& other)
{
if (!AssemblerShared::asmMergeWith(size(), other))
return false;
+ 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);
+ }
return m_buffer.appendBuffer(other.m_buffer);
}