From 56da7e27477d0d4669980d2ce17f3b877ea0c36c Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sat, 1 May 2021 07:15:13 +0000 Subject: Issue #1751 -- Remove XP_IOS --- js/src/irregexp/NativeRegExpMacroAssembler.cpp | 13 ------------- js/src/jit/ExecutableAllocator.h | 9 --------- js/src/jit/arm/Architecture-arm.h | 14 +++----------- 3 files changed, 3 insertions(+), 33 deletions(-) (limited to 'js/src') diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp index f2bee2dc54..a3756f5fff 100644 --- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp +++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp @@ -131,14 +131,6 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only) pushedNonVolatileRegisters++; } -#if defined(XP_IOS) && defined(JS_CODEGEN_ARM) - // The stack is 4-byte aligned on iOS, force 8-byte alignment. - masm.movePtr(StackPointer, temp0); - masm.andPtr(Imm32(~7), StackPointer); - masm.push(temp0); - masm.push(temp0); -#endif - #ifndef JS_CODEGEN_X86 // The InputOutputData* is stored as an argument, save it on the stack // above the frame. @@ -405,11 +397,6 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only) masm.freeStack(frameSize); #endif -#if defined(XP_IOS) && defined(JS_CODEGEN_ARM) - masm.pop(temp0); - masm.movePtr(temp0, StackPointer); -#endif - // Restore non-volatile registers which were saved on entry. for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) masm.Pop(*iter); diff --git a/js/src/jit/ExecutableAllocator.h b/js/src/jit/ExecutableAllocator.h index 39efd87893..8042ae7a98 100644 --- a/js/src/jit/ExecutableAllocator.h +++ b/js/src/jit/ExecutableAllocator.h @@ -68,10 +68,6 @@ extern "C" void sync_instruction_memory(caddr_t v, u_int len); #include #endif -#if defined(JS_CODEGEN_ARM) && defined(XP_IOS) -#include -#endif - namespace JS { struct CodeSizes; } // namespace JS @@ -255,11 +251,6 @@ class ExecutableAllocator { __clear_cache(code, reinterpret_cast(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 1d16a51a81..d2c634798b 100644 --- a/js/src/jit/arm/Architecture-arm.h +++ b/js/src/jit/arm/Architecture-arm.h @@ -14,9 +14,8 @@ #include "js/Utility.h" // 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) +// ABI target. +#if defined(__ARM_PCS_VFP) #define JS_CODEGEN_ARM_HARDFP #endif @@ -113,12 +112,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) | @@ -126,9 +120,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) | -- cgit v1.2.3