Title: [216151] trunk/Source
- Revision
- 216151
- Author
- [email protected]
- Date
- 2017-05-03 15:36:29 -0700 (Wed, 03 May 2017)
Log Message
Use the CLoop for CPU(ARM64E).
https://bugs.webkit.org/show_bug.cgi?id=171620
<rdar://problem/31973027>
Reviewed by Geoffrey Garen.
Source/_javascript_Core:
* llint/LLIntOfflineAsmConfig.h:
* tools/SigillCrashAnalyzer.cpp:
(JSC::SigillCrashAnalyzer::dumpCodeBlock):
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (216150 => 216151)
--- trunk/Source/_javascript_Core/ChangeLog 2017-05-03 22:30:38 UTC (rev 216150)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-05-03 22:36:29 UTC (rev 216151)
@@ -1,3 +1,15 @@
+2017-05-03 Mark Lam <[email protected]>
+
+ Use the CLoop for CPU(ARM64E).
+ https://bugs.webkit.org/show_bug.cgi?id=171620
+ <rdar://problem/31973027>
+
+ Reviewed by Geoffrey Garen.
+
+ * llint/LLIntOfflineAsmConfig.h:
+ * tools/SigillCrashAnalyzer.cpp:
+ (JSC::SigillCrashAnalyzer::dumpCodeBlock):
+
2017-05-03 Keith Miller <[email protected]>
Different behaviour with the .sort(callback) method (unlike Firefox & Chrome)
Modified: trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h (216150 => 216151)
--- trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h 2017-05-03 22:30:38 UTC (rev 216150)
+++ trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h 2017-05-03 22:36:29 UTC (rev 216151)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,6 +37,7 @@
#define OFFLINE_ASM_ARMv7 0
#define OFFLINE_ASM_ARMv7_TRADITIONAL 0
#define OFFLINE_ASM_ARM64 0
+#define OFFLINE_ASM_ARM64E 0
#define OFFLINE_ASM_X86_64 0
#define OFFLINE_ASM_X86_64_WIN 0
#define OFFLINE_ASM_ARMv7k 0
@@ -114,6 +115,12 @@
#define OFFLINE_ASM_ARM64 0
#endif
+#if CPU(ARM64E)
+#define OFFLINE_ASM_ARM64E 1
+#else
+#define OFFLINE_ASM_ARM64E 0
+#endif
+
#if CPU(MIPS)
#ifdef WTF_MIPS_PIC
#define S(x) #x
Modified: trunk/Source/_javascript_Core/tools/SigillCrashAnalyzer.cpp (216150 => 216151)
--- trunk/Source/_javascript_Core/tools/SigillCrashAnalyzer.cpp 2017-05-03 22:30:38 UTC (rev 216150)
+++ trunk/Source/_javascript_Core/tools/SigillCrashAnalyzer.cpp 2017-05-03 22:36:29 UTC (rev 216151)
@@ -268,7 +268,7 @@
void SigillCrashAnalyzer::dumpCodeBlock(CodeBlock* codeBlock, void* machinePC)
{
-#if CPU(ARM64)
+#if CPU(ARM64) && ENABLE(JIT)
JITCode* jitCode = codeBlock->jitCode().get();
// Dump the raw bits of the code.
Modified: trunk/Source/WTF/ChangeLog (216150 => 216151)
--- trunk/Source/WTF/ChangeLog 2017-05-03 22:30:38 UTC (rev 216150)
+++ trunk/Source/WTF/ChangeLog 2017-05-03 22:36:29 UTC (rev 216151)
@@ -1,3 +1,13 @@
+2017-05-03 Mark Lam <[email protected]>
+
+ Use the CLoop for CPU(ARM64E).
+ https://bugs.webkit.org/show_bug.cgi?id=171620
+ <rdar://problem/31973027>
+
+ Reviewed by Geoffrey Garen.
+
+ * wtf/Platform.h:
+
2017-05-02 Daniel Bates <[email protected]>
Fix the build after <https://trac.webkit.org/changeset/216102>
Modified: trunk/Source/WTF/wtf/Platform.h (216150 => 216151)
--- trunk/Source/WTF/wtf/Platform.h 2017-05-03 22:30:38 UTC (rev 216150)
+++ trunk/Source/WTF/wtf/Platform.h 2017-05-03 22:36:29 UTC (rev 216151)
@@ -179,7 +179,11 @@
/* CPU(ARM64) - Apple */
#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
#define WTF_CPU_ARM64 1
+
+#if defined(__arm64e__)
+#define WTF_CPU_ARM64E 1
#endif
+#endif
/* CPU(ARM) - ARM, any version*/
#define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N)
@@ -721,7 +725,8 @@
/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k. */
#if !defined(ENABLE_JIT) \
&& (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
- && !CPU(APPLE_ARMV7K)
+ && !CPU(APPLE_ARMV7K) \
+ && !CPU(ARM64E)
#define ENABLE_JIT 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
