Changeset 62544 in webkit

Timestamp:

Jul 6, 2010 4:34:33 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-06 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r62511.
​http://trac.webkit.org/changeset/62511
​https://bugs.webkit.org/show_bug.cgi?id=41686

Breaks Linux/64bit compilation (Requested by xan_ on #webkit).

• jit/ExecutableAllocator.cpp:
• jit/ExecutableAllocatorFixedVMPool.cpp: (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator): (JSC::FixedVMPoolAllocator::free): (JSC::ExecutablePool::systemAlloc):
• jit/ExecutableAllocatorPosix.cpp: (JSC::ExecutableAllocator::reprotectRegion): (JSC::ExecutableAllocator::cacheFlush):
• jit/ExecutableAllocatorSymbian.cpp:
• jit/ExecutableAllocatorWin.cpp:
• wtf/Platform.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/ExecutableAllocator.cpp (modified) (1 diff)
• jit/ExecutableAllocatorFixedVMPool.cpp (modified) (5 diffs)
• jit/ExecutableAllocatorPosix.cpp (modified) (3 diffs)
• jit/ExecutableAllocatorSymbian.cpp (modified) (1 diff)
• jit/ExecutableAllocatorWin.cpp (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-07-06  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r62511.
+        http://trac.webkit.org/changeset/62511
+        https://bugs.webkit.org/show_bug.cgi?id=41686
+
+        Breaks Linux/64bit compilation (Requested by xan_ on #webkit).
+
+        * jit/ExecutableAllocator.cpp:
+        * jit/ExecutableAllocatorFixedVMPool.cpp:
+        (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
+        (JSC::FixedVMPoolAllocator::free):
+        (JSC::ExecutablePool::systemAlloc):
+        * jit/ExecutableAllocatorPosix.cpp:
+        (JSC::ExecutableAllocator::reprotectRegion):
+        (JSC::ExecutableAllocator::cacheFlush):
+        * jit/ExecutableAllocatorSymbian.cpp:
+        * jit/ExecutableAllocatorWin.cpp:
+        * wtf/Platform.h:
+
 2010-07-05  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/jit/ExecutableAllocator.cpp

@@ -34 +34 @@
 size_t ExecutableAllocator::pageSize = 0;
 
-#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
-void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
-{
-    if (!pageSize)
-        intializePageSize();
-
-    // 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
-
-#if CPU(ARM_TRADITIONAL) && OS(LINUX) && COMPILER(RVCT)
-__asm void ExecutableAllocator::cacheFlush(void* code, size_t size)
-{
-    ARM
-    push {r7}
-    add r1, r1, r0
-    mov r7, #0xf0000
-    add r7, r7, #0x2
-    mov r2, #0x0
-    svc #0x0
-    pop {r7}
-    bx lr
-}
-#endif
-
 }
 

trunk/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp

@@ -28 +28 @@
 #include "ExecutableAllocator.h"
 
-#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
+#if ENABLE(ASSEMBLER) && OS(DARWIN) && CPU(X86_64)
 
 #include <errno.h>
@@ -40 +40 @@
 #include <wtf/VMTags.h>
 
-#if CPU(X86_64)
-    // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range).
-    #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb
-    #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb
-    #define VM_POOL_ASLR 1
-#else
-    // These limits are hopefully sensible on embedded platforms.
-    #define VM_POOL_SIZE (32u * 1024u * 1024u) // 32Mb
-    #define COALESCE_LIMIT (4u * 1024u * 1024u) // 4Mb
-    #define VM_POOL_ASLR 0
-#endif
-
 using namespace WTF;
 
 namespace JSC {
+
+#define TWO_GB (2u * 1024u * 1024u * 1024u)
+#define SIXTEEN_MB (16u * 1024u * 1024u)
 
 // FreeListEntry describes a free chunk of memory, stored in the freeList.
@@ -301 +292 @@
         // 2^24, which should put up somewhere in the middle of usespace (in the address range
         // 0x200000000000 .. 0x5fffffffffff).
-        intptr_t randomLocation = 0;
-#if VM_POOL_ASLR
-        randomLocation = arc4random() & ((1 << 25) - 1);
+        intptr_t randomLocation = arc4random() & ((1 << 25) - 1);
         randomLocation += (1 << 24);
         randomLocation <<= 21;
-#endif
         m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
         if (!m_base)
@@ -400 +388 @@
         // coalescing any neighboring fragments.
         m_countFreedSinceLastCoalesce += size;
-        if (m_countFreedSinceLastCoalesce >= COALESCE_LIMIT) {
+        if (m_countFreedSinceLastCoalesce >= SIXTEEN_MB) {
             m_countFreedSinceLastCoalesce = 0;
             coalesceFreeSpace();
@@ -442 +430 @@
 
     if (!allocator)
-        allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, VM_POOL_SIZE);
+        allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, TWO_GB);
     ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocator->alloc(size)), size};
     return alloc;

trunk/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp

@@ -28 +28 @@
 #include "ExecutableAllocator.h"
 
-#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && !OS(WINDOWS) && !OS(SYMBIAN)
+#if ENABLE(ASSEMBLER) && OS(UNIX) && !OS(SYMBIAN)
 
 #include <sys/mman.h>
@@ -35 +35 @@
 
 namespace JSC {
+
+#if !(OS(DARWIN) && CPU(X86_64))
 
 void ExecutableAllocator::intializePageSize()
@@ -56 +58 @@
 }
 
+#endif // !(OS(DARWIN) && CPU(X86_64))
+
+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
+void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
+{
+    if (!pageSize)
+        intializePageSize();
+
+    // 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
+
+#if CPU(ARM_TRADITIONAL) && OS(LINUX) && COMPILER(RVCT)
+__asm void ExecutableAllocator::cacheFlush(void* code, size_t size)
+{
+    ARM
+    push {r7}
+    add r1, r1, r0
+    mov r7, #0xf0000
+    add r7, r7, #0x2
+    mov r2, #0x0
+    svc #0x0
+    pop {r7}
+    bx lr
+}
+#endif
+
 }
 
-#endif
+#endif // HAVE(ASSEMBLER)

trunk/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp

@@ -23 +23 @@
 #include "ExecutableAllocator.h"
 
-#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(SYMBIAN)
+#if ENABLE(ASSEMBLER) && OS(SYMBIAN)
 
 #include <e32hal.h>

trunk/JavaScriptCore/jit/ExecutableAllocatorWin.cpp

@@ -28 +28 @@
 #include "ExecutableAllocator.h"
 
-#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(WINDOWS)
+#if ENABLE(ASSEMBLER) && OS(WINDOWS)
 
 #include "windows.h"

trunk/JavaScriptCore/wtf/Platform.h

@@ -1044 +1044 @@
 #endif
 
-/* 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)
-#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1
-#else
-#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1
-#endif
-#endif
-
 #if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS)
 #define ENABLE_PAN_SCROLLING 1