| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From 15e710e331d36eb279852b5cd1ba37a9a6005217 Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen.kooi@linaro.org> |
| 3 | Date: Mon, 2 Mar 2015 19:08:22 +0800 |
| 4 | Subject: [PATCH 3/5] Add AArch64 support |
| 5 | |
| 6 | --- |
| 7 | Upstream-status: Pending |
| 8 | |
| 9 | js/src/assembler/jit/ExecutableAllocator.h | 6 ++++++ |
| 10 | js/src/assembler/wtf/Platform.h | 4 ++++ |
| 11 | js/src/configure.in | 4 ++++ |
| 12 | mfbt/double-conversion/utils.h | 1 + |
| 13 | 4 files changed, 15 insertions(+) |
| 14 | |
| 15 | diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h |
| 16 | index c071c33..90764c3 100644 |
| 17 | --- a/js/src/assembler/jit/ExecutableAllocator.h |
| 18 | +++ b/js/src/assembler/jit/ExecutableAllocator.h |
| 19 | @@ -382,6 +382,12 @@ public: |
| 20 | { |
| 21 | reprotectRegion(start, size, Executable); |
| 22 | } |
| 23 | +#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX |
| 24 | + static void cacheFlush(void* code, size_t size) |
| 25 | + { |
| 26 | + intptr_t end = reinterpret_cast<intptr_t>(code) + size; |
| 27 | + __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end)); |
| 28 | + } |
| 29 | #else |
| 30 | static void makeWritable(void*, size_t) {} |
| 31 | static void makeExecutable(void*, size_t) {} |
| 32 | diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h |
| 33 | index 0c84896..e8763a7 100644 |
| 34 | --- a/js/src/assembler/wtf/Platform.h |
| 35 | +++ b/js/src/assembler/wtf/Platform.h |
| 36 | @@ -325,6 +325,10 @@ |
| 37 | #define WTF_THUMB_ARCH_VERSION 0 |
| 38 | #endif |
| 39 | |
| 40 | +/* CPU(AArch64) - 64-bit ARM */ |
| 41 | +#if defined(__aarch64__) |
| 42 | +#define WTF_CPU_AARCH64 1 |
| 43 | +#endif |
| 44 | |
| 45 | /* WTF_CPU_ARMV5_OR_LOWER - ARM instruction set v5 or earlier */ |
| 46 | /* On ARMv5 and below the natural alignment is required. |
| 47 | diff --git a/js/src/configure.in b/js/src/configure.in |
| 48 | index 64c7606..0673aca 100644 |
| 49 | --- a/js/src/configure.in |
| 50 | +++ b/js/src/configure.in |
| 51 | @@ -1121,6 +1121,10 @@ arm*) |
| 52 | CPU_ARCH=arm |
| 53 | ;; |
| 54 | |
| 55 | +aarch64) |
| 56 | + CPU_ARCH=aarch64 |
| 57 | + ;; |
| 58 | + |
| 59 | mips|mipsel) |
| 60 | CPU_ARCH="mips" |
| 61 | ;; |
| 62 | diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h |
| 63 | index 0eec2d9..fe26dab 100644 |
| 64 | --- a/mfbt/double-conversion/utils.h |
| 65 | +++ b/mfbt/double-conversion/utils.h |
| 66 | @@ -58,6 +58,7 @@ |
| 67 | defined(__mips__) || defined(__powerpc__) || \ |
| 68 | defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ |
| 69 | defined(__SH4__) || defined(__alpha__) || \ |
| 70 | + defined(__aarch64__) || \ |
| 71 | defined(_MIPS_ARCH_MIPS32R2) |
| 72 | #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 |
| 73 | #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) |
| 74 | -- |
| 75 | 1.9.3 |
| 76 | |