Title: [208970] trunk
- Revision
- 208970
- Author
- [email protected]
- Date
- 2016-11-23 01:37:58 -0800 (Wed, 23 Nov 2016)
Log Message
Remove ENABLE_ASSEMBLER_WX_EXCLUSIVE code
https://bugs.webkit.org/show_bug.cgi?id=165027
Reviewed by Darin Adler.
.:
* Source/cmake/WebKitFeatures.cmake: Remove the ENABLE_ASSEMBLER_WX_EXCLUSIVE option.
Source/_javascript_Core:
Remove the code guarded with ENABLE(ASSEMBLER_WX_EXCLUSIVE).
No port enables this and the guarded code doesn't build at all,
so it's safe to say it's abandoned.
* jit/ExecutableAllocator.cpp:
(JSC::ExecutableAllocator::initializeAllocator):
(JSC::ExecutableAllocator::ExecutableAllocator):
(JSC::ExecutableAllocator::reprotectRegion): Deleted.
Modified Paths
Diff
Modified: trunk/ChangeLog (208969 => 208970)
--- trunk/ChangeLog 2016-11-23 04:05:21 UTC (rev 208969)
+++ trunk/ChangeLog 2016-11-23 09:37:58 UTC (rev 208970)
@@ -1,3 +1,12 @@
+2016-11-23 Zan Dobersek <[email protected]>
+
+ Remove ENABLE_ASSEMBLER_WX_EXCLUSIVE code
+ https://bugs.webkit.org/show_bug.cgi?id=165027
+
+ Reviewed by Darin Adler.
+
+ * Source/cmake/WebKitFeatures.cmake: Remove the ENABLE_ASSEMBLER_WX_EXCLUSIVE option.
+
2016-11-21 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.15.2 release.
Modified: trunk/Source/_javascript_Core/ChangeLog (208969 => 208970)
--- trunk/Source/_javascript_Core/ChangeLog 2016-11-23 04:05:21 UTC (rev 208969)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-11-23 09:37:58 UTC (rev 208970)
@@ -1,3 +1,19 @@
+2016-11-23 Zan Dobersek <[email protected]>
+
+ Remove ENABLE_ASSEMBLER_WX_EXCLUSIVE code
+ https://bugs.webkit.org/show_bug.cgi?id=165027
+
+ Reviewed by Darin Adler.
+
+ Remove the code guarded with ENABLE(ASSEMBLER_WX_EXCLUSIVE).
+ No port enables this and the guarded code doesn't build at all,
+ so it's safe to say it's abandoned.
+
+ * jit/ExecutableAllocator.cpp:
+ (JSC::ExecutableAllocator::initializeAllocator):
+ (JSC::ExecutableAllocator::ExecutableAllocator):
+ (JSC::ExecutableAllocator::reprotectRegion): Deleted.
+
2016-11-18 Mark Lam <[email protected]>
Fix exception scope verification failures in JSC profiler files.
Modified: trunk/Source/_javascript_Core/jit/ExecutableAllocator.cpp (208969 => 208970)
--- trunk/Source/_javascript_Core/jit/ExecutableAllocator.cpp 2016-11-23 04:05:21 UTC (rev 208969)
+++ trunk/Source/_javascript_Core/jit/ExecutableAllocator.cpp 2016-11-23 09:37:58 UTC (rev 208970)
@@ -146,11 +146,6 @@
}
};
-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
-void ExecutableAllocator::initializeAllocator()
-{
-}
-#else
static DemandExecutableAllocator* gAllocator;
namespace {
@@ -166,12 +161,8 @@
gAllocator = new DemandExecutableAllocator();
CodeProfiling::notifyAllocator(gAllocator);
}
-#endif
ExecutableAllocator::ExecutableAllocator(VM&)
-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
- : m_allocator(std::make_unique<DemandExecutableAllocator>())
-#endif
{
ASSERT(allocator());
}
@@ -244,32 +235,6 @@
#endif // ENABLE(EXECUTABLE_ALLOCATOR_DEMAND)
-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
-
-#if OS(WINDOWS)
-#error "ASSEMBLER_WX_EXCLUSIVE not yet suported on this platform."
-#endif
-
-void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSetting setting)
-{
- size_t pageSize = WTF::pageSize();
-
- // Calculate the start of the page containing this region,
- // and account for this extra memory within size.
- intptr_t startPtr = reinterpret_cast<intptr_t>(start);
- intptr_t pageStartPtr = startPtr & ~(pageSize - 1);
- void* pageStart = reinterpret_cast<void*>(pageStartPtr);
- size += (startPtr - pageStartPtr);
-
- // Round size up
- size += (pageSize - 1);
- size &= ~(pageSize - 1);
-
- mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX);
}
-#endif
-
-}
-
#endif // HAVE(ASSEMBLER)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (208969 => 208970)
--- trunk/Source/cmake/WebKitFeatures.cmake 2016-11-23 04:05:21 UTC (rev 208969)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2016-11-23 09:37:58 UTC (rev 208970)
@@ -75,7 +75,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_ASYNC_SCROLLING "Enable asynchronouse scrolling" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ATTACHMENT_ELEMENT "Toggle attachment element support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_AVF_CAPTIONS "Toggle AVFoundation caption support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggle Assembler WX Exclusive support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CACHE_PARTITIONING "Toggle cache partitioning support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PATH "Toggle Canvas Path support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" PRIVATE OFF)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
