summaryrefslogtreecommitdiffstats
path: root/js/src/jit
diff options
context:
space:
mode:
Diffstat (limited to 'js/src/jit')
-rw-r--r--js/src/jit/ExecutableAllocator.h7
-rw-r--r--js/src/jit/arm/Architecture-arm.h11
2 files changed, 3 insertions, 15 deletions
diff --git a/js/src/jit/ExecutableAllocator.h b/js/src/jit/ExecutableAllocator.h
index 30eccd12e..20f11f14f 100644
--- a/js/src/jit/ExecutableAllocator.h
+++ b/js/src/jit/ExecutableAllocator.h
@@ -69,7 +69,7 @@ extern "C" void sync_instruction_memory(caddr_t v, u_int len);
#include <sys/cachectl.h>
#endif
-#if defined(JS_CODEGEN_ARM) && defined(XP_IOS)
+#ifdef JS_CODEGEN_ARM
#include <libkern/OSCacheControl.h>
#endif
@@ -256,11 +256,6 @@ class ExecutableAllocator
{
__clear_cache(code, reinterpret_cast<char*>(code) + size);
}
-#elif (defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)) && defined(XP_IOS)
- static void cacheFlush(void* code, size_t size)
- {
- sys_icache_invalidate(code, size);
- }
#elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
static void cacheFlush(void* code, size_t size)
{
diff --git a/js/src/jit/arm/Architecture-arm.h b/js/src/jit/arm/Architecture-arm.h
index 5e3db5ae2..0c47c0250 100644
--- a/js/src/jit/arm/Architecture-arm.h
+++ b/js/src/jit/arm/Architecture-arm.h
@@ -17,7 +17,7 @@
// GCC versions 4.6 and above define __ARM_PCS_VFP to denote a hard-float
// ABI target. The iOS toolchain doesn't define anything specific here,
// but iOS always supports VFP.
-#if defined(__ARM_PCS_VFP) || defined(XP_IOS)
+#ifdef__ARM_PCS_VFP
#define JS_CODEGEN_ARM_HARDFP
#endif
@@ -114,12 +114,7 @@ class Registers
(1 << r0) |
(1 << r1) |
(1 << Registers::r2) |
- (1 << Registers::r3)
-#if defined(XP_IOS)
- // per https://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARMv6FunctionCallingConventions.html#//apple_ref/doc/uid/TP40009021-SW4
- | (1 << Registers::r9)
-#endif
- ;
+ (1 << Registers::r3);
static const SetType NonVolatileMask =
(1 << Registers::r4) |
@@ -127,9 +122,7 @@ class Registers
(1 << Registers::r6) |
(1 << Registers::r7) |
(1 << Registers::r8) |
-#if !defined(XP_IOS)
(1 << Registers::r9) |
-#endif
(1 << Registers::r10) |
(1 << Registers::r11) |
(1 << Registers::r12) |