summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiaxun Yang <jiaxun.yang@flygoat.com>2020-05-12 12:40:09 +0800
committerMoonchild <moonchild@palemoon.org>2020-05-20 14:01:45 +0000
commit494cfe32c9224ef5697b53288aaad0896c05b4b8 (patch)
tree902301f25749c556e813f2717ae2b87dcbc59c1b
parentb4f0be5e9537c6c202443b34f7bb3b99cb08be0f (diff)
downloadUXP-494cfe32c9224ef5697b53288aaad0896c05b4b8.tar
UXP-494cfe32c9224ef5697b53288aaad0896c05b4b8.tar.gz
UXP-494cfe32c9224ef5697b53288aaad0896c05b4b8.tar.lz
UXP-494cfe32c9224ef5697b53288aaad0896c05b4b8.tar.xz
UXP-494cfe32c9224ef5697b53288aaad0896c05b4b8.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);
}