Index: src/x64/code-stubs-x64.cc |
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc |
index 4b4531eb689dbb5b78709a7ecede24e3b303c0dc..c845eab7a5a4f072d2a3525dabecfbd656c79e39 100644 |
--- a/src/x64/code-stubs-x64.cc |
+++ b/src/x64/code-stubs-x64.cc |
@@ -4767,9 +4767,19 @@ void GenerateFastPixelArrayLoad(MacroAssembler* masm, |
} |
__ SmiToInteger32(untagged_key, key); |
- // Verify that the receiver has pixel array elements. |
__ movq(elements, FieldOperand(receiver, JSObject::kElementsOffset)); |
- __ CheckMap(elements, Factory::pixel_array_map(), not_pixel_array, true); |
+ // By passing NULL as not_pixel_array, callers signal that they have already |
+ // verified that the receiver has pixel array elements. |
+ if (not_pixel_array != NULL) { |
+ __ CheckMap(elements, Factory::pixel_array_map(), not_pixel_array, true); |
+ } else { |
+ if (FLAG_debug_code) { |
+ // Map check should have already made sure that elements is a pixel array. |
+ __ Cmp(FieldOperand(elements, HeapObject::kMapOffset), |
+ Factory::pixel_array_map()); |
+ __ Assert(equal, "Elements isn't a pixel array"); |
+ } |
+ } |
// Check that the smi is in range. |
__ cmpl(untagged_key, FieldOperand(elements, PixelArray::kLengthOffset)); |
@@ -4783,6 +4793,89 @@ void GenerateFastPixelArrayLoad(MacroAssembler* masm, |
} |
+// Stores an indexed element into a pixel array, clamping the stored value. |
+void GenerateFastPixelArrayStore(MacroAssembler* masm, |
+ Register receiver, |
+ Register key, |
+ Register value, |
+ Register elements, |
+ Register scratch1, |
+ bool load_elements_from_receiver, |
+ bool key_is_untagged, |
+ Label* key_not_smi, |
+ Label* value_not_smi, |
+ Label* not_pixel_array, |
+ Label* out_of_range) { |
+ // Register use: |
+ // receiver - holds the receiver and is unchanged. |
+ // key - holds the key (must be a smi) and is unchanged. |
+ // value - holds the value (must be a smi) and is unchanged. |
+ // elements - holds the element object of the receiver on entry if |
+ // load_elements_from_receiver is false, otherwise used |
+ // internally to store the pixel arrays elements and |
+ // external array pointer. |
+ // |
+ Register external_pointer = elements; |
+ Register untagged_key = scratch1; |
+ Register untagged_value = receiver; // Only set once success guaranteed. |
+ |
+ // Fetch the receiver's elements if the caller hasn't already done so. |
+ if (load_elements_from_receiver) { |
+ __ movq(elements, FieldOperand(receiver, JSObject::kElementsOffset)); |
+ } |
+ |
+ // By passing NULL as not_pixel_array, callers signal that they have already |
+ // verified that the receiver has pixel array elements. |
+ if (not_pixel_array != NULL) { |
+ __ CheckMap(elements, Factory::pixel_array_map(), not_pixel_array, true); |
+ } else { |
+ if (FLAG_debug_code) { |
+ // Map check should have already made sure that elements is a pixel array. |
+ __ Cmp(FieldOperand(elements, HeapObject::kMapOffset), |
+ Factory::pixel_array_map()); |
+ __ Assert(equal, "Elements isn't a pixel array"); |
+ } |
+ } |
+ |
+ // Some callers already have verified that the key is a smi. key_not_smi is |
+ // set to NULL as a sentinel for that case. Otherwise, add an explicit check |
+ // to ensure the key is a smi must be added. |
+ if (key_not_smi != NULL) { |
+ __ JumpIfNotSmi(key, key_not_smi); |
+ } else { |
+ if (FLAG_debug_code) { |
+ __ AbortIfNotSmi(key); |
+ } |
+ } |
+ |
+ // Key must be a smi and it must be in range. |
+ if (key_is_untagged) { |
+ untagged_key = key; |
+ } else { |
+ __ SmiToInteger32(untagged_key, key); |
+ } |
+ __ cmpl(untagged_key, FieldOperand(elements, PixelArray::kLengthOffset)); |
+ __ j(above_equal, out_of_range); // unsigned check handles negative keys. |
+ |
+ // Value must be a smi. |
+ __ JumpIfNotSmi(value, value_not_smi); |
+ __ SmiToInteger32(untagged_value, value); |
+ |
+ { // Clamp the value to [0..255]. |
+ NearLabel done; |
+ __ testl(untagged_value, Immediate(0xFFFFFF00)); |
+ __ j(zero, &done); |
+ __ setcc(negative, untagged_value); // 1 if negative, 0 if positive. |
+ __ decb(untagged_value); // 0 if negative, 255 if positive. |
+ __ bind(&done); |
+ } |
+ |
+ __ movq(external_pointer, |
+ FieldOperand(elements, PixelArray::kExternalPointerOffset)); |
+ __ movb(Operand(external_pointer, untagged_key, times_1, 0), untagged_value); |
+ __ ret(0); // Return value in eax. |
+} |
+ |
#undef __ |
} } // namespace v8::internal |