From: bmeurer@chromium.org Date: Tue, 10 Dec 2013 09:44:44 +0000 (+0000) Subject: Increase number of available major keys. X-Git-Tag: upstream/4.7.83~11399 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0cfb1cad9b597ee9ae072430ab9d3629457ae1b;p=platform%2Fupstream%2Fv8.git Increase number of available major keys. This also adds a static assert checking that we do not exceed the available number of major keys. The safepoint table offset is now max 2^24 instead of 2^25. R=hpayer@chromium.org Review URL: https://codereview.chromium.org/110183003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18284 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/code-stubs.h b/src/code-stubs.h index f2de616..55ebe21 100644 --- a/src/code-stubs.h +++ b/src/code-stubs.h @@ -245,6 +245,7 @@ class CodeStub BASE_EMBEDDED { MajorKeyBits::encode(MajorKey()); } + STATIC_ASSERT(NUMBER_OF_IDS < (1 << kStubMajorKeyBits)); class MajorKeyBits: public BitField {}; class MinorKeyBits: public BitField {}; // NOLINT diff --git a/src/objects.h b/src/objects.h index f09d58f..cc77e19 100644 --- a/src/objects.h +++ b/src/objects.h @@ -311,7 +311,7 @@ static const ExtraICState kNoExtraICState = 0; // Instance size sentinel for objects of variable size. const int kVariableSizeSentinel = 0; -const int kStubMajorKeyBits = 6; +const int kStubMajorKeyBits = 7; const int kStubMinorKeyBits = kBitsPerInt - kSmiTagSize - kStubMajorKeyBits; // All Maps have a field instance_type containing a InstanceType. @@ -5484,7 +5484,7 @@ class Code: public HeapObject { static const int kStubMajorKeyFirstBit = kIsCrankshaftedBit + 1; static const int kSafepointTableOffsetFirstBit = kStubMajorKeyFirstBit + kStubMajorKeyBits; - static const int kSafepointTableOffsetBitCount = 25; + static const int kSafepointTableOffsetBitCount = 24; STATIC_ASSERT(kStubMajorKeyFirstBit + kStubMajorKeyBits <= 32); STATIC_ASSERT(kSafepointTableOffsetFirstBit +