summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiaxun Yang <jiaxun.yang@flygoat.com>2020-05-12 12:40:06 +0800
committerMoonchild <moonchild@palemoon.org>2020-05-20 14:00:49 +0000
commitf18d78dea035c5291984d1c468336d20dc0b47b7 (patch)
tree60898b9795ff26a35ed799bf4e44b8b89634acd9
parent16ae8db8060f9cf56b37f6a3bb59f1185f6f8809 (diff)
downloadUXP-f18d78dea035c5291984d1c468336d20dc0b47b7.tar
UXP-f18d78dea035c5291984d1c468336d20dc0b47b7.tar.gz
UXP-f18d78dea035c5291984d1c468336d20dc0b47b7.tar.lz
UXP-f18d78dea035c5291984d1c468336d20dc0b47b7.tar.xz
UXP-f18d78dea035c5291984d1c468336d20dc0b47b7.zip
Bug 1271968 - IonMonkey: MIPS: Make jit code in same 256 MB-aligned region
Tag: #1542
-rw-r--r--js/src/jit/ProcessExecutableMemory.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/js/src/jit/ProcessExecutableMemory.cpp b/js/src/jit/ProcessExecutableMemory.cpp
index 71c2ab0dc..1ba5c4aae 100644
--- a/js/src/jit/ProcessExecutableMemory.cpp
+++ b/js/src/jit/ProcessExecutableMemory.cpp
@@ -589,7 +589,23 @@ static ProcessExecutableMemory execMemory;
void*
js::jit::AllocateExecutableMemory(size_t bytes, ProtectionSetting protection)
{
+#if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
+ // On MIPS, j/jal instructions to branch within the current
+ // 256 MB-aligned region.
+ void* allocation = nullptr;
+ js::Vector<void*, 8, SystemAllocPolicy> unused_maps;
+ for (;;) {
+ allocation = execMemory.allocate(bytes, protection);
+ if ((uintptr_t(allocation) >> 28) == (uintptr_t(allocation + bytes) >> 28))
+ break;
+ unused_maps.append(allocation);
+ }
+ for (size_t i = 0; i < unused_maps.length(); i++)
+ DeallocateExecutableMemory(unused_maps[i], bytes);
+ return allocation;
+#else
return execMemory.allocate(bytes, protection);
+#endif
}
void