Revision: 13022
Author: [email protected]
Date: Wed Nov 21 01:54:53 2012
Log: MIPS: Support all fast elements kinds in the major array
operations. Currently missing support for unshift.
Port r12969 (b10320d7)
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/11412120
http://code.google.com/p/v8/source/detail?r=13022
Modified:
/branches/bleeding_edge/src/mips/code-stubs-mips.cc
/branches/bleeding_edge/src/mips/ic-mips.cc
/branches/bleeding_edge/src/mips/macro-assembler-mips.cc
/branches/bleeding_edge/src/mips/macro-assembler-mips.h
/branches/bleeding_edge/src/mips/stub-cache-mips.cc
/branches/bleeding_edge/src/objects-inl.h
=======================================
--- /branches/bleeding_edge/src/mips/code-stubs-mips.cc Wed Nov 21 01:41:34
2012
+++ /branches/bleeding_edge/src/mips/code-stubs-mips.cc Wed Nov 21 01:54:53
2012
@@ -7722,7 +7722,7 @@
// Array literal has ElementsKind of FAST_*_DOUBLE_ELEMENTS.
__ bind(&double_elements);
__ lw(t1, FieldMemOperand(a1, JSObject::kElementsOffset));
- __ StoreNumberToDoubleElements(a0, a3, a1,
+ __ StoreNumberToDoubleElements(a0, a3,
// Overwrites all regs after this.
t1, t2, t3, t5, a2,
&slow_elements);
=======================================
--- /branches/bleeding_edge/src/mips/ic-mips.cc Tue Nov 20 06:11:53 2012
+++ /branches/bleeding_edge/src/mips/ic-mips.cc Wed Nov 21 01:54:53 2012
@@ -1268,7 +1268,6 @@
__ bind(&fast_double_without_map_check);
__ StoreNumberToDoubleElements(value,
key,
- receiver,
elements, // Overwritten.
a3, // Scratch regs...
t0,
=======================================
--- /branches/bleeding_edge/src/mips/macro-assembler-mips.cc Wed Nov 21
01:41:34 2012
+++ /branches/bleeding_edge/src/mips/macro-assembler-mips.cc Wed Nov 21
01:54:53 2012
@@ -3380,13 +3380,13 @@
void MacroAssembler::StoreNumberToDoubleElements(Register value_reg,
Register key_reg,
- Register receiver_reg,
Register elements_reg,
Register scratch1,
Register scratch2,
Register scratch3,
Register scratch4,
- Label* fail) {
+ Label* fail,
+ int elements_offset) {
Label smi_value, maybe_nan, have_double_value, is_nan, done;
Register mantissa_reg = scratch2;
Register exponent_reg = scratch3;
@@ -3412,8 +3412,10 @@
bind(&have_double_value);
sll(scratch1, key_reg, kDoubleSizeLog2 - kSmiTagSize);
Addu(scratch1, scratch1, elements_reg);
- sw(mantissa_reg, FieldMemOperand(scratch1,
FixedDoubleArray::kHeaderSize));
- uint32_t offset = FixedDoubleArray::kHeaderSize +
sizeof(kHoleNanLower32);
+ sw(mantissa_reg, FieldMemOperand(
+ scratch1, FixedDoubleArray::kHeaderSize - elements_offset));
+ uint32_t offset = FixedDoubleArray::kHeaderSize - elements_offset +
+ sizeof(kHoleNanLower32);
sw(exponent_reg, FieldMemOperand(scratch1, offset));
jmp(&done);
@@ -3433,7 +3435,8 @@
bind(&smi_value);
Addu(scratch1, elements_reg,
- Operand(FixedDoubleArray::kHeaderSize - kHeapObjectTag));
+ Operand(FixedDoubleArray::kHeaderSize - kHeapObjectTag -
+ elements_offset));
sll(scratch2, key_reg, kDoubleSizeLog2 - kSmiTagSize);
Addu(scratch1, scratch1, scratch2);
// scratch1 is now effective address of the double element
=======================================
--- /branches/bleeding_edge/src/mips/macro-assembler-mips.h Fri Oct 19
05:39:59 2012
+++ /branches/bleeding_edge/src/mips/macro-assembler-mips.h Wed Nov 21
01:54:53 2012
@@ -972,14 +972,14 @@
// case scratch2, scratch3 and scratch4 are unmodified.
void StoreNumberToDoubleElements(Register value_reg,
Register key_reg,
- Register receiver_reg,
// All regs below here overwritten.
Register elements_reg,
Register scratch1,
Register scratch2,
Register scratch3,
Register scratch4,
- Label* fail);
+ Label* fail,
+ int elements_offset = 0);
// Compare an object's map with the specified map and its transitioned
// elements maps if mode is ALLOW_ELEMENT_TRANSITION_MAPS. Jumps to
=======================================
--- /branches/bleeding_edge/src/mips/stub-cache-mips.cc Tue Nov 13 23:33:16
2012
+++ /branches/bleeding_edge/src/mips/stub-cache-mips.cc Wed Nov 21 01:54:53
2012
@@ -1628,7 +1628,7 @@
} else {
Label call_builtin;
if (argc == 1) { // Otherwise fall through to call the builtin.
- Label attempt_to_grow_elements;
+ Label attempt_to_grow_elements, with_write_barrier, check_double;
Register elements = t2;
Register end_elements = t1;
@@ -1639,7 +1639,7 @@
__ CheckMap(elements,
v0,
Heap::kFixedArrayMapRootIndex,
- &call_builtin,
+ &check_double,
DONT_DO_SMI_CHECK);
// Get the array's length into v0 and calculate new length.
@@ -1655,7 +1655,6 @@
__ Branch(&attempt_to_grow_elements, gt, v0, Operand(t0));
// Check if value is a smi.
- Label with_write_barrier;
__ lw(t0, MemOperand(sp, (argc - 1) * kPointerSize));
__ JumpIfNotSmi(t0, &with_write_barrier);
@@ -1676,6 +1675,39 @@
__ Drop(argc + 1);
__ Ret();
+ __ bind(&check_double);
+
+ // Check that the elements are in fast mode and writable.
+ __ CheckMap(elements,
+ a0,
+ Heap::kFixedDoubleArrayMapRootIndex,
+ &call_builtin,
+ DONT_DO_SMI_CHECK);
+
+ // Get the array's length into r0 and calculate new length.
+ __ lw(a0, FieldMemOperand(receiver, JSArray::kLengthOffset));
+ STATIC_ASSERT(kSmiTagSize == 1);
+ STATIC_ASSERT(kSmiTag == 0);
+ __ Addu(a0, a0, Operand(Smi::FromInt(argc)));
+
+ // Get the elements' length.
+ __ lw(t0, FieldMemOperand(elements, FixedArray::kLengthOffset));
+
+ // Check if we could survive without allocation.
+ __ Branch(&call_builtin, gt, a0, Operand(t0));
+
+ __ lw(t0, MemOperand(sp, (argc - 1) * kPointerSize));
+ __ StoreNumberToDoubleElements(
+ t0, a0, elements, a3, t1, a2, t5,
+ &call_builtin, argc * kDoubleSize);
+
+ // Save new length.
+ __ sw(a0, FieldMemOperand(receiver, JSArray::kLengthOffset));
+
+ // Check for a smi.
+ __ Drop(argc + 1);
+ __ Ret();
+
__ bind(&with_write_barrier);
__ lw(a3, FieldMemOperand(receiver, HeapObject::kMapOffset));
@@ -1687,8 +1719,12 @@
// In case of fast smi-only, convert to fast object, otherwise
bail out.
__ bind(¬_fast_object);
__ CheckFastSmiElements(a3, t3, &call_builtin);
+
+ __ lw(t3, FieldMemOperand(t0, HeapObject::kMapOffset));
+ __ LoadRoot(at, Heap::kHeapNumberMapRootIndex);
+ __ Branch(&call_builtin, eq, t3, Operand(at));
// edx: receiver
- // r3: map
+ // a3: map
Label try_holey_map;
__ LoadTransitionedArrayMapConditional(FAST_SMI_ELEMENTS,
FAST_ELEMENTS,
@@ -4757,7 +4793,6 @@
__ StoreNumberToDoubleElements(value_reg,
key_reg,
- receiver_reg,
// All registers after this are
overwritten.
elements_reg,
scratch1,
=======================================
--- /branches/bleeding_edge/src/objects-inl.h Mon Nov 19 07:00:34 2012
+++ /branches/bleeding_edge/src/objects-inl.h Wed Nov 21 01:54:53 2012
@@ -1944,7 +1944,7 @@
double* FixedDoubleArray::data_start() {
- return &READ_DOUBLE_FIELD(this, kHeaderSize);
+ return reinterpret_cast<double*>(FIELD_ADDR(this, kHeaderSize));
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
