Reviewers: Rodolph Perfetta, jochen,
Message:
PTAL
Description:
A64: fix out-of-range conditional jump in RegExpMacroAssemblerA64.
BUG=314606
TEST=mjsunit/regress/regress-crbug-178790
Please review this at https://codereview.chromium.org/132033006/
SVN Base: https://v8.googlecode.com/svn/branches/experimental/a64
Affected files (+13, -5 lines):
M src/a64/regexp-macro-assembler-a64.cc
Index: src/a64/regexp-macro-assembler-a64.cc
diff --git a/src/a64/regexp-macro-assembler-a64.cc
b/src/a64/regexp-macro-assembler-a64.cc
index
8bd9c60b0e9421bbffc7b6e4f6ba2ce82b01931c..49feba6f76a0c4db6a0ceec279d5890c87972c0c
100644
--- a/src/a64/regexp-macro-assembler-a64.cc
+++ b/src/a64/regexp-macro-assembler-a64.cc
@@ -1455,10 +1455,14 @@ void
RegExpMacroAssemblerA64::BranchOrBacktrack(Condition condition,
return;
}
if (to == NULL) {
- __ B(condition, &backtrack_label_);
- return;
+ to = &backtrack_label_;
}
- __ B(condition, to);
+ // TODO(ulan): do direct jump when jump distance is known and fits in
imm19.
+ Condition inverted_condition = InvertCondition(condition);
+ Label no_branch;
+ __ B(inverted_condition, &no_branch);
+ __ B(to);
+ __ Bind(&no_branch);
}
void RegExpMacroAssemblerA64::CompareAndBranchOrBacktrack(Register reg,
@@ -1469,11 +1473,15 @@ void
RegExpMacroAssemblerA64::CompareAndBranchOrBacktrack(Register reg,
if (to == NULL) {
to = &backtrack_label_;
}
+ // TODO(ulan): do direct jump when jump distance is known and fits in
imm19.
+ Label no_branch;
if (condition == eq) {
- __ Cbz(reg, to);
+ __ Cbnz(reg, &no_branch);
} else {
- __ Cbnz(reg, to);
+ __ Cbz(reg, &no_branch);
}
+ __ B(to);
+ __ Bind(&no_branch);
} else {
__ Cmp(reg, immediate);
BranchOrBacktrack(condition, to);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
