Rename SeqAsciiString

src/ia32/full-codegen-ia32.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 3562 matching lines @@
                               times_pointer_size,
                               FixedArray::kHeaderSize));
   __ JumpIfSmi(string, &bailout);
   __ mov(scratch, FieldOperand(string, HeapObject::kMapOffset));
   __ movzx_b(scratch, FieldOperand(scratch, Map::kInstanceTypeOffset));
   __ and_(scratch, Immediate(
       kIsNotStringMask | kStringEncodingMask | kStringRepresentationMask));
   __ cmp(scratch, kStringTag | kOneByteStringTag | kSeqStringTag);
   __ j(not_equal, &bailout);
   __ add(string_length,
-         FieldOperand(string, SeqAsciiString::kLengthOffset));
+         FieldOperand(string, SeqOneByteString::kLengthOffset));
   __ j(overflow, &bailout);
   __ add(index, Immediate(1));
   __ cmp(index, array_length);
   __ j(less, &loop);
 
   // If array_length is 1, return elements[0], a string.
   __ cmp(array_length, 1);
   __ j(not_equal, &not_size_one_array);
   __ mov(scratch, FieldOperand(elements, FixedArray::kHeaderSize));
   __ mov(result_operand, scratch);
@@ skipping 16 matching lines @@
   __ movzx_b(scratch, FieldOperand(scratch, Map::kInstanceTypeOffset));
   __ and_(scratch, Immediate(
       kIsNotStringMask | kStringEncodingMask | kAsciiDataHintMask |
       kStringRepresentationMask));
   __ cmp(scratch, ASCII_STRING_TYPE);
   __ j(not_equal, &bailout);
 
   // Add (separator length times array_length) - separator length
   // to string_length.
   __ mov(scratch, separator_operand);
-  __ mov(scratch, FieldOperand(scratch, SeqAsciiString::kLengthOffset));
+  __ mov(scratch, FieldOperand(scratch, SeqOneByteString::kLengthOffset));
   __ sub(string_length, scratch);  // May be negative, temporarily.
   __ imul(scratch, array_length_operand);
   __ j(overflow, &bailout);
   __ add(string_length, scratch);
   __ j(overflow, &bailout);
 
   __ shr(string_length, 1);
   // Live registers and stack values:
   //   string_length
   //   elements
   __ AllocateAsciiString(result_pos, string_length, scratch,
                          index, string, &bailout);
   __ mov(result_operand, result_pos);
-  __ lea(result_pos, FieldOperand(result_pos, SeqAsciiString::kHeaderSize));
+  __ lea(result_pos, FieldOperand(result_pos, SeqOneByteString::kHeaderSize));
 
 
   __ mov(string, separator_operand);
-  __ cmp(FieldOperand(string, SeqAsciiString::kLengthOffset),
+  __ cmp(FieldOperand(string, SeqOneByteString::kLengthOffset),
          Immediate(Smi::FromInt(1)));
   __ j(equal, &one_char_separator);
   __ j(greater, &long_separator);
 
 
   // Empty separator case
   __ mov(index, Immediate(0));
   __ jmp(&loop_1_condition);
   // Loop condition: while (index < length).
   __ bind(&loop_1);
   // Each iteration of the loop concatenates one string to the result.
   // Live values in registers:
   //   index: which element of the elements array we are adding to the result.
   //   result_pos: the position to which we are currently copying characters.
   //   elements: the FixedArray of strings we are joining.
 
   // Get string = array[index].
   __ mov(string, FieldOperand(elements, index,
                               times_pointer_size,
                               FixedArray::kHeaderSize));
   __ mov(string_length,
          FieldOperand(string, String::kLengthOffset));
   __ shr(string_length, 1);
   __ lea(string,
-         FieldOperand(string, SeqAsciiString::kHeaderSize));
+         FieldOperand(string, SeqOneByteString::kHeaderSize));
   __ CopyBytes(string, result_pos, string_length, scratch);
   __ add(index, Immediate(1));
   __ bind(&loop_1_condition);
   __ cmp(index, array_length_operand);
   __ j(less, &loop_1);  // End while (index < length).
   __ jmp(&done);
 
 
 
   // One-character separator case
   __ bind(&one_char_separator);
   // Replace separator with its ASCII character value.
-  __ mov_b(scratch, FieldOperand(string, SeqAsciiString::kHeaderSize));
+  __ mov_b(scratch, FieldOperand(string, SeqOneByteString::kHeaderSize));
   __ mov_b(separator_operand, scratch);
 
   __ Set(index, Immediate(0));
   // Jump into the loop after the code that copies the separator, so the first
   // element is not preceded by a separator
   __ jmp(&loop_2_entry);
   // Loop condition: while (index < length).
   __ bind(&loop_2);
   // Each iteration of the loop concatenates one string to the result.
   // Live values in registers:
   //   index: which element of the elements array we are adding to the result.
   //   result_pos: the position to which we are currently copying characters.
 
   // Copy the separator character to the result.
   __ mov_b(scratch, separator_operand);
   __ mov_b(Operand(result_pos, 0), scratch);
   __ inc(result_pos);
 
   __ bind(&loop_2_entry);
   // Get string = array[index].
   __ mov(string, FieldOperand(elements, index,
                               times_pointer_size,
                               FixedArray::kHeaderSize));
   __ mov(string_length,
          FieldOperand(string, String::kLengthOffset));
   __ shr(string_length, 1);
   __ lea(string,
-         FieldOperand(string, SeqAsciiString::kHeaderSize));
+         FieldOperand(string, SeqOneByteString::kHeaderSize));
   __ CopyBytes(string, result_pos, string_length, scratch);
   __ add(index, Immediate(1));
 
   __ cmp(index, array_length_operand);
   __ j(less, &loop_2);  // End while (index < length).
   __ jmp(&done);
 
 
   // Long separator case (separator is more than one character).
   __ bind(&long_separator);
 
   __ Set(index, Immediate(0));
   // Jump into the loop after the code that copies the separator, so the first
   // element is not preceded by a separator
   __ jmp(&loop_3_entry);
   // Loop condition: while (index < length).
   __ bind(&loop_3);
   // Each iteration of the loop concatenates one string to the result.
   // Live values in registers:
   //   index: which element of the elements array we are adding to the result.
   //   result_pos: the position to which we are currently copying characters.
 
   // Copy the separator to the result.
   __ mov(string, separator_operand);
   __ mov(string_length,
          FieldOperand(string, String::kLengthOffset));
   __ shr(string_length, 1);
   __ lea(string,
-         FieldOperand(string, SeqAsciiString::kHeaderSize));
+         FieldOperand(string, SeqOneByteString::kHeaderSize));
   __ CopyBytes(string, result_pos, string_length, scratch);
 
   __ bind(&loop_3_entry);
   // Get string = array[index].
   __ mov(string, FieldOperand(elements, index,
                               times_pointer_size,
                               FixedArray::kHeaderSize));
   __ mov(string_length,
          FieldOperand(string, String::kLengthOffset));
   __ shr(string_length, 1);
   __ lea(string,
-         FieldOperand(string, SeqAsciiString::kHeaderSize));
+         FieldOperand(string, SeqOneByteString::kHeaderSize));
   __ CopyBytes(string, result_pos, string_length, scratch);
   __ add(index, Immediate(1));
 
   __ cmp(index, array_length_operand);
   __ j(less, &loop_3);  // End while (index < length).
   __ jmp(&done);
 
 
   __ bind(&bailout);
   __ mov(result_operand, isolate()->factory()->undefined_value());
@@ skipping 742 matching lines @@
   *stack_depth = 0;
   *context_length = 0;
   return previous_;
 }
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32