Modified: trunk/Source/_javascript_Core/ChangeLog (255168 => 255169)
--- trunk/Source/_javascript_Core/ChangeLog 2020-01-27 21:36:54 UTC (rev 255168)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-01-27 21:37:19 UTC (rev 255169)
@@ -1,3 +1,15 @@
+2020-01-27 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r255159.
+
+ Broke the watchOS build.
+
+ Reverted changeset:
+
+ "Fix OpenSource iphoneos arm64e build"
+ https://bugs.webkit.org/show_bug.cgi?id=206703
+ https://trac.webkit.org/changeset/255159
+
2020-01-27 Jonathan Bedard <jbed...@apple.com>
Fix OpenSource iphoneos arm64e build
Modified: trunk/Source/_javascript_Core/runtime/MachineContext.h (255168 => 255169)
--- trunk/Source/_javascript_Core/runtime/MachineContext.h 2020-01-27 21:36:54 UTC (rev 255168)
+++ trunk/Source/_javascript_Core/runtime/MachineContext.h 2020-01-27 21:37:19 UTC (rev 255169)
@@ -58,13 +58,9 @@
#if HAVE(MACHINE_CONTEXT)
#if !USE(PLATFORM_REGISTERS_WITH_PROFILE)
-
-#if !USE(DARWIN_REGISTER_MACROS)
static inline void*& stackPointerImpl(mcontext_t&);
+static inline void*& framePointerImpl(mcontext_t&);
static inline void*& instructionPointerImpl(mcontext_t&);
-#endif // !USE(DARWIN_REGISTER_MACROS)
-
-static inline void*& framePointerImpl(mcontext_t&);
#endif // !USE(PLATFORM_REGISTERS_WITH_PROFILE)
template<typename T = void*> T stackPointer(const mcontext_t&);
@@ -85,7 +81,7 @@
#if OS(WINDOWS) || HAVE(MACHINE_CONTEXT)
-#if !USE(PLATFORM_REGISTERS_WITH_PROFILE) && !USE(DARWIN_REGISTER_MACROS)
+#if !USE(PLATFORM_REGISTERS_WITH_PROFILE)
static inline void*& stackPointerImpl(PlatformRegisters& regs)
{
#if OS(DARWIN)
@@ -97,6 +93,8 @@
return reinterpret_cast<void*&>(regs.__rsp);
#elif CPU(PPC) || CPU(PPC64)
return reinterpret_cast<void*&>(regs.__r1);
+#elif CPU(ARM_THUMB2) || CPU(ARM) || CPU(ARM64)
+ return reinterpret_cast<void*&>(regs.__sp);
#else
#error Unknown Architecture
#endif
@@ -142,8 +140,6 @@
void* value = WTF_READ_PLATFORM_REGISTERS_SP_WITH_PROFILE(regs);
assertIsNotTagged(value);
return bitwise_cast<T>(value);
-#elif USE(DARWIN_REGISTER_MACROS)
- return bitwise_cast<T>(__darwin_arm_thread_state64_get_sp(regs));
#else
return bitwise_cast<T>(stackPointerImpl(const_cast<PlatformRegisters&>(regs)));
#endif
@@ -155,8 +151,6 @@
#if USE(PLATFORM_REGISTERS_WITH_PROFILE)
assertIsNotTagged(bitwise_cast<void*>(value));
WTF_WRITE_PLATFORM_REGISTERS_SP_WITH_PROFILE(regs, bitwise_cast<void*>(value));
-#elif USE(DARWIN_REGISTER_MACROS)
- __darwin_arm_thread_state64_set_sp(regs, value);
#else
stackPointerImpl(regs) = bitwise_cast<void*>(value);
#endif
@@ -173,7 +167,7 @@
#if HAVE(MACHINE_CONTEXT)
-#if !USE(PLATFORM_REGISTERS_WITH_PROFILE) && !USE(DARWIN_REGISTER_MACROS)
+#if !USE(PLATFORM_REGISTERS_WITH_PROFILE)
static inline void*& stackPointerImpl(mcontext_t& machineContext)
{
#if OS(DARWIN)
@@ -220,8 +214,6 @@
void* value = WTF_READ_MACHINE_CONTEXT_SP_WITH_PROFILE(machineContext);
assertIsNotTagged(value);
return bitwise_cast<T>(value);
-#elif USE(DARWIN_REGISTER_MACROS)
- return stackPointer(machineContext->__ss);
#else
return bitwise_cast<T>(stackPointerImpl(const_cast<mcontext_t&>(machineContext)));
#endif
@@ -233,8 +225,6 @@
#if USE(PLATFORM_REGISTERS_WITH_PROFILE)
assertIsNotTagged(bitwise_cast<void*>(value));
WTF_WRITE_MACHINE_CONTEXT_SP_WITH_PROFILE(machineContext, bitwise_cast<void*>(value));
-#elif USE(DARWIN_REGISTER_MACROS)
- return setStackPointer(machineContext->__ss, value);
#else
stackPointerImpl(machineContext) = bitwise_cast<void*>(value);
#endif
@@ -395,7 +385,7 @@
#if OS(WINDOWS) || HAVE(MACHINE_CONTEXT)
-#if !USE(PLATFORM_REGISTERS_WITH_PROFILE) && !USE(DARWIN_REGISTER_MACROS)
+#if !USE(PLATFORM_REGISTERS_WITH_PROFILE)
static inline void*& instructionPointerImpl(PlatformRegisters& regs)
{
#if OS(DARWIN)
@@ -405,6 +395,8 @@
return reinterpret_cast<void*&>(regs.__eip);
#elif CPU(X86_64)
return reinterpret_cast<void*&>(regs.__rip);
+#elif CPU(ARM_THUMB2) || CPU(ARM) || CPU(ARM64)
+ return reinterpret_cast<void*&>(regs.__pc);
#else
#error Unknown Architecture
#endif
@@ -444,8 +436,6 @@
{
#if USE(PLATFORM_REGISTERS_WITH_PROFILE)
void* value = WTF_READ_PLATFORM_REGISTERS_PC_WITH_PROFILE(regs);
-#elif USE(DARWIN_REGISTER_MACROS)
- void* value = __darwin_arm_thread_state64_get_pc_fptr(regs);
#else
void* value = instructionPointerImpl(const_cast<PlatformRegisters&>(regs));
#endif
@@ -462,8 +452,6 @@
{
#if USE(PLATFORM_REGISTERS_WITH_PROFILE)
WTF_WRITE_PLATFORM_REGISTERS_PC_WITH_PROFILE(regs, value.executableAddress());
-#elif USE(DARWIN_REGISTER_MACROS)
- __darwin_arm_thread_state64_set_pc_fptr(regs, value.executableAddress());
#else
instructionPointerImpl(regs) = value.executableAddress();
#endif
@@ -473,7 +461,7 @@
#if HAVE(MACHINE_CONTEXT)
-#if !USE(PLATFORM_REGISTERS_WITH_PROFILE) && !USE(DARWIN_REGISTER_MACROS)
+#if !USE(PLATFORM_REGISTERS_WITH_PROFILE)
static inline void*& instructionPointerImpl(mcontext_t& machineContext)
{
#if OS(DARWIN)
@@ -519,18 +507,12 @@
inline MacroAssemblerCodePtr<PlatformRegistersPCPtrTag> instructionPointer(const mcontext_t& machineContext)
{
-#if USE(DARWIN_REGISTER_MACROS)
- return *instructionPointer(machineContext->__ss);
-#else
-
#if USE(PLATFORM_REGISTERS_WITH_PROFILE)
void* value = WTF_READ_MACHINE_CONTEXT_PC_WITH_PROFILE(machineContext);
#else
void* value = instructionPointerImpl(const_cast<mcontext_t&>(machineContext));
#endif
-
return MacroAssemblerCodePtr<PlatformRegistersPCPtrTag>(value);
-#endif
}
inline void setInstructionPointer(mcontext_t& machineContext, MacroAssemblerCodePtr<CFunctionPtrTag> value)
@@ -537,8 +519,6 @@
{
#if USE(PLATFORM_REGISTERS_WITH_PROFILE)
WTF_WRITE_MACHINE_CONTEXT_PC_WITH_PROFILE(machineContext, value.executableAddress());
-#elif USE(DARWIN_REGISTER_MACROS)
- setInstructionPointer(machineContext->__ss, value);
#else
instructionPointerImpl(machineContext) = value.executableAddress();
#endif
@@ -549,13 +529,20 @@
#if OS(WINDOWS) || HAVE(MACHINE_CONTEXT)
#if OS(DARWIN) && __DARWIN_UNIX03 && CPU(ARM64)
+#if !USE(PLATFORM_REGISTERS_WITH_PROFILE)
+inline void*& linkRegisterImpl(PlatformRegisters& regs)
+{
+ return reinterpret_cast<void*&>(regs.__lr);
+}
+#endif // USE(PLATFORM_REGISTERS_WITH_PROFILE)
+
inline MacroAssemblerCodePtr<PlatformRegistersLRPtrTag> linkRegister(const PlatformRegisters& regs)
{
#if USE(PLATFORM_REGISTERS_WITH_PROFILE)
void* value = WTF_READ_PLATFORM_REGISTERS_LR_WITH_PROFILE(regs);
#else
- void* value = __darwin_arm_thread_state64_get_lr_fptr(regs);
+ void* value = linkRegisterImpl(const_cast<PlatformRegisters&>(regs));
#endif
return MacroAssemblerCodePtr<PlatformRegistersLRPtrTag>(value);
}
@@ -565,7 +552,7 @@
#if USE(PLATFORM_REGISTERS_WITH_PROFILE)
WTF_WRITE_PLATFORM_REGISTERS_PC_WITH_PROFILE(regs, value.executableAddress());
#else
- __darwin_arm_thread_state64_set_lr_fptr(regs, value.executableAddress());
+ linkRegisterImpl(regs) = value.executableAddress();
#endif
}
#endif // OS(DARWIN) && __DARWIN_UNIX03 && CPU(ARM64)
Modified: trunk/Source/WTF/ChangeLog (255168 => 255169)
--- trunk/Source/WTF/ChangeLog 2020-01-27 21:36:54 UTC (rev 255168)
+++ trunk/Source/WTF/ChangeLog 2020-01-27 21:37:19 UTC (rev 255169)
@@ -1,3 +1,15 @@
+2020-01-27 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r255159.
+
+ Broke the watchOS build.
+
+ Reverted changeset:
+
+ "Fix OpenSource iphoneos arm64e build"
+ https://bugs.webkit.org/show_bug.cgi?id=206703
+ https://trac.webkit.org/changeset/255159
+
2020-01-27 Jonathan Bedard <jbed...@apple.com>
Fix OpenSource iphoneos arm64e build
Modified: trunk/Source/WTF/wtf/PlatformUse.h (255168 => 255169)
--- trunk/Source/WTF/wtf/PlatformUse.h 2020-01-27 21:36:54 UTC (rev 255168)
+++ trunk/Source/WTF/wtf/PlatformUse.h 2020-01-27 21:37:19 UTC (rev 255169)
@@ -307,7 +307,3 @@
#if PLATFORM(IOS_FAMILY) || (!(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) && (OS(LINUX) && (PLATFORM(GTK) || PLATFORM(WPE))))
#define USE_BMALLOC_MEMORY_FOOTPRINT_API 1
#endif
-
-#if OS(DARWIN) && !USE(PLATFORM_REGISTERS_WITH_PROFILE) && (CPU(ARM_THUMB2) || CPU(ARM) || CPU(ARM64))
-#define USE_DARWIN_REGISTER_MACROS 1
-#endif
