| Index: src/mips64/regexp-macro-assembler-mips64.cc
|
| diff --git a/src/mips64/regexp-macro-assembler-mips64.cc b/src/mips64/regexp-macro-assembler-mips64.cc
|
| index 578a3adb7c58edf3d516023cfad7167bcb4f1437..b20cab98258deeb96cf2bc0fd06ac009f3e7f62c 100644
|
| --- a/src/mips64/regexp-macro-assembler-mips64.cc
|
| +++ b/src/mips64/regexp-macro-assembler-mips64.cc
|
| @@ -277,7 +277,7 @@ void RegExpMacroAssemblerMIPS::CheckNotBackReferenceIgnoreCase(
|
| // Check that there are enough characters left in the input.
|
| BranchOrBacktrack(on_no_match, gt, t1, Operand(zero_reg));
|
|
|
| - if (mode_ == ASCII) {
|
| + if (mode_ == LATIN1) {
|
| Label success;
|
| Label fail;
|
| Label loop_check;
|
| @@ -401,7 +401,7 @@ void RegExpMacroAssemblerMIPS::CheckNotBackReference(
|
|
|
| Label loop;
|
| __ bind(&loop);
|
| - if (mode_ == ASCII) {
|
| + if (mode_ == LATIN1) {
|
| __ lbu(a3, MemOperand(a0, 0));
|
| __ daddiu(a0, a0, char_size());
|
| __ lbu(a4, MemOperand(a2, 0));
|
| @@ -482,7 +482,7 @@ void RegExpMacroAssemblerMIPS::CheckBitInTable(
|
| Handle<ByteArray> table,
|
| Label* on_bit_set) {
|
| __ li(a0, Operand(table));
|
| - if (mode_ != ASCII || kTableMask != String::kMaxOneByteCharCode) {
|
| + if (mode_ != LATIN1 || kTableMask != String::kMaxOneByteCharCode) {
|
| __ And(a1, current_character(), Operand(kTableSize - 1));
|
| __ Daddu(a0, a0, a1);
|
| } else {
|
| @@ -501,7 +501,7 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(uc16 type,
|
| switch (type) {
|
| case 's':
|
| // Match space-characters.
|
| - if (mode_ == ASCII) {
|
| + if (mode_ == LATIN1) {
|
| // One byte space characters are '\t'..'\r', ' ' and \u00a0.
|
| Label success;
|
| __ Branch(&success, eq, current_character(), Operand(' '));
|
| @@ -518,12 +518,12 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(uc16 type,
|
| // The emitted code for generic character classes is good enough.
|
| return false;
|
| case 'd':
|
| - // Match ASCII digits ('0'..'9').
|
| + // Match Latin1 digits ('0'..'9').
|
| __ Dsubu(a0, current_character(), Operand('0'));
|
| BranchOrBacktrack(on_no_match, hi, a0, Operand('9' - '0'));
|
| return true;
|
| case 'D':
|
| - // Match non ASCII-digits.
|
| + // Match non Latin1-digits.
|
| __ Dsubu(a0, current_character(), Operand('0'));
|
| BranchOrBacktrack(on_no_match, ls, a0, Operand('9' - '0'));
|
| return true;
|
| @@ -547,7 +547,7 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(uc16 type,
|
| __ Xor(a0, current_character(), Operand(0x01));
|
| // See if current character is '\n'^1 or '\r'^1, i.e., 0x0b or 0x0c.
|
| __ Dsubu(a0, a0, Operand(0x0b));
|
| - if (mode_ == ASCII) {
|
| + if (mode_ == LATIN1) {
|
| BranchOrBacktrack(on_no_match, hi, a0, Operand(0x0c - 0x0b));
|
| } else {
|
| Label done;
|
| @@ -562,8 +562,8 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(uc16 type,
|
| return true;
|
| }
|
| case 'w': {
|
| - if (mode_ != ASCII) {
|
| - // Table is 128 entries, so all ASCII characters can be tested.
|
| + if (mode_ != LATIN1) {
|
| + // Table is 256 entries, so all Latin1 characters can be tested.
|
| BranchOrBacktrack(on_no_match, hi, current_character(), Operand('z'));
|
| }
|
| ExternalReference map = ExternalReference::re_word_character_map();
|
| @@ -575,8 +575,8 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(uc16 type,
|
| }
|
| case 'W': {
|
| Label done;
|
| - if (mode_ != ASCII) {
|
| - // Table is 128 entries, so all ASCII characters can be tested.
|
| + if (mode_ != LATIN1) {
|
| + // Table is 256 entries, so all Latin1 characters can be tested.
|
| __ Branch(&done, hi, current_character(), Operand('z'));
|
| }
|
| ExternalReference map = ExternalReference::re_word_character_map();
|
| @@ -584,7 +584,7 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(uc16 type,
|
| __ Daddu(a0, a0, current_character());
|
| __ lbu(a0, MemOperand(a0, 0));
|
| BranchOrBacktrack(on_no_match, ne, a0, Operand(zero_reg));
|
| - if (mode_ != ASCII) {
|
| + if (mode_ != LATIN1) {
|
| __ bind(&done);
|
| }
|
| return true;
|
| @@ -1172,7 +1172,7 @@ int RegExpMacroAssemblerMIPS::CheckStackGuardState(Address* return_address,
|
|
|
| Handle<String> subject(frame_entry<String*>(re_frame, kInputString));
|
| // Current string.
|
| - bool is_ascii = subject->IsOneByteRepresentationUnderneath();
|
| + bool is_one_byte = subject->IsOneByteRepresentationUnderneath();
|
|
|
| DCHECK(re_code->instruction_start() <= *return_address);
|
| DCHECK(*return_address <=
|
| @@ -1203,8 +1203,8 @@ int RegExpMacroAssemblerMIPS::CheckStackGuardState(Address* return_address,
|
| }
|
|
|
| // String might have changed.
|
| - if (subject_tmp->IsOneByteRepresentation() != is_ascii) {
|
| - // If we changed between an ASCII and an UC16 string, the specialized
|
| + if (subject_tmp->IsOneByteRepresentation() != is_one_byte) {
|
| + // If we changed between an Latin1 and an UC16 string, the specialized
|
| // code cannot be used, and we need to restart regexp matching from
|
| // scratch (including, potentially, compiling a new version of the code).
|
| return RETRY;
|
| @@ -1354,7 +1354,7 @@ void RegExpMacroAssemblerMIPS::LoadCurrentCharacterUnchecked(int cp_offset,
|
| // must only be used to load a single character at a time.
|
| DCHECK(characters == 1);
|
| __ Daddu(t1, end_of_input_address(), Operand(offset));
|
| - if (mode_ == ASCII) {
|
| + if (mode_ == LATIN1) {
|
| __ lbu(current_character(), MemOperand(t1, 0));
|
| } else {
|
| DCHECK(mode_ == UC16);
|
|
|