mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
Backed out changeset a1feed3cd303 (bug 941804) for b2g bustage on a CLOSED TREE
This commit is contained in:
parent
574c86f3cf
commit
783f4386db
@ -13,10 +13,6 @@
|
||||
|
||||
#include "js/Utility.h"
|
||||
|
||||
#ifdef MOZ_B2G
|
||||
#define JS_GC_CHUNK_SIZE_SMALL
|
||||
#endif
|
||||
|
||||
/* These values are private to the JS engine. */
|
||||
namespace js {
|
||||
|
||||
@ -36,11 +32,7 @@ const size_t ArenaShift = 12;
|
||||
const size_t ArenaSize = size_t(1) << ArenaShift;
|
||||
const size_t ArenaMask = ArenaSize - 1;
|
||||
|
||||
#ifdef JS_GC_CHUNK_SIZE_SMALL
|
||||
const size_t ChunkShift = 18;
|
||||
#else
|
||||
const size_t ChunkShift = 20;
|
||||
#endif
|
||||
const size_t ChunkSize = size_t(1) << ChunkShift;
|
||||
const size_t ChunkMask = ChunkSize - 1;
|
||||
|
||||
@ -49,13 +41,8 @@ const size_t CellSize = size_t(1) << CellShift;
|
||||
const size_t CellMask = CellSize - 1;
|
||||
|
||||
/* These are magic constants derived from actual offsets in gc/Heap.h. */
|
||||
#ifdef JS_GC_CHUNK_SIZE_SMALL
|
||||
const size_t ChunkMarkBitmapOffset = 258104;
|
||||
const size_t ChunkMarkBitmapBits = 31744;
|
||||
#else
|
||||
const size_t ChunkMarkBitmapOffset = 1032352;
|
||||
const size_t ChunkMarkBitmapBits = 129024;
|
||||
#endif
|
||||
const size_t ChunkRuntimeOffset = ChunkSize - sizeof(void*);
|
||||
const size_t ChunkLocationOffset = ChunkSize - 2 * sizeof(void*) - sizeof(uint64_t);
|
||||
|
||||
|
@ -700,12 +700,7 @@ const size_t BytesPerArenaWithHeader = ArenaSize + ArenaBitmapBytes;
|
||||
const size_t ChunkDecommitBitmapBytes = ChunkSize / ArenaSize / JS_BITS_PER_BYTE;
|
||||
const size_t ChunkBytesAvailable = ChunkSize - sizeof(ChunkInfo) - ChunkDecommitBitmapBytes;
|
||||
const size_t ArenasPerChunk = ChunkBytesAvailable / BytesPerArenaWithHeader;
|
||||
|
||||
#ifdef JS_GC_CHUNK_SIZE_SMALL
|
||||
static_assert(ArenasPerChunk == 62, "Do not accidentally change our heap's density.");
|
||||
#else
|
||||
static_assert(ArenasPerChunk == 252, "Do not accidentally change our heap's density.");
|
||||
#endif
|
||||
|
||||
/* A chunk bitmap contains enough mark bits for all the cells in a chunk. */
|
||||
struct ChunkBitmap
|
||||
|
Loading…
Reference in New Issue
Block a user