Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 9c42920c2b635a399bd1f93833efdeb1696f17ee Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen.kooi@linaro.org> |
| 3 | Date: Mon, 2 Mar 2015 19:09:57 +0800 |
| 4 | Subject: [PATCH 5/5] aarch64-64k-page |
| 5 | |
| 6 | --- |
| 7 | Upstream-status: Pending |
| 8 | |
| 9 | js/src/gc/Heap.h | 2 +- |
| 10 | js/src/gc/Memory.cpp | 3 +++ |
| 11 | 2 files changed, 4 insertions(+), 1 deletion(-) |
| 12 | |
| 13 | diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h |
| 14 | index 1cfd269..f4dbcda 100644 |
| 15 | --- a/js/src/gc/Heap.h |
| 16 | +++ b/js/src/gc/Heap.h |
| 17 | @@ -113,7 +113,7 @@ struct Cell |
| 18 | #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) |
| 19 | const size_t PageShift = 13; |
| 20 | const size_t ArenaShift = PageShift; |
| 21 | -#elif defined(__powerpc__) |
| 22 | +#elif defined(__powerpc__) || defined(__aarch64__) |
| 23 | const size_t PageShift = 16; |
| 24 | const size_t ArenaShift = 12; |
| 25 | #else |
| 26 | diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp |
| 27 | index 5b386a2..e5ad018 100644 |
| 28 | --- a/js/src/gc/Memory.cpp |
| 29 | +++ b/js/src/gc/Memory.cpp |
| 30 | @@ -302,8 +302,11 @@ GetPageFaultCount() |
| 31 | void |
| 32 | InitMemorySubsystem() |
| 33 | { |
| 34 | + /* aarch64 may have 64KB or 4KB pages */ |
| 35 | +#ifndef __aarch64__ |
| 36 | if (size_t(sysconf(_SC_PAGESIZE)) != PageSize) |
| 37 | MOZ_CRASH(); |
| 38 | +#endif |
| 39 | } |
| 40 | |
| 41 | void * |
| 42 | -- |
| 43 | 1.9.3 |
| 44 | |