X87: Experimental support for RegExp lookbehind.
port 906903acb5
(r32043)
original commit message:
BUG=
Review URL: https://codereview.chromium.org/1453303003
Cr-Commit-Position: refs/heads/master@{#32069}
This commit is contained in:
parent
1d568d77ec
commit
9f594402c3
@ -53,7 +53,8 @@ namespace internal {
|
|||||||
* - backup of caller ebx
|
* - backup of caller ebx
|
||||||
* - success counter (only for global regexps to count matches).
|
* - success counter (only for global regexps to count matches).
|
||||||
* - Offset of location before start of input (effectively character
|
* - Offset of location before start of input (effectively character
|
||||||
* position -1). Used to initialize capture registers to a non-position.
|
* string start - 1). Used to initialize capture registers to a
|
||||||
|
* non-position.
|
||||||
* - register 0 ebp[-4] (only positions must be stored in the first
|
* - register 0 ebp[-4] (only positions must be stored in the first
|
||||||
* - register 1 ebp[-8] num_saved_registers_ registers)
|
* - register 1 ebp[-8] num_saved_registers_ registers)
|
||||||
* - ...
|
* - ...
|
||||||
@ -156,25 +157,16 @@ void RegExpMacroAssemblerX87::CheckCharacterGT(uc16 limit, Label* on_greater) {
|
|||||||
|
|
||||||
|
|
||||||
void RegExpMacroAssemblerX87::CheckAtStart(Label* on_at_start) {
|
void RegExpMacroAssemblerX87::CheckAtStart(Label* on_at_start) {
|
||||||
Label not_at_start;
|
__ lea(eax, Operand(edi, -char_size()));
|
||||||
// Did we start the match at the start of the string at all?
|
__ cmp(eax, Operand(ebp, kStringStartMinusOne));
|
||||||
__ cmp(Operand(ebp, kStartIndex), Immediate(0));
|
|
||||||
BranchOrBacktrack(not_equal, ¬_at_start);
|
|
||||||
// If we did, are we still at the start of the input?
|
|
||||||
__ lea(eax, Operand(esi, edi, times_1, 0));
|
|
||||||
__ cmp(eax, Operand(ebp, kInputStart));
|
|
||||||
BranchOrBacktrack(equal, on_at_start);
|
BranchOrBacktrack(equal, on_at_start);
|
||||||
__ bind(¬_at_start);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void RegExpMacroAssemblerX87::CheckNotAtStart(Label* on_not_at_start) {
|
void RegExpMacroAssemblerX87::CheckNotAtStart(int cp_offset,
|
||||||
// Did we start the match at the start of the string at all?
|
Label* on_not_at_start) {
|
||||||
__ cmp(Operand(ebp, kStartIndex), Immediate(0));
|
__ lea(eax, Operand(edi, -char_size() + cp_offset * char_size()));
|
||||||
BranchOrBacktrack(not_equal, on_not_at_start);
|
__ cmp(eax, Operand(ebp, kStringStartMinusOne));
|
||||||
// If we did, are we still at the start of the input?
|
|
||||||
__ lea(eax, Operand(esi, edi, times_1, 0));
|
|
||||||
__ cmp(eax, Operand(ebp, kInputStart));
|
|
||||||
BranchOrBacktrack(not_equal, on_not_at_start);
|
BranchOrBacktrack(not_equal, on_not_at_start);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -196,26 +188,28 @@ void RegExpMacroAssemblerX87::CheckGreedyLoop(Label* on_equal) {
|
|||||||
|
|
||||||
|
|
||||||
void RegExpMacroAssemblerX87::CheckNotBackReferenceIgnoreCase(
|
void RegExpMacroAssemblerX87::CheckNotBackReferenceIgnoreCase(
|
||||||
int start_reg,
|
int start_reg, bool read_backward, Label* on_no_match) {
|
||||||
Label* on_no_match) {
|
|
||||||
Label fallthrough;
|
Label fallthrough;
|
||||||
__ mov(edx, register_location(start_reg)); // Index of start of capture
|
__ mov(edx, register_location(start_reg)); // Index of start of capture
|
||||||
__ mov(ebx, register_location(start_reg + 1)); // Index of end of capture
|
__ mov(ebx, register_location(start_reg + 1)); // Index of end of capture
|
||||||
__ sub(ebx, edx); // Length of capture.
|
__ sub(ebx, edx); // Length of capture.
|
||||||
|
|
||||||
// The length of a capture should not be negative. This can only happen
|
// At this point, the capture registers are either both set or both cleared.
|
||||||
// if the end of the capture is unrecorded, or at a point earlier than
|
// If the capture length is zero, then the capture is either empty or cleared.
|
||||||
// the start of the capture.
|
// Fall through in both cases.
|
||||||
BranchOrBacktrack(less, on_no_match);
|
|
||||||
|
|
||||||
// If length is zero, either the capture is empty or it is completely
|
|
||||||
// uncaptured. In either case succeed immediately.
|
|
||||||
__ j(equal, &fallthrough);
|
__ j(equal, &fallthrough);
|
||||||
|
|
||||||
// Check that there are sufficient characters left in the input.
|
// Check that there are sufficient characters left in the input.
|
||||||
|
if (read_backward) {
|
||||||
|
__ mov(eax, Operand(ebp, kStringStartMinusOne));
|
||||||
|
__ add(eax, ebx);
|
||||||
|
__ cmp(edi, eax);
|
||||||
|
BranchOrBacktrack(less_equal, on_no_match);
|
||||||
|
} else {
|
||||||
__ mov(eax, edi);
|
__ mov(eax, edi);
|
||||||
__ add(eax, ebx);
|
__ add(eax, ebx);
|
||||||
BranchOrBacktrack(greater, on_no_match);
|
BranchOrBacktrack(greater, on_no_match);
|
||||||
|
}
|
||||||
|
|
||||||
if (mode_ == LATIN1) {
|
if (mode_ == LATIN1) {
|
||||||
Label success;
|
Label success;
|
||||||
@ -228,6 +222,9 @@ void RegExpMacroAssemblerX87::CheckNotBackReferenceIgnoreCase(
|
|||||||
|
|
||||||
__ add(edx, esi); // Start of capture
|
__ add(edx, esi); // Start of capture
|
||||||
__ add(edi, esi); // Start of text to match against capture.
|
__ add(edi, esi); // Start of text to match against capture.
|
||||||
|
if (read_backward) {
|
||||||
|
__ sub(edi, ebx); // Offset by length when matching backwards.
|
||||||
|
}
|
||||||
__ add(ebx, edi); // End of text to match against capture.
|
__ add(ebx, edi); // End of text to match against capture.
|
||||||
|
|
||||||
Label loop;
|
Label loop;
|
||||||
@ -278,6 +275,11 @@ void RegExpMacroAssemblerX87::CheckNotBackReferenceIgnoreCase(
|
|||||||
__ add(esp, Immediate(kPointerSize));
|
__ add(esp, Immediate(kPointerSize));
|
||||||
// Compute new value of character position after the matched part.
|
// Compute new value of character position after the matched part.
|
||||||
__ sub(edi, esi);
|
__ sub(edi, esi);
|
||||||
|
if (read_backward) {
|
||||||
|
// Subtract match length if we matched backward.
|
||||||
|
__ add(edi, register_location(start_reg));
|
||||||
|
__ sub(edi, register_location(start_reg + 1));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
DCHECK(mode_ == UC16);
|
DCHECK(mode_ == UC16);
|
||||||
// Save registers before calling C function.
|
// Save registers before calling C function.
|
||||||
@ -304,6 +306,9 @@ void RegExpMacroAssemblerX87::CheckNotBackReferenceIgnoreCase(
|
|||||||
// Found by adding negative string-end offset of current position (edi)
|
// Found by adding negative string-end offset of current position (edi)
|
||||||
// to end of string.
|
// to end of string.
|
||||||
__ add(edi, esi);
|
__ add(edi, esi);
|
||||||
|
if (read_backward) {
|
||||||
|
__ sub(edi, ebx); // Offset by length when matching backwards.
|
||||||
|
}
|
||||||
__ mov(Operand(esp, 1 * kPointerSize), edi);
|
__ mov(Operand(esp, 1 * kPointerSize), edi);
|
||||||
// Set byte_offset1.
|
// Set byte_offset1.
|
||||||
// Start of capture, where edx already holds string-end negative offset.
|
// Start of capture, where edx already holds string-end negative offset.
|
||||||
@ -325,15 +330,19 @@ void RegExpMacroAssemblerX87::CheckNotBackReferenceIgnoreCase(
|
|||||||
// Check if function returned non-zero for success or zero for failure.
|
// Check if function returned non-zero for success or zero for failure.
|
||||||
__ or_(eax, eax);
|
__ or_(eax, eax);
|
||||||
BranchOrBacktrack(zero, on_no_match);
|
BranchOrBacktrack(zero, on_no_match);
|
||||||
// On success, increment position by length of capture.
|
// On success, advance position by length of capture.
|
||||||
|
if (read_backward) {
|
||||||
|
__ sub(edi, ebx);
|
||||||
|
} else {
|
||||||
__ add(edi, ebx);
|
__ add(edi, ebx);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
__ bind(&fallthrough);
|
__ bind(&fallthrough);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void RegExpMacroAssemblerX87::CheckNotBackReference(
|
void RegExpMacroAssemblerX87::CheckNotBackReference(int start_reg,
|
||||||
int start_reg,
|
bool read_backward,
|
||||||
Label* on_no_match) {
|
Label* on_no_match) {
|
||||||
Label fallthrough;
|
Label fallthrough;
|
||||||
Label success;
|
Label success;
|
||||||
@ -343,22 +352,33 @@ void RegExpMacroAssemblerX87::CheckNotBackReference(
|
|||||||
__ mov(edx, register_location(start_reg));
|
__ mov(edx, register_location(start_reg));
|
||||||
__ mov(eax, register_location(start_reg + 1));
|
__ mov(eax, register_location(start_reg + 1));
|
||||||
__ sub(eax, edx); // Length to check.
|
__ sub(eax, edx); // Length to check.
|
||||||
// Fail on partial or illegal capture (start of capture after end of capture).
|
|
||||||
BranchOrBacktrack(less, on_no_match);
|
// At this point, the capture registers are either both set or both cleared.
|
||||||
// Succeed on empty capture (including no capture)
|
// If the capture length is zero, then the capture is either empty or cleared.
|
||||||
|
// Fall through in both cases.
|
||||||
__ j(equal, &fallthrough);
|
__ j(equal, &fallthrough);
|
||||||
|
|
||||||
// Check that there are sufficient characters left in the input.
|
// Check that there are sufficient characters left in the input.
|
||||||
|
if (read_backward) {
|
||||||
|
__ mov(ebx, Operand(ebp, kStringStartMinusOne));
|
||||||
|
__ add(ebx, eax);
|
||||||
|
__ cmp(edi, ebx);
|
||||||
|
BranchOrBacktrack(less_equal, on_no_match);
|
||||||
|
} else {
|
||||||
__ mov(ebx, edi);
|
__ mov(ebx, edi);
|
||||||
__ add(ebx, eax);
|
__ add(ebx, eax);
|
||||||
BranchOrBacktrack(greater, on_no_match);
|
BranchOrBacktrack(greater, on_no_match);
|
||||||
|
}
|
||||||
|
|
||||||
// Save register to make it available below.
|
// Save register to make it available below.
|
||||||
__ push(backtrack_stackpointer());
|
__ push(backtrack_stackpointer());
|
||||||
|
|
||||||
// Compute pointers to match string and capture string
|
// Compute pointers to match string and capture string
|
||||||
__ lea(ebx, Operand(esi, edi, times_1, 0)); // Start of match.
|
|
||||||
__ add(edx, esi); // Start of capture.
|
__ add(edx, esi); // Start of capture.
|
||||||
|
__ lea(ebx, Operand(esi, edi, times_1, 0)); // Start of match.
|
||||||
|
if (read_backward) {
|
||||||
|
__ sub(ebx, eax); // Offset by length when matching backwards.
|
||||||
|
}
|
||||||
__ lea(ecx, Operand(eax, ebx, times_1, 0)); // End of match
|
__ lea(ecx, Operand(eax, ebx, times_1, 0)); // End of match
|
||||||
|
|
||||||
Label loop;
|
Label loop;
|
||||||
@ -389,6 +409,11 @@ void RegExpMacroAssemblerX87::CheckNotBackReference(
|
|||||||
// Move current character position to position after match.
|
// Move current character position to position after match.
|
||||||
__ mov(edi, ecx);
|
__ mov(edi, ecx);
|
||||||
__ sub(edi, esi);
|
__ sub(edi, esi);
|
||||||
|
if (read_backward) {
|
||||||
|
// Subtract match length if we matched backward.
|
||||||
|
__ add(edi, register_location(start_reg));
|
||||||
|
__ sub(edi, register_location(start_reg + 1));
|
||||||
|
}
|
||||||
// Restore backtrack stackpointer.
|
// Restore backtrack stackpointer.
|
||||||
__ pop(backtrack_stackpointer());
|
__ pop(backtrack_stackpointer());
|
||||||
|
|
||||||
@ -634,7 +659,7 @@ Handle<HeapObject> RegExpMacroAssemblerX87::GetCode(Handle<String> source) {
|
|||||||
__ push(edi);
|
__ push(edi);
|
||||||
__ push(ebx); // Callee-save on MacOS.
|
__ push(ebx); // Callee-save on MacOS.
|
||||||
__ push(Immediate(0)); // Number of successful matches in a global regexp.
|
__ push(Immediate(0)); // Number of successful matches in a global regexp.
|
||||||
__ push(Immediate(0)); // Make room for "input start - 1" constant.
|
__ push(Immediate(0)); // Make room for "string start - 1" constant.
|
||||||
|
|
||||||
// Check if we have space on the stack for registers.
|
// Check if we have space on the stack for registers.
|
||||||
Label stack_limit_hit;
|
Label stack_limit_hit;
|
||||||
@ -684,7 +709,7 @@ Handle<HeapObject> RegExpMacroAssemblerX87::GetCode(Handle<String> source) {
|
|||||||
}
|
}
|
||||||
// Store this value in a local variable, for use when clearing
|
// Store this value in a local variable, for use when clearing
|
||||||
// position registers.
|
// position registers.
|
||||||
__ mov(Operand(ebp, kInputStartMinusOne), eax);
|
__ mov(Operand(ebp, kStringStartMinusOne), eax);
|
||||||
|
|
||||||
#if V8_OS_WIN
|
#if V8_OS_WIN
|
||||||
// Ensure that we write to each stack page, in order. Skipping a page
|
// Ensure that we write to each stack page, in order. Skipping a page
|
||||||
@ -784,7 +809,7 @@ Handle<HeapObject> RegExpMacroAssemblerX87::GetCode(Handle<String> source) {
|
|||||||
Immediate(num_saved_registers_ * kPointerSize));
|
Immediate(num_saved_registers_ * kPointerSize));
|
||||||
|
|
||||||
// Prepare eax to initialize registers with its value in the next run.
|
// Prepare eax to initialize registers with its value in the next run.
|
||||||
__ mov(eax, Operand(ebp, kInputStartMinusOne));
|
__ mov(eax, Operand(ebp, kStringStartMinusOne));
|
||||||
|
|
||||||
if (global_with_zero_length_check()) {
|
if (global_with_zero_length_check()) {
|
||||||
// Special case for zero-length matches.
|
// Special case for zero-length matches.
|
||||||
@ -944,10 +969,13 @@ void RegExpMacroAssemblerX87::LoadCurrentCharacter(int cp_offset,
|
|||||||
Label* on_end_of_input,
|
Label* on_end_of_input,
|
||||||
bool check_bounds,
|
bool check_bounds,
|
||||||
int characters) {
|
int characters) {
|
||||||
DCHECK(cp_offset >= -1); // ^ and \b can look behind one character.
|
|
||||||
DCHECK(cp_offset < (1<<30)); // Be sane! (And ensure negation works)
|
DCHECK(cp_offset < (1<<30)); // Be sane! (And ensure negation works)
|
||||||
if (check_bounds) {
|
if (check_bounds) {
|
||||||
|
if (cp_offset >= 0) {
|
||||||
CheckPosition(cp_offset + characters - 1, on_end_of_input);
|
CheckPosition(cp_offset + characters - 1, on_end_of_input);
|
||||||
|
} else {
|
||||||
|
CheckPosition(cp_offset, on_end_of_input);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
LoadCurrentCharacterUnchecked(cp_offset, characters);
|
LoadCurrentCharacterUnchecked(cp_offset, characters);
|
||||||
}
|
}
|
||||||
@ -1031,7 +1059,7 @@ void RegExpMacroAssemblerX87::WriteCurrentPositionToRegister(int reg,
|
|||||||
|
|
||||||
void RegExpMacroAssemblerX87::ClearRegisters(int reg_from, int reg_to) {
|
void RegExpMacroAssemblerX87::ClearRegisters(int reg_from, int reg_to) {
|
||||||
DCHECK(reg_from <= reg_to);
|
DCHECK(reg_from <= reg_to);
|
||||||
__ mov(eax, Operand(ebp, kInputStartMinusOne));
|
__ mov(eax, Operand(ebp, kStringStartMinusOne));
|
||||||
for (int reg = reg_from; reg <= reg_to; reg++) {
|
for (int reg = reg_from; reg <= reg_to; reg++) {
|
||||||
__ mov(register_location(reg), eax);
|
__ mov(register_location(reg), eax);
|
||||||
}
|
}
|
||||||
@ -1100,8 +1128,14 @@ Operand RegExpMacroAssemblerX87::register_location(int register_index) {
|
|||||||
|
|
||||||
void RegExpMacroAssemblerX87::CheckPosition(int cp_offset,
|
void RegExpMacroAssemblerX87::CheckPosition(int cp_offset,
|
||||||
Label* on_outside_input) {
|
Label* on_outside_input) {
|
||||||
|
if (cp_offset >= 0) {
|
||||||
__ cmp(edi, -cp_offset * char_size());
|
__ cmp(edi, -cp_offset * char_size());
|
||||||
BranchOrBacktrack(greater_equal, on_outside_input);
|
BranchOrBacktrack(greater_equal, on_outside_input);
|
||||||
|
} else {
|
||||||
|
__ lea(eax, Operand(edi, cp_offset * char_size()));
|
||||||
|
__ cmp(eax, Operand(ebp, kStringStartMinusOne));
|
||||||
|
BranchOrBacktrack(less_equal, on_outside_input);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -33,9 +33,11 @@ class RegExpMacroAssemblerX87: public NativeRegExpMacroAssembler {
|
|||||||
// A "greedy loop" is a loop that is both greedy and with a simple
|
// A "greedy loop" is a loop that is both greedy and with a simple
|
||||||
// body. It has a particularly simple implementation.
|
// body. It has a particularly simple implementation.
|
||||||
virtual void CheckGreedyLoop(Label* on_tos_equals_current_position);
|
virtual void CheckGreedyLoop(Label* on_tos_equals_current_position);
|
||||||
virtual void CheckNotAtStart(Label* on_not_at_start);
|
virtual void CheckNotAtStart(int cp_offset, Label* on_not_at_start);
|
||||||
virtual void CheckNotBackReference(int start_reg, Label* on_no_match);
|
virtual void CheckNotBackReference(int start_reg, bool read_backward,
|
||||||
|
Label* on_no_match);
|
||||||
virtual void CheckNotBackReferenceIgnoreCase(int start_reg,
|
virtual void CheckNotBackReferenceIgnoreCase(int start_reg,
|
||||||
|
bool read_backward,
|
||||||
Label* on_no_match);
|
Label* on_no_match);
|
||||||
virtual void CheckNotCharacter(uint32_t c, Label* on_not_equal);
|
virtual void CheckNotCharacter(uint32_t c, Label* on_not_equal);
|
||||||
virtual void CheckNotCharacterAfterAnd(uint32_t c,
|
virtual void CheckNotCharacterAfterAnd(uint32_t c,
|
||||||
@ -116,9 +118,9 @@ class RegExpMacroAssemblerX87: public NativeRegExpMacroAssembler {
|
|||||||
static const int kBackup_edi = kBackup_esi - kPointerSize;
|
static const int kBackup_edi = kBackup_esi - kPointerSize;
|
||||||
static const int kBackup_ebx = kBackup_edi - kPointerSize;
|
static const int kBackup_ebx = kBackup_edi - kPointerSize;
|
||||||
static const int kSuccessfulCaptures = kBackup_ebx - kPointerSize;
|
static const int kSuccessfulCaptures = kBackup_ebx - kPointerSize;
|
||||||
static const int kInputStartMinusOne = kSuccessfulCaptures - kPointerSize;
|
static const int kStringStartMinusOne = kSuccessfulCaptures - kPointerSize;
|
||||||
// First register address. Following registers are below it on the stack.
|
// First register address. Following registers are below it on the stack.
|
||||||
static const int kRegisterZero = kInputStartMinusOne - kPointerSize;
|
static const int kRegisterZero = kStringStartMinusOne - kPointerSize;
|
||||||
|
|
||||||
// Initial size of code buffer.
|
// Initial size of code buffer.
|
||||||
static const size_t kRegExpCodeSize = 1024;
|
static const size_t kRegExpCodeSize = 1024;
|
||||||
|
Loading…
Reference in New Issue
Block a user