Bug fix and improvements to clamped arrays.

runtime/vm/intrinsifier_ia32.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 //
 // The intrinsic code below is executed before a method has built its frame.
 // The return address is on the stack and the arguments below it.
 // Registers EDX (arguments descriptor) and ECX (function) must be preserved.
 // Each intrinsification method returns true if the corresponding
 // Dart method was intrinsified.
 
@@ skipping 566 matching lines @@
   __ cmpl(EBX, Immediate(0xFF));
   __ j(ABOVE, &fall_through, Assembler::kNearJump);
   __ movb(FieldAddress(EAX, EDI, TIMES_1, Uint8Array::data_offset()), BL);
   __ ret();
   __ Bind(&fall_through);
   return false;
 }
 
 
 bool Intrinsifier::UintClamped8Array_getIndexed(Assembler* assembler) {
-  return Uint8Array_setIndexed(assembler);
+  Label fall_through;
+  TestByteArrayIndex(assembler, &fall_through);
+  __ SmiUntag(EBX);
+  __ movzxb(EAX, FieldAddress(EAX,
+                              EBX,
+                              TIMES_1,
+                              Uint8ClampedArray::data_offset()));
+  __ SmiTag(EAX);
+  __ ret();
+  __ Bind(&fall_through);
+  return false;
 }
 
 
 bool Intrinsifier::Uint8ClampedArray_setIndexed(Assembler* assembler) {
   Label fall_through, store_value, load_0xff;
   // Verify that the array index is valid.
   TestByteArraySetIndex(assembler, &fall_through);
   // After TestByteArraySetIndex:
   // * EAX has the base address of the byte array.
   // * EBX has the index into the array.
   // EBX contains the SMI index which is shifted by 1.
   __ SmiUntag(EBX);
-  // Free EBX for the value since we want a byte register.
-  __ movl(EDI, EBX);
+  // Free EBX for the value since we need a byte register.
+  __ leal(EAX, FieldAddress(EAX, EBX, TIMES_1,
+      Uint8ClampedArray::data_offset()));
   __ movl(EBX, Address(ESP, + 1 * kWordSize));  // Value.
   __ testl(EBX, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, &fall_through, Assembler::kNearJump);
 
   __ SmiUntag(EBX);
   __ cmpl(EBX, Immediate(0xFF));
   __ j(BELOW_EQUAL, &store_value, Assembler::kNearJump);
+  // Clamp to 0x00 or 0xFF respectively.
   __ j(GREATER, &load_0xff,  Assembler::kNearJump);
   __ xorl(EBX, EBX);  // Zero.
   __ jmp(&store_value, Assembler::kNearJump);
   __ Bind(&load_0xff);
   __ movl(EBX, Immediate(0xFF));
 
   __ Bind(&store_value);
-  __ movb(FieldAddress(EAX, EDI, TIMES_1, Uint8Array::data_offset()), BL);
+  __ movb(Address(EAX, 0), BL);
   __ ret();
   __ Bind(&fall_through);
   return false;
 }
 
 
 bool Intrinsifier::Int16Array_getIndexed(Assembler* assembler) {
   Label fall_through;
   TestByteArrayIndex(assembler, &fall_through);
   __ movsxw(EAX, FieldAddress(EAX,
@@ skipping 1033 matching lines @@
   __ Bind(&is_true);
   __ LoadObject(EAX, Bool::True());
   __ ret();
   return true;
 }
 
 #undef __
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32