| Index: src/mips/macro-assembler-mips.h
|
| diff --git a/src/mips/macro-assembler-mips.h b/src/mips/macro-assembler-mips.h
|
| index b8c881a2e742b853a5181ee75edf4ac1d6dbd3c5..5a7905c7e3c7fcc82815dc8206fd01dbcc21e255 100644
|
| --- a/src/mips/macro-assembler-mips.h
|
| +++ b/src/mips/macro-assembler-mips.h
|
| @@ -518,32 +518,25 @@ class MacroAssembler: public Assembler {
|
| Register scratch2,
|
| Register scratch3,
|
| Label* gc_required);
|
| - void AllocateAsciiString(Register result,
|
| - Register length,
|
| - Register scratch1,
|
| - Register scratch2,
|
| - Register scratch3,
|
| - Label* gc_required);
|
| + void AllocateOneByteString(Register result, Register length,
|
| + Register scratch1, Register scratch2,
|
| + Register scratch3, Label* gc_required);
|
| void AllocateTwoByteConsString(Register result,
|
| Register length,
|
| Register scratch1,
|
| Register scratch2,
|
| Label* gc_required);
|
| - void AllocateAsciiConsString(Register result,
|
| - Register length,
|
| - Register scratch1,
|
| - Register scratch2,
|
| - Label* gc_required);
|
| + void AllocateOneByteConsString(Register result, Register length,
|
| + Register scratch1, Register scratch2,
|
| + Label* gc_required);
|
| void AllocateTwoByteSlicedString(Register result,
|
| Register length,
|
| Register scratch1,
|
| Register scratch2,
|
| Label* gc_required);
|
| - void AllocateAsciiSlicedString(Register result,
|
| - Register length,
|
| - Register scratch1,
|
| - Register scratch2,
|
| - Label* gc_required);
|
| + void AllocateOneByteSlicedString(Register result, Register length,
|
| + Register scratch1, Register scratch2,
|
| + Label* gc_required);
|
|
|
| // Allocates a heap number or jumps to the gc_required label if the young
|
| // space is full and a scavenge is needed. All registers are clobbered also
|
| @@ -1481,18 +1474,14 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT
|
|
|
| // Checks if both instance types are sequential ASCII strings and jumps to
|
| // label if either is not.
|
| - void JumpIfBothInstanceTypesAreNotSequentialAscii(
|
| - Register first_object_instance_type,
|
| - Register second_object_instance_type,
|
| - Register scratch1,
|
| - Register scratch2,
|
| - Label* failure);
|
| + void JumpIfBothInstanceTypesAreNotSequentialOneByte(
|
| + Register first_object_instance_type, Register second_object_instance_type,
|
| + Register scratch1, Register scratch2, Label* failure);
|
|
|
| - // Check if instance type is sequential ASCII string and jump to label if
|
| + // Check if instance type is sequential one-byte string and jump to label if
|
| // it is not.
|
| - void JumpIfInstanceTypeIsNotSequentialAscii(Register type,
|
| - Register scratch,
|
| - Label* failure);
|
| + void JumpIfInstanceTypeIsNotSequentialOneByte(Register type, Register scratch,
|
| + Label* failure);
|
|
|
| void JumpIfNotUniqueName(Register reg, Label* not_unique_name);
|
|
|
| @@ -1502,21 +1491,20 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT
|
| Register scratch,
|
| uint32_t encoding_mask);
|
|
|
| - // Test that both first and second are sequential ASCII strings.
|
| - // Assume that they are non-smis.
|
| - void JumpIfNonSmisNotBothSequentialAsciiStrings(Register first,
|
| - Register second,
|
| - Register scratch1,
|
| - Register scratch2,
|
| - Label* failure);
|
| -
|
| - // Test that both first and second are sequential ASCII strings.
|
| - // Check that they are non-smis.
|
| - void JumpIfNotBothSequentialAsciiStrings(Register first,
|
| - Register second,
|
| - Register scratch1,
|
| - Register scratch2,
|
| - Label* failure);
|
| + // Checks if both objects are sequential one-byte strings and jumps to label
|
| + // if either is not. Assumes that neither object is a smi.
|
| + void JumpIfNonSmisNotBothSequentialOneByteStrings(Register first,
|
| + Register second,
|
| + Register scratch1,
|
| + Register scratch2,
|
| + Label* failure);
|
| +
|
| + // Checks if both objects are sequential one-byte strings and jumps to label
|
| + // if either is not.
|
| + void JumpIfNotBothSequentialOneByteStrings(Register first, Register second,
|
| + Register scratch1,
|
| + Register scratch2,
|
| + Label* not_flat_one_byte_strings);
|
|
|
| void ClampUint8(Register output_reg, Register input_reg);
|
|
|
|
|