Revision: 21515
Author: [email protected]
Date: Tue May 27 09:38:01 2014 UTC
Log: Convert ElementsKind into a BitField
[email protected]
Review URL: https://codereview.chromium.org/306513002
http://code.google.com/p/v8/source/detail?r=21515
Modified:
/branches/bleeding_edge/src/arm/code-stubs-arm.cc
/branches/bleeding_edge/src/arm/macro-assembler-arm.cc
/branches/bleeding_edge/src/arm64/code-stubs-arm64.cc
/branches/bleeding_edge/src/arm64/macro-assembler-arm64.cc
/branches/bleeding_edge/src/ia32/code-stubs-ia32.cc
/branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc
/branches/bleeding_edge/src/mips/code-stubs-mips.cc
/branches/bleeding_edge/src/mips/macro-assembler-mips.cc
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/x64/code-stubs-x64.cc
/branches/bleeding_edge/src/x64/macro-assembler-x64.cc
/branches/bleeding_edge/src/x87/code-stubs-x87.cc
/branches/bleeding_edge/src/x87/macro-assembler-x87.cc
=======================================
--- /branches/bleeding_edge/src/arm/code-stubs-arm.cc Mon May 26 13:59:24
2014 UTC
+++ /branches/bleeding_edge/src/arm/code-stubs-arm.cc Tue May 27 09:38:01
2014 UTC
@@ -5134,7 +5134,7 @@
// but the following bit field extraction takes care of that anyway.
__ ldr(r3, FieldMemOperand(r3, Map::kBitField2Offset));
// Retrieve elements_kind from bit field 2.
- __ Ubfx(r3, r3, Map::kElementsKindShift, Map::kElementsKindBitCount);
+ __ DecodeField<Map::ElementsKindBits>(r3);
if (FLAG_debug_code) {
Label done;
=======================================
--- /branches/bleeding_edge/src/arm/macro-assembler-arm.cc Tue May 27
07:17:08 2014 UTC
+++ /branches/bleeding_edge/src/arm/macro-assembler-arm.cc Tue May 27
09:38:01 2014 UTC
@@ -3951,7 +3951,7 @@
bind(&loop_again);
ldr(current, FieldMemOperand(current, HeapObject::kMapOffset));
ldr(scratch1, FieldMemOperand(current, Map::kBitField2Offset));
- Ubfx(scratch1, scratch1, Map::kElementsKindShift,
Map::kElementsKindBitCount);
+ DecodeField<Map::ElementsKindBits>(scratch1);
cmp(scratch1, Operand(DICTIONARY_ELEMENTS));
b(eq, found);
ldr(current, FieldMemOperand(current, Map::kPrototypeOffset));
=======================================
--- /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc Mon May 26
13:59:24 2014 UTC
+++ /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc Tue May 27
09:38:01 2014 UTC
@@ -4687,7 +4687,7 @@
__ JumpIfSmi(value, &smi_element);
// Jump if array's ElementsKind is not FAST_ELEMENTS or
FAST_HOLEY_ELEMENTS.
- __ Tbnz(bitfield2, MaskToBit(FAST_ELEMENTS << Map::kElementsKindShift),
+ __ Tbnz(bitfield2, MaskToBit(FAST_ELEMENTS <<
Map::ElementsKindBits::kShift),
&fast_elements);
// Store into the array literal requires an elements transition. Call
into
=======================================
--- /branches/bleeding_edge/src/arm64/macro-assembler-arm64.cc Tue May 27
07:17:08 2014 UTC
+++ /branches/bleeding_edge/src/arm64/macro-assembler-arm64.cc Tue May 27
09:38:01 2014 UTC
@@ -3769,7 +3769,7 @@
// Load the map's "bit field 2".
__ Ldrb(result, FieldMemOperand(map, Map::kBitField2Offset));
// Retrieve elements_kind from bit field 2.
- __ Ubfx(result, result, Map::kElementsKindShift,
Map::kElementsKindBitCount);
+ DecodeField<Map::ElementsKindBits>(result);
}
@@ -4544,7 +4544,7 @@
Bind(&loop_again);
Ldr(current, FieldMemOperand(current, HeapObject::kMapOffset));
Ldrb(scratch1, FieldMemOperand(current, Map::kBitField2Offset));
- Ubfx(scratch1, scratch1, Map::kElementsKindShift,
Map::kElementsKindBitCount);
+ DecodeField<Map::ElementsKindBits>(scratch1);
CompareAndBranch(scratch1, DICTIONARY_ELEMENTS, eq, found);
Ldr(current, FieldMemOperand(current, Map::kPrototypeOffset));
CompareAndBranch(current, Operand(factory->null_value()), ne,
&loop_again);
=======================================
--- /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Mon May 26 13:59:24
2014 UTC
+++ /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Tue May 27 09:38:01
2014 UTC
@@ -4952,8 +4952,7 @@
// but the following masking takes care of that anyway.
__ mov(ecx, FieldOperand(ecx, Map::kBitField2Offset));
// Retrieve elements_kind from bit field 2.
- __ and_(ecx, Map::kElementsKindMask);
- __ shr(ecx, Map::kElementsKindShift);
+ __ DecodeField<Map::ElementsKindBits>(ecx);
if (FLAG_debug_code) {
Label done;
=======================================
--- /branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc Tue May 27
07:17:08 2014 UTC
+++ /branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc Tue May 27
09:38:01 2014 UTC
@@ -3422,8 +3422,7 @@
bind(&loop_again);
mov(current, FieldOperand(current, HeapObject::kMapOffset));
mov(scratch1, FieldOperand(current, Map::kBitField2Offset));
- and_(scratch1, Map::kElementsKindMask);
- shr(scratch1, Map::kElementsKindShift);
+ DecodeField<Map::ElementsKindBits>(scratch1);
cmp(scratch1, Immediate(DICTIONARY_ELEMENTS));
j(equal, found);
mov(current, FieldOperand(current, Map::kPrototypeOffset));
=======================================
--- /branches/bleeding_edge/src/mips/code-stubs-mips.cc Mon May 26 13:59:24
2014 UTC
+++ /branches/bleeding_edge/src/mips/code-stubs-mips.cc Tue May 27 09:38:01
2014 UTC
@@ -5349,7 +5349,7 @@
// but the following bit field extraction takes care of that anyway.
__ lbu(a3, FieldMemOperand(a3, Map::kBitField2Offset));
// Retrieve elements_kind from bit field 2.
- __ Ext(a3, a3, Map::kElementsKindShift, Map::kElementsKindBitCount);
+ __ DecodeField<Map::ElementsKindBits>(a3);
if (FLAG_debug_code) {
Label done;
=======================================
--- /branches/bleeding_edge/src/mips/macro-assembler-mips.cc Mon May 26
12:58:55 2014 UTC
+++ /branches/bleeding_edge/src/mips/macro-assembler-mips.cc Tue May 27
09:38:01 2014 UTC
@@ -5627,7 +5627,7 @@
bind(&loop_again);
lw(current, FieldMemOperand(current, HeapObject::kMapOffset));
lb(scratch1, FieldMemOperand(current, Map::kBitField2Offset));
- Ext(scratch1, scratch1, Map::kElementsKindShift,
Map::kElementsKindBitCount);
+ DecodeField<Map::ElementsKindBits>(scratch1);
Branch(found, eq, scratch1, Operand(DICTIONARY_ELEMENTS));
lw(current, FieldMemOperand(current, Map::kPrototypeOffset));
Branch(&loop_again, ne, current, Operand(factory->null_value()));
=======================================
--- /branches/bleeding_edge/src/objects.h Mon May 26 08:13:09 2014 UTC
+++ /branches/bleeding_edge/src/objects.h Tue May 27 09:38:01 2014 UTC
@@ -6084,15 +6084,13 @@
inline void set_elements_kind(ElementsKind elements_kind) {
ASSERT(elements_kind < kElementsKindCount);
- ASSERT(kElementsKindCount <= (1 << kElementsKindBitCount));
- set_bit_field2((bit_field2() & ~kElementsKindMask) |
- (elements_kind << kElementsKindShift));
+ ASSERT(kElementsKindCount <= (1 << Map::ElementsKindBits::kSize));
+ set_bit_field2(Map::ElementsKindBits::update(bit_field2(),
elements_kind));
ASSERT(this->elements_kind() == elements_kind);
}
inline ElementsKind elements_kind() {
- return static_cast<ElementsKind>(
- (bit_field2() & kElementsKindMask) >> kElementsKindShift);
+ return Map::ElementsKindBits::decode(bit_field2());
}
// Tells whether the instance has fast elements that are only Smis.
@@ -6573,25 +6571,20 @@
static const int kIsExtensible = 0;
static const int kStringWrapperSafeForDefaultValueOf = 1;
// Currently bit 2 is not used.
- // No bits can be used after kElementsKindFirstBit, they are all
reserved for
- // storing ElementKind.
- static const int kElementsKindShift = 3;
- static const int kElementsKindBitCount = 5;
+ class ElementsKindBits: public BitField<ElementsKind, 3, 5> {};
// Derived values from bit field 2
- static const int kElementsKindMask = (-1 << kElementsKindShift) &
- ((1 << (kElementsKindShift + kElementsKindBitCount)) - 1);
static const int8_t kMaximumBitField2FastElementValue =
static_cast<int8_t>(
- (FAST_ELEMENTS + 1) << Map::kElementsKindShift) - 1;
+ (FAST_ELEMENTS + 1) << Map::ElementsKindBits::kShift) - 1;
static const int8_t kMaximumBitField2FastSmiElementValue =
static_cast<int8_t>((FAST_SMI_ELEMENTS + 1) <<
- Map::kElementsKindShift) - 1;
+ Map::ElementsKindBits::kShift) - 1;
static const int8_t kMaximumBitField2FastHoleyElementValue =
static_cast<int8_t>((FAST_HOLEY_ELEMENTS + 1) <<
- Map::kElementsKindShift) - 1;
+ Map::ElementsKindBits::kShift) - 1;
static const int8_t kMaximumBitField2FastHoleySmiElementValue =
static_cast<int8_t>((FAST_HOLEY_SMI_ELEMENTS + 1) <<
- Map::kElementsKindShift) - 1;
+ Map::ElementsKindBits::kShift) - 1;
typedef FixedBodyDescriptor<kPointerFieldsBeginOffset,
kPointerFieldsEndOffset,
=======================================
--- /branches/bleeding_edge/src/x64/code-stubs-x64.cc Mon May 26 13:59:24
2014 UTC
+++ /branches/bleeding_edge/src/x64/code-stubs-x64.cc Tue May 27 09:38:01
2014 UTC
@@ -4895,8 +4895,7 @@
// but the following masking takes care of that anyway.
__ movzxbp(rcx, FieldOperand(rcx, Map::kBitField2Offset));
// Retrieve elements_kind from bit field 2.
- __ andp(rcx, Immediate(Map::kElementsKindMask));
- __ shrp(rcx, Immediate(Map::kElementsKindShift));
+ __ DecodeField<Map::ElementsKindBits>(rcx);
if (FLAG_debug_code) {
Label done;
=======================================
--- /branches/bleeding_edge/src/x64/macro-assembler-x64.cc Tue May 27
07:17:08 2014 UTC
+++ /branches/bleeding_edge/src/x64/macro-assembler-x64.cc Tue May 27
09:38:01 2014 UTC
@@ -5197,8 +5197,7 @@
bind(&loop_again);
movp(current, FieldOperand(current, HeapObject::kMapOffset));
movp(scratch1, FieldOperand(current, Map::kBitField2Offset));
- andp(scratch1, Immediate(Map::kElementsKindMask));
- shrp(scratch1, Immediate(Map::kElementsKindShift));
+ DecodeField<Map::ElementsKindBits>(scratch1);
cmpp(scratch1, Immediate(DICTIONARY_ELEMENTS));
j(equal, found);
movp(current, FieldOperand(current, Map::kPrototypeOffset));
=======================================
--- /branches/bleeding_edge/src/x87/code-stubs-x87.cc Fri May 23 16:37:27
2014 UTC
+++ /branches/bleeding_edge/src/x87/code-stubs-x87.cc Tue May 27 09:38:01
2014 UTC
@@ -4592,8 +4592,7 @@
// but the following masking takes care of that anyway.
__ mov(ecx, FieldOperand(ecx, Map::kBitField2Offset));
// Retrieve elements_kind from bit field 2.
- __ and_(ecx, Map::kElementsKindMask);
- __ shr(ecx, Map::kElementsKindShift);
+ DecodeField<Map::ElementsKindBits>(ecx);
if (FLAG_debug_code) {
Label done;
=======================================
--- /branches/bleeding_edge/src/x87/macro-assembler-x87.cc Mon May 26
12:58:55 2014 UTC
+++ /branches/bleeding_edge/src/x87/macro-assembler-x87.cc Tue May 27
09:38:01 2014 UTC
@@ -3304,8 +3304,7 @@
bind(&loop_again);
mov(current, FieldOperand(current, HeapObject::kMapOffset));
mov(scratch1, FieldOperand(current, Map::kBitField2Offset));
- and_(scratch1, Map::kElementsKindMask);
- shr(scratch1, Map::kElementsKindShift);
+ DecodeField<Map::ElementsKindBits>(scratch1);
cmp(scratch1, Immediate(DICTIONARY_ELEMENTS));
j(equal, found);
mov(current, FieldOperand(current, Map::kPrototypeOffset));
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
