Changeset 42705 in webkit for trunk/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp

Timestamp:

Apr 21, 2009, 12:23:10 AM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-04-20 Geoffrey Garen <​[email protected]>

Reviewed by Mark Rowe.

Tiger crash fix: Put VM tags in their own header file, and fixed up the
#ifdefs so they're not used on Tiger.

• JavaScriptCore.xcodeproj/project.pbxproj:
• interpreter/RegisterFile.h: (JSC::RegisterFile::RegisterFile):
• jit/ExecutableAllocatorFixedVMPool.cpp: (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
• jit/ExecutableAllocatorPosix.cpp: (JSC::ExecutablePool::systemAlloc):
• runtime/Collector.cpp: (JSC::allocateBlock):
• wtf/VMTags.h: Added.

JavaScriptGlue:

2009-04-20 Geoffrey Garen <​[email protected]>

Reviewed by Mark Rowe.

Tiger crash fix: Put VM tags in their own header file, and fixed up the
#ifdefs so they're not used on Tiger.

• ForwardingHeaders/wtf/VMTags.h: Copied from JavaScriptGlue/ForwardingHeaders/wtf/HashTraits.h.

WebCore:

2009-04-20 Geoffrey Garen <​[email protected]>

Reviewed by Mark Rowe.

Tiger crash fix: Put VM tags in their own header file, and fixed up the
#ifdefs so they're not used on Tiger.

• ForwardingHeaders/wtf/VMTags.h: Copied from WebCore/ForwardingHeaders/wtf/HashTraits.h.

WebKit/mac:

2009-04-20 Geoffrey Garen <​[email protected]>

Reviewed by Mark Rowe.

Tiger crash fix: Put VM tags in their own header file, and fixed up the
#ifdefs so they're not used on Tiger.

• ForwardingHeaders/wtf/VMTags.h: Copied from ForwardingHeaders/wtf/HashTraits.h.

File:

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

trunk/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp

@@ -32 +32 @@
 #include <sys/mman.h>
 #include <unistd.h>
-
-#if PLATFORM(DARWIN)
-#include <mach/vm_statistics.h>
-#endif
-
-#if PLATFORM(DARWIN)
-// On Mac OS X, the VM subsystem allows tagging memory requested from mmap and vm_map
-// in order to aid tools that inspect system memory use. 
-#if defined(VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR)
-#define TAG_FOR_EXECUTABLEALLOCATOR_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR)
-#else
-#define TAG_FOR_EXECUTABLEALLOCATOR_MEMORY VM_MAKE_TAG(64)
-#endif
-#else
-#define TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
-#endif
+#include <wtf/VMTags.h>
 
 namespace JSC {
@@ -58 +43 @@
 ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
 {
-    ExecutablePool::Allocation alloc = { reinterpret_cast<char*>(mmap(NULL, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0)), n };
+    ExecutablePool::Allocation alloc = { reinterpret_cast<char*>(mmap(NULL, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0)), n };
     return alloc;
 }
@@ -70 +55 @@
 }
 
-#undef TAG_FOR_EXECUTABLEALLOCATOR_MEMORY
-
 #endif // HAVE(ASSEMBLER)