Title: [181628] trunk/Source
- Revision
- 181628
- Author
- msab...@apple.com
- Date
- 2015-03-17 02:33:30 -0700 (Tue, 17 Mar 2015)
Log Message
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: trunk/Source/_javascript_Core/ChangeLog (181627 => 181628)
--- trunk/Source/_javascript_Core/ChangeLog 2015-03-17 09:03:15 UTC (rev 181627)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-03-17 09:33:30 UTC (rev 181628)
@@ -1,3 +1,16 @@
+2015-03-17 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-03-17 Matt Baker <mattba...@apple.com>
Web Inspector: Show rendering frames (and FPS) in Layout and Rendering timeline
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj (181627 => 181628)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2015-03-17 09:03:15 UTC (rev 181627)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2015-03-17 09:33:30 UTC (rev 181628)
@@ -599,6 +599,7 @@
<ClCompile Include="..\jit\AssemblyHelpers.cpp" />
<ClCompile Include="..\jit\BinarySwitch.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" />
@@ -1772,4 +1773,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (181627 => 181628)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-03-17 09:03:15 UTC (rev 181627)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-03-17 09:33:30 UTC (rev 181628)
@@ -1752,9 +1752,6 @@
<ClCompile Include="..\jit\BinarySwitch.cpp">
<Filter>jit</Filter>
</ClCompile>
- <ClCompile Include="..\dfg\DFGPutLocalSinkingPhase.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
<ClCompile Include="..\jit\PolymorphicCallStubRoutine.cpp">
<Filter>jit</Filter>
</ClCompile>
@@ -1765,6 +1762,14 @@
<ClCompile Include="_javascript_CoreDLL.cpp">
<Filter>API</Filter>
</ClCompile>
+ <ClCompile Include="..\dfg\DFGPutStackSinkingPhase.cpp" />
+ <ClCompile Include="..\ftl\FTLJSCallBase.cpp" />
+ <ClCompile Include="..\ftl\FTLJSCallVarargs.cpp" />
+ <ClCompile Include="..\runtime\JSCatchScope.cpp" />
+ <ClCompile Include="..\runtime\JSFunctionNameScope.cpp" />
+ <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp">
+ <Filter>jit</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\API\APICallbackFunction.h">
@@ -4214,13 +4219,16 @@
<ClInclude Include="..\dfg\DFGPreciseLocalClobberize.h">
<Filter>dfg</Filter>
</ClInclude>
- <ClInclude Include="..\dfg\DFGPutLocalSinkingPhase.h">
- <Filter>dfg</Filter>
- </ClInclude>
<ClInclude Include="..\jit\PolymorphicCallStubRoutine.h">
<Filter>jit</Filter>
</ClInclude>
<ClInclude Include="..\jit\SetupVarargsFrame.h" />
+ <ClInclude Include="..\dfg\DFGPutStackSinkingPhase.h" />
+ <ClInclude Include="..\ftl\FTLJSCallBase.h" />
+ <ClInclude Include="..\ftl\FTLJSCallVarargs.h" />
+ <ClInclude Include="..\runtime\JSCatchScope.h" />
+ <ClInclude Include="..\runtime\JSFunctionNameScope.h" />
+ <ClInclude Include="..\runtime\MathCommon.h" />
</ItemGroup>
<ItemGroup>
<None Include="_javascript_CorePreLink.cmd" />
@@ -4409,4 +4417,4 @@
<Filter>jit</Filter>
</MASM>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp (181627 => 181628)
--- trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2015-03-17 09:03:15 UTC (rev 181627)
+++ trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2015-03-17 09:33:30 UTC (rev 181628)
@@ -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: trunk/Source/WTF/ChangeLog (181627 => 181628)
--- trunk/Source/WTF/ChangeLog 2015-03-17 09:03:15 UTC (rev 181627)
+++ trunk/Source/WTF/ChangeLog 2015-03-17 09:33:30 UTC (rev 181628)
@@ -1,3 +1,16 @@
+2015-03-17 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.
+
+ Set ENABLE_EXECUTABLE_ALLOCATOR_FIXED for Windows.
+ Needed to export MetaAllocator::currentStatistics() for use in _javascript_Core.
+
+ * wtf/MetaAllocator.h:
+ * wtf/Platform.h:
+
2015-03-16 Ryosuke Niwa <rn...@webkit.org>
Enable ES6 classes by default
Modified: trunk/Source/WTF/wtf/MetaAllocator.h (181627 => 181628)
--- trunk/Source/WTF/wtf/MetaAllocator.h 2015-03-17 09:03:15 UTC (rev 181627)
+++ trunk/Source/WTF/wtf/MetaAllocator.h 2015-03-17 09:33:30 UTC (rev 181628)
@@ -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: trunk/Source/WTF/wtf/Platform.h (181627 => 181628)
--- trunk/Source/WTF/wtf/Platform.h 2015-03-17 09:03:15 UTC (rev 181627)
+++ trunk/Source/WTF/wtf/Platform.h 2015-03-17 09:33:30 UTC (rev 181628)
@@ -861,7 +861,7 @@
/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
On non-Windows x86-64, iOS, and ARM64 we use a single fixed mmap, on other platforms we mmap on demand. */
#if ENABLE(ASSEMBLER)
-#if CPU(X86_64) && !OS(WINDOWS) || PLATFORM(IOS) || CPU(ARM64)
+#if CPU(X86_64) || PLATFORM(IOS) || CPU(ARM64)
#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
