Changeset 64101 in webkit for trunk/JavaScriptCore/jit/ExecutableAllocator.cpp

Timestamp:

Jul 26, 2010, 7:53:06 PM (15 years ago)

Author:

[email protected]

Message:

Rolling out r64097:64100, oops, more b0rked than I relized by my last changes, sorry!

• CMakeListsEfl.txt:
• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• jit/ExecutableAllocator.cpp:

(JSC::ExecutableAllocator::reprotectRegion):
(JSC::ExecutableAllocator::cacheFlush):

• jit/ExecutableAllocator.h:

(JSC::ExecutablePool::ExecutablePool):
(JSC::ExecutablePool::poolAllocate):

• jit/ExecutableAllocatorFixedVMPool.cpp:

(JSC::FixedVMPoolAllocator::release):
(JSC::FixedVMPoolAllocator::reuse):
(JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
(JSC::FixedVMPoolAllocator::alloc):
(JSC::FixedVMPoolAllocator::free):
(JSC::FixedVMPoolAllocator::isValid):
(JSC::FixedVMPoolAllocator::isWithinVMPool):
(JSC::ExecutablePool::systemAlloc):
(JSC::ExecutablePool::systemRelease):

• jit/ExecutableAllocatorPosix.cpp: Added.

(JSC::ExecutableAllocator::intializePageSize):
(JSC::ExecutablePool::systemAlloc):
(JSC::ExecutablePool::systemRelease):
(JSC::ExecutableAllocator::isValid):

• jit/ExecutableAllocatorSymbian.cpp: Added.

(JSC::ExecutableAllocator::intializePageSize):
(JSC::ExecutablePool::systemAlloc):
(JSC::ExecutablePool::systemRelease):
(JSC::ExecutableAllocator::isValid):

• jit/ExecutableAllocatorWin.cpp: Added.

(JSC::ExecutableAllocator::intializePageSize):
(JSC::ExecutablePool::systemAlloc):
(JSC::ExecutablePool::systemRelease):
(JSC::ExecutableAllocator::isValid):

• wscript:
• wtf/PageAllocation.cpp: Removed.
• wtf/PageAllocation.h: Removed.

File:

• trunk/JavaScriptCore/jit/ExecutableAllocator.cpp (modified) (3 diffs)

trunk/JavaScriptCore/jit/ExecutableAllocator.cpp

@@ -34 +34 @@
 size_t ExecutableAllocator::pageSize = 0;
 
-#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND)
-
-void ExecutableAllocator::intializePageSize()
-{
-#if CPU(ARMV5_OR_LOWER)
-    // The moving memory model (as used in ARMv5 and earlier platforms)
-    // on Symbian OS limits the number of chunks for each process to 16. 
-    // To mitigate this limitation increase the pagesize to allocate
-    // fewer, larger chunks. Set the page size to 256 Kb to compensate
-    // for moving memory model limitation
-    ExecutableAllocator::pageSize = 256 * 1024;
-#else
-    ExecutableAllocator::pageSize = PageAllocation::pagesize();
-#endif
-}
-
-ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size)
-{
-    PageAllocation allocation = PageAllocation::allocate(size, PageAllocation::JSJITCodePages, EXECUTABLE_POOL_WRITABLE, true);
-    if (!allocation)
-        CRASH();
-    return allocation;
-}
-
-void ExecutablePool::systemRelease(const ExecutablePool::Allocation& allocation)
-{
-    allocation.deallocate();
-}
-
-bool ExecutableAllocator::isValid() const
-{
-    return true;
-}
-
-#endif
-
 #if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
-
-#if OS(WINDOWS) || OS(SYMBIAN)
-#error "ASSEMBLER_WX_EXCLUSIVE not yet suported on this platform."
-#endif
-
 void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
 {
@@ -94 +53 @@
     mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX);
 }
-
 #endif
 
 #if CPU(ARM_TRADITIONAL) && OS(LINUX) && COMPILER(RVCT)
-
 __asm void ExecutableAllocator::cacheFlush(void* code, size_t size)
 {
@@ -111 +68 @@
     bx lr
 }
-
 #endif