Title: [181750] branches/safari-600.1.17-branch/Source
- Revision
- 181750
- Author
- msab...@apple.com
- Date
- 2015-03-19 10:52:02 -0700 (Thu, 19 Mar 2015)
Log Message
Merged r181628. <rdar://problem/19804738>
2015-03-16 Michael Saboff <msab...@apple.com>
Windows X86-64 should use the fixed executable allocator
https://bugs.webkit.org/show_bug.cgi?id=142749
Reviewed by Filip Pizlo.
Source/_javascript_Core:
Added jit/ExecutableAllocatorFixedVMPool.cpp to Windows build.
* _javascript_Core.vcxproj/_javascript_Core.vcxproj:
* _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters:
* jit/ExecutableAllocatorFixedVMPool.cpp: Don't include unistd.h on Windows.
Source/WTF:
Set ENABLE_EXECUTABLE_ALLOCATOR_FIXED for Windows.
Needed to export MetaAllocator::currentStatistics() for use in _javascript_Core.
* wtf/MetaAllocator.h:
* wtf/Platform.h:
Modified Paths
Diff
Modified: branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog (181749 => 181750)
--- branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog 2015-03-19 17:14:59 UTC (rev 181749)
+++ branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog 2015-03-19 17:52:02 UTC (rev 181750)
@@ -1,3 +1,20 @@
+2015-03-19 Michael Saboff <msab...@apple.com>
+
+ Merge r181628. <rdar://problem/19804738>
+
+ 2015-03-16 Michael Saboff <msab...@apple.com>
+
+ Windows X86-64 should use the fixed executable allocator
+ https://bugs.webkit.org/show_bug.cgi?id=142749
+
+ Reviewed by Filip Pizlo.
+
+ Added jit/ExecutableAllocatorFixedVMPool.cpp to Windows build.
+
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj:
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters:
+ * jit/ExecutableAllocatorFixedVMPool.cpp: Don't include unistd.h on Windows.
+
2015-02-11 Brent Fulgham <bfulg...@apple.com>
Merge r179993. <rdar://problem/19803642>
Modified: branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj (181749 => 181750)
--- branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2015-03-19 17:14:59 UTC (rev 181749)
+++ branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2015-03-19 17:52:02 UTC (rev 181750)
@@ -569,6 +569,7 @@
<ClCompile Include="..\jit\AssemblyHelpers.cpp" />
<ClCompile Include="..\jit\ClosureCallStubRoutine.cpp" />
<ClCompile Include="..\jit\ExecutableAllocator.cpp" />
+ <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp" />
<ClCompile Include="..\jit\GCAwareJITStubRoutine.cpp" />
<ClCompile Include="..\jit\HostCallReturnValue.cpp" />
<ClCompile Include="..\jit\JIT.cpp" />
Modified: branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (181749 => 181750)
--- branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-03-19 17:14:59 UTC (rev 181749)
+++ branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-03-19 17:52:02 UTC (rev 181750)
@@ -1611,6 +1611,9 @@
<ClCompile Include="_javascript_CoreDLL.cpp">
<Filter>API</Filter>
</ClCompile>
+ <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp">
+ <Filter>jit</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\API\APICallbackFunction.h">
Modified: branches/safari-600.1.17-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp (181749 => 181750)
--- branches/safari-600.1.17-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2015-03-19 17:14:59 UTC (rev 181749)
+++ branches/safari-600.1.17-branch/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2015-03-19 17:52:02 UTC (rev 181750)
@@ -32,7 +32,9 @@
#include "CodeProfiling.h"
#include <errno.h>
+#if !PLATFORM(WIN)
#include <unistd.h>
+#endif
#include <wtf/MetaAllocator.h>
#include <wtf/PageReservation.h>
#include <wtf/VMTags.h>
Modified: branches/safari-600.1.17-branch/Source/WTF/ChangeLog (181749 => 181750)
--- branches/safari-600.1.17-branch/Source/WTF/ChangeLog 2015-03-19 17:14:59 UTC (rev 181749)
+++ branches/safari-600.1.17-branch/Source/WTF/ChangeLog 2015-03-19 17:52:02 UTC (rev 181750)
@@ -1,3 +1,18 @@
+2015-03-19 Michael Saboff <msab...@apple.com>
+
+ Merge r181628. <rdar://problem/19804738>
+
+ 2015-03-16 Michael Saboff <msab...@apple.com>
+
+ Windows X86-64 should use the fixed executable allocator
+ https://bugs.webkit.org/show_bug.cgi?id=142749
+
+ Set ENABLE_EXECUTABLE_ALLOCATOR_FIXED for Windows.
+ Needed to export MetaAllocator::currentStatistics() for use in _javascript_Core.
+
+ * wtf/MetaAllocator.h:
+ * wtf/Platform.h:
+
2015-02-11 Brent Fulgham <bfulg...@apple.com>
Merge r179993. <rdar://problem/19803642>
Modified: branches/safari-600.1.17-branch/Source/WTF/wtf/MetaAllocator.h (181749 => 181750)
--- branches/safari-600.1.17-branch/Source/WTF/wtf/MetaAllocator.h 2015-03-19 17:14:59 UTC (rev 181749)
+++ branches/safari-600.1.17-branch/Source/WTF/wtf/MetaAllocator.h 2015-03-19 17:52:02 UTC (rev 181750)
@@ -86,7 +86,7 @@
size_t bytesReserved;
size_t bytesCommitted;
};
- Statistics currentStatistics();
+ WTF_EXPORT_PRIVATE Statistics currentStatistics();
// Add more free space to the allocator. Call this directly from
// the constructor if you wish to operate the allocator within a
Modified: branches/safari-600.1.17-branch/Source/WTF/wtf/Platform.h (181749 => 181750)
--- branches/safari-600.1.17-branch/Source/WTF/wtf/Platform.h 2015-03-19 17:14:59 UTC (rev 181749)
+++ branches/safari-600.1.17-branch/Source/WTF/wtf/Platform.h 2015-03-19 17:52:02 UTC (rev 181750)
@@ -828,7 +828,7 @@
/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */
#if ENABLE(ASSEMBLER)
-#if CPU(X86_64) && !OS(WINDOWS) || PLATFORM(IOS)
+#if CPU(X86_64) || PLATFORM(IOS)
#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1
#else
#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
