mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 20:35:50 +00:00
Bug 1046585 part 2 - rm js/src/assembler/wtf/VMTags.h r=sunfish
--HG-- extra : rebase_source : c1e828e0a5070e2bddec4004063e4ceb1b3f1478
This commit is contained in:
parent
12200f727e
commit
cba08896f1
@ -33,7 +33,6 @@
|
||||
#include "mozilla/DebugOnly.h"
|
||||
#include "mozilla/TaggedAnonymousMemory.h"
|
||||
|
||||
#include "assembler/wtf/VMTags.h"
|
||||
#include "js/Utility.h"
|
||||
|
||||
namespace JSC {
|
||||
@ -45,7 +44,7 @@ size_t ExecutableAllocator::determinePageSize()
|
||||
|
||||
ExecutablePool::Allocation ExecutableAllocator::systemAlloc(size_t n)
|
||||
{
|
||||
void *allocation = MozTaggedAnonymousMmap(NULL, n, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0, "js-jit-code");
|
||||
void *allocation = MozTaggedAnonymousMmap(NULL, n, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, -1, 0, "js-jit-code");
|
||||
if (allocation == MAP_FAILED)
|
||||
allocation = NULL;
|
||||
ExecutablePool::Allocation alloc = { reinterpret_cast<char*>(allocation), n };
|
||||
|
@ -1,90 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2009 Apple Inc. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
||||
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef assembler_wtf_VMTags_h
|
||||
#define assembler_wtf_VMTags_h
|
||||
|
||||
// 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 WTF_PLATFORM_DARWIN
|
||||
|
||||
#include <mach/vm_statistics.h>
|
||||
|
||||
#if !defined(TARGETING_TIGER)
|
||||
|
||||
#if defined(VM_MEMORY_TCMALLOC)
|
||||
#define VM_TAG_FOR_TCMALLOC_MEMORY VM_MAKE_TAG(VM_MEMORY_TCMALLOC)
|
||||
#else
|
||||
#define VM_TAG_FOR_TCMALLOC_MEMORY VM_MAKE_TAG(53)
|
||||
#endif // defined(VM_MEMORY_TCMALLOC)
|
||||
|
||||
#if defined(VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR)
|
||||
#define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR)
|
||||
#else
|
||||
#define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY VM_MAKE_TAG(64)
|
||||
#endif // defined(VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR)
|
||||
|
||||
#if defined(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
|
||||
#define VM_TAG_FOR_REGISTERFILE_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
|
||||
#else
|
||||
#define VM_TAG_FOR_REGISTERFILE_MEMORY VM_MAKE_TAG(65)
|
||||
#endif // defined(VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE)
|
||||
|
||||
#else // !defined(TARGETING_TIGER)
|
||||
|
||||
// mmap on Tiger fails with tags that work on Leopard, so fall
|
||||
// back to Tiger-compatible tags (that also work on Leopard)
|
||||
// when targeting Tiger.
|
||||
#define VM_TAG_FOR_TCMALLOC_MEMORY -1
|
||||
#define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
|
||||
#define VM_TAG_FOR_REGISTERFILE_MEMORY -1
|
||||
|
||||
#endif // !defined(TARGETING_TIGER)
|
||||
|
||||
// Tags for vm_map and vm_allocate work on both Tiger and Leopard.
|
||||
|
||||
#if defined(VM_MEMORY_JAVASCRIPT_CORE)
|
||||
#define VM_TAG_FOR_COLLECTOR_MEMORY VM_MAKE_TAG(VM_MEMORY_JAVASCRIPT_CORE)
|
||||
#else
|
||||
#define VM_TAG_FOR_COLLECTOR_MEMORY VM_MAKE_TAG(63)
|
||||
#endif // defined(VM_MEMORY_JAVASCRIPT_CORE)
|
||||
|
||||
#if defined(VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS)
|
||||
#define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY VM_MAKE_TAG(VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS)
|
||||
#else
|
||||
#define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY VM_MAKE_TAG(69)
|
||||
#endif // defined(VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS)
|
||||
|
||||
#else // OS(DARWIN)
|
||||
|
||||
#define VM_TAG_FOR_TCMALLOC_MEMORY -1
|
||||
#define VM_TAG_FOR_COLLECTOR_MEMORY -1
|
||||
#define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
|
||||
#define VM_TAG_FOR_REGISTERFILE_MEMORY -1
|
||||
#define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY -1
|
||||
|
||||
#endif // OS(DARWIN)
|
||||
|
||||
#endif /* assembler_wtf_VMTags_h */
|
Loading…
Reference in New Issue
Block a user