Changeset 197226 in webkit
- Timestamp:
- Feb 26, 2016 6:10:29 PM (8 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/CMakeLists.txt
r197056 r197226 516 516 jit/CallFrameShuffler64.cpp 517 517 jit/ExecutableAllocationFuzz.cpp 518 jit/ExecutableAllocator.cpp519 518 jit/ExecutableAllocatorFixedVMPool.cpp 520 519 jit/GCAwareJITStubRoutine.cpp -
trunk/Source/JavaScriptCore/ChangeLog
r197210 r197226 1 2016-02-26 Oliver Hunt <oliver@apple.com> 2 3 Remove the on demand executable allocator 4 https://bugs.webkit.org/show_bug.cgi?id=154749 5 6 Reviewed by Geoffrey Garen. 7 8 Remove all the DemandExecutable code and executable allocator ifdefs. 9 10 * CMakeLists.txt: 11 * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: 12 * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: 13 * JavaScriptCore.xcodeproj/project.pbxproj: 14 * jit/ExecutableAllocator.cpp: Removed. 15 (JSC::DemandExecutableAllocator::DemandExecutableAllocator): Deleted. 16 (JSC::DemandExecutableAllocator::~DemandExecutableAllocator): Deleted. 17 (JSC::DemandExecutableAllocator::bytesAllocatedByAllAllocators): Deleted. 18 (JSC::DemandExecutableAllocator::bytesCommittedByAllocactors): Deleted. 19 (JSC::DemandExecutableAllocator::dumpProfileFromAllAllocators): Deleted. 20 (JSC::DemandExecutableAllocator::allocateNewSpace): Deleted. 21 (JSC::DemandExecutableAllocator::notifyNeedPage): Deleted. 22 (JSC::DemandExecutableAllocator::notifyPageIsFree): Deleted. 23 (JSC::DemandExecutableAllocator::allocators): Deleted. 24 (JSC::DemandExecutableAllocator::allocatorsMutex): Deleted. 25 (JSC::ExecutableAllocator::initializeAllocator): Deleted. 26 (JSC::ExecutableAllocator::ExecutableAllocator): Deleted. 27 (JSC::ExecutableAllocator::~ExecutableAllocator): Deleted. 28 (JSC::ExecutableAllocator::isValid): Deleted. 29 (JSC::ExecutableAllocator::underMemoryPressure): Deleted. 30 (JSC::ExecutableAllocator::memoryPressureMultiplier): Deleted. 31 (JSC::ExecutableAllocator::allocate): Deleted. 32 (JSC::ExecutableAllocator::committedByteCount): Deleted. 33 (JSC::ExecutableAllocator::dumpProfile): Deleted. 34 (JSC::ExecutableAllocator::getLock): Deleted. 35 (JSC::ExecutableAllocator::isValidExecutableMemory): Deleted. 36 (JSC::ExecutableAllocator::reprotectRegion): Deleted. 37 * jit/ExecutableAllocator.h: 38 * jit/ExecutableAllocatorFixedVMPool.cpp: 39 * jit/JITStubRoutine.h: 40 (JSC::JITStubRoutine::canPerformRangeFilter): Deleted. 41 (JSC::JITStubRoutine::filteringStartAddress): Deleted. 42 (JSC::JITStubRoutine::filteringExtentSize): Deleted. 43 1 44 2016-02-26 Joseph Pecoraro <pecoraro@apple.com> 2 45 -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
r196759 r197226 636 636 <ClCompile Include="..\jit\CallFrameShuffler64.cpp" /> 637 637 <ClCompile Include="..\jit\ExecutableAllocationFuzz.cpp" /> 638 <ClCompile Include="..\jit\ExecutableAllocator.cpp" />639 638 <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp" /> 640 639 <ClCompile Include="..\jit\GCAwareJITStubRoutine.cpp" /> -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
r196759 r197226 391 391 <Filter>interpreter</Filter> 392 392 </ClCompile> 393 <ClCompile Include="..\jit\ExecutableAllocator.cpp">394 <Filter>jit</Filter>395 </ClCompile>396 393 <ClCompile Include="..\jit\GCAwareJITStubRoutine.cpp"> 397 394 <Filter>jit</Filter> -
trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r196812 r197226 1758 1758 A7A8AF4117ADB5F3005AB174 /* Uint16Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF3217ADB5F3005AB174 /* Uint16Array.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1759 1759 A7A8AF4217ADB5F3005AB174 /* Uint32Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF3317ADB5F3005AB174 /* Uint32Array.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1760 A7B48F490EE8936F00DCBDB6 /* ExecutableAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */; };1761 1760 A7B4ACAF1484C9CE00B38A36 /* JSExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1762 1761 A7B601821639FD2A00372BA3 /* UnlinkedCodeBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = A79E781F15EECBA80047C855 /* UnlinkedCodeBlock.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 3948 3947 A7A979C418BE8D9E002C3733 /* FunctionPrototype.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = FunctionPrototype.js; sourceTree = "<group>"; }; 3949 3948 A7B48DB50EE74CFC00DCBDB6 /* ExecutableAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExecutableAllocator.h; sourceTree = "<group>"; }; 3950 A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExecutableAllocator.cpp; sourceTree = "<group>"; };3951 3949 A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExportMacros.h; sourceTree = "<group>"; }; 3952 3950 A7BDAEC217F4EA1400F6140C /* ArrayIteratorPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ArrayIteratorPrototype.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; … … 4943 4941 0FF054F71AC35B4400E5BE57 /* ExecutableAllocationFuzz.cpp */, 4944 4942 0FF054F81AC35B4400E5BE57 /* ExecutableAllocationFuzz.h */, 4945 A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */,4946 4943 A7B48DB50EE74CFC00DCBDB6 /* ExecutableAllocator.h */, 4947 4944 86DB64630F95C6FC00D7D921 /* ExecutableAllocatorFixedVMPool.cpp */, … … 8850 8847 86CA032E1038E8440028A609 /* Executable.cpp in Sources */, 8851 8848 0FF054F91AC35B4400E5BE57 /* ExecutableAllocationFuzz.cpp in Sources */, 8852 A7B48F490EE8936F00DCBDB6 /* ExecutableAllocator.cpp in Sources */,8853 8849 86DB64640F95C6FC00D7D921 /* ExecutableAllocatorFixedVMPool.cpp in Sources */, 8854 8850 0F56A1D515001CF4002992B1 /* ExecutionCounter.cpp in Sources */, -
trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h
r194840 r197226 70 70 #if ENABLE(ASSEMBLER) 71 71 72 #if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND)73 class DemandExecutableAllocator;74 #endif75 76 #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)77 72 #if CPU(ARM) 78 73 static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024; … … 91 86 92 87 extern uintptr_t startOfFixedExecutableMemoryPool; 93 #endif94 88 95 89 class ExecutableAllocator { -
trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
r194840 r197226 29 29 #include "JSCInlines.h" 30 30 31 #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)32 33 31 #include "CodeProfiling.h" 34 32 #include "ExecutableAllocationFuzz.h" … … 223 221 224 222 } 225 226 227 #endif // ENABLE(EXECUTABLE_ALLOCATOR_FIXED) -
trunk/Source/JavaScriptCore/jit/JITStubRoutine.h
r190735 r197226 104 104 static bool canPerformRangeFilter() 105 105 { 106 #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)107 106 return true; 108 #else109 return false;110 #endif111 107 } 112 108 static uintptr_t filteringStartAddress() 113 109 { 114 #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)115 110 return startOfFixedExecutableMemoryPool; 116 #else117 UNREACHABLE_FOR_PLATFORM();118 return 0;119 #endif120 111 } 121 112 static size_t filteringExtentSize() 122 113 { 123 #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)124 114 return fixedExecutableMemoryPoolSize; 125 #else126 UNREACHABLE_FOR_PLATFORM();127 return 0;128 #endif129 115 } 130 116 static bool passesFilter(uintptr_t address) -
trunk/Source/WTF/ChangeLog
r197214 r197226 1 2016-02-26 Oliver Hunt <oliver@apple.com> 2 3 Remove the on demand executable allocator 4 https://bugs.webkit.org/show_bug.cgi?id=154749 5 6 Reviewed by Geoffrey Garen. 7 8 Remove the DeamndExecutableAllocator compile flags. 9 10 * wtf/Platform.h: 11 1 12 2016-02-26 Keith Rollin <krollin@apple.com> 2 13 -
trunk/Source/WTF/wtf/Platform.h
r197214 r197226 883 883 #endif 884 884 885 /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.886 On non-Windows x86-64, iOS, and ARM64 we use a single fixed mmap, on other platforms we mmap on demand. */887 #if ENABLE(ASSEMBLER)888 #if CPU(X86_64) || PLATFORM(IOS) || CPU(ARM64)889 #define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1890 #else891 #define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1892 #endif893 #endif894 895 885 /* CSS Selector JIT Compiler */ 896 886 #if !defined(ENABLE_CSS_SELECTOR_JIT)
Note: See TracChangeset
for help on using the changeset viewer.