| Index: src/x64/codegen-x64.cc
|
| ===================================================================
|
| --- src/x64/codegen-x64.cc (revision 4395)
|
| +++ src/x64/codegen-x64.cc (working copy)
|
| @@ -7131,7 +7131,7 @@
|
| // rcx: RegExp data (FixedArray)
|
| // rdx: Number of capture registers
|
| // Check that the third argument is a positive smi less than the string
|
| - // length. A negative value will be greater (usigned comparison).
|
| + // length. A negative value will be greater (unsigned comparison).
|
| __ movq(rax, Operand(rsp, kPreviousIndexOffset));
|
| __ SmiToInteger32(rax, rax);
|
| __ cmpl(rax, rbx);
|
| @@ -7177,9 +7177,8 @@
|
| // string. In that case the subject string is just the first part of the cons
|
| // string. Also in this case the first part of the cons string is known to be
|
| // a sequential string or an external string.
|
| - __ movl(rdx, rbx);
|
| - __ andb(rdx, Immediate(kStringRepresentationMask));
|
| - __ cmpb(rdx, Immediate(kConsStringTag));
|
| + __ andb(rbx, Immediate(kStringRepresentationMask));
|
| + __ cmpb(rbx, Immediate(kConsStringTag));
|
| __ j(not_equal, &runtime);
|
| __ movq(rdx, FieldOperand(rax, ConsString::kSecondOffset));
|
| __ Cmp(rdx, Factory::empty_string());
|
| @@ -7198,7 +7197,8 @@
|
| // rcx: RegExp data (FixedArray)
|
| // Check that the irregexp code has been generated for an ascii string. If
|
| // it has, the field contains a code object otherwise it contains the hole.
|
| - __ cmpb(rbx, Immediate(kStringTag | kSeqStringTag | kTwoByteStringTag));
|
| + const int kSeqTwoByteString = kStringTag | kSeqStringTag | kTwoByteStringTag;
|
| + __ cmpb(rbx, Immediate(kSeqTwoByteString));
|
| __ j(equal, &seq_two_byte_string);
|
| if (FLAG_debug_code) {
|
| __ cmpb(rbx, Immediate(kStringTag | kSeqStringTag | kAsciiStringTag));
|
| @@ -7324,7 +7324,7 @@
|
| // Result must now be exception. If there is no pending exception already a
|
| // stack overflow (on the backtrack stack) was detected in RegExp code but
|
| // haven't created the exception yet. Handle that in the runtime system.
|
| - // TODO(592) Rerunning the RegExp to get the stack overflow exception.
|
| + // TODO(592): Rerunning the RegExp to get the stack overflow exception.
|
| ExternalReference pending_exception_address(Top::k_pending_exception_address);
|
| __ movq(kScratchRegister, pending_exception_address);
|
| __ Cmp(kScratchRegister, Factory::the_hole_value());
|
| @@ -7371,7 +7371,6 @@
|
| // rcx: offsets vector
|
| // rdx: number of capture registers
|
| Label next_capture, done;
|
| - __ movq(rax, Operand(rsp, kPreviousIndexOffset));
|
| // Capture register counter starts from number of capture registers and
|
| // counts down until wraping after zero.
|
| __ bind(&next_capture);
|
|
|