Changeset 255169 in webkit

Timestamp:

Jan 27, 2020 1:37:19 PM (4 years ago)

Author:

Ryan Haddad

Message:

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

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/MachineContext.h (modified) (19 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformUse.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-01-27  Ryan Haddad  <ryanhaddad@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  <jbedard@apple.com>
 

trunk/Source/JavaScriptCore/runtime/MachineContext.h

@@ -59 +59 @@
 
 #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)
 
@@ -86 +82 @@
 #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)
 {
@@ -98 +94 @@
 #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
@@ -143 +141 @@
     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)));
@@ -156 +152 @@
     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);
@@ -174 +168 @@
 #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)
 {
@@ -221 +215 @@
     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)));
@@ -234 +226 @@
     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);
@@ -396 +386 @@
 #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)
 {
@@ -406 +396 @@
 #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
@@ -445 +437 @@
 #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));
@@ -463 +453 @@
 #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();
@@ -474 +462 @@
 #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)
 {
@@ -520 +508 @@
 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);
@@ -529 +513 @@
     void* value = instructionPointerImpl(const_cast<mcontext_t&>(machineContext));
 #endif
-
     return MacroAssemblerCodePtr<PlatformRegistersPCPtrTag>(value);
-#endif
 }
 
@@ -538 +520 @@
 #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();
@@ -550 +530 @@
 
 #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)
@@ -556 +543 @@
     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);
@@ -566 +553 @@
     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
 }

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-01-27  Ryan Haddad  <ryanhaddad@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  <jbedard@apple.com>
 

trunk/Source/WTF/wtf/PlatformUse.h

@@ -308 +308 @@
 #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