Changeset 42705 in webkit for trunk/JavaScriptCore/interpreter/RegisterFile.h

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/interpreter/RegisterFile.h (modified) (4 diffs)

trunk/JavaScriptCore/interpreter/RegisterFile.h

@@ -30 +30 @@
 #define RegisterFile_h
 
+#include "Collector.h"
 #include "ExecutableAllocator.h"
 #include "Register.h"
-#include "Collector.h"
 #include <wtf/Noncopyable.h>
+#include <wtf/VMTags.h>
 
 #if HAVE(MMAP)
@@ -39 +40 @@
 #include <stdio.h>
 #include <sys/mman.h>
-#endif
-
-#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_REGISTER_FILE)
-#define TAG_FOR_REGISTERFILE_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
-#else
-#define TAG_FOR_REGISTERFILE_MEMORY VM_MAKE_TAG(65)
-#endif
-#else
-#define TAG_FOR_REGISTERFILE_MEMORY -1
 #endif
 
@@ -178 +163 @@
         size_t bufferLength = (capacity + maxGlobals) * sizeof(Register);
     #if HAVE(MMAP)
-        m_buffer = static_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, TAG_FOR_REGISTERFILE_MEMORY, 0));
+        m_buffer = static_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, VM_TAG_FOR_REGISTERFILE_MEMORY, 0));
         if (m_buffer == MAP_FAILED) {
             fprintf(stderr, "Could not allocate register file: %d\n", errno);
@@ -235 +220 @@
 } // namespace JSC
 
-#undef TAG_FOR_REGISTERFILE_MEMORY
-
 #endif // RegisterFile_h