Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: src/a64/regexp-macro-assembler-a64.cc

Issue 149413010: A64: Synchronize with r16024. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/a64
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/a64/macro-assembler-a64.cc ('k') | src/a64/stub-cache-a64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5f1f7c41a35fffb041faf5a8a7955f893abf1843..0bd4db8e9a0da8be30439db0797d4211ee244e75 100644
--- a/src/a64/regexp-macro-assembler-a64.cc
+++ b/src/a64/regexp-macro-assembler-a64.cc
@@ -383,8 +383,10 @@ void RegExpMacroAssemblerA64::CheckNotBackReferenceIgnoreCase(
if (masm_->emit_debug_code()) {
__ Cmp(current_input_offset().X(), Operand(current_input_offset(), SXTW));
__ Ccmp(current_input_offset(), 0, NoFlag, eq);
- __ Check(le,
- "current_input_offset should be <= 0 and fit in a W register.");
+ // The current input offset should be <= 0, and fit in a W register.
+ // TODO(all): Add this error code to objects.h.
+ // __ Check(le, kCurrentInputOffsetOutOfRange);
+ __ Check(le, kUnknown);
}
} else {
ASSERT(mode_ == UC16);
@@ -484,8 +486,10 @@ void RegExpMacroAssemblerA64::CheckNotBackReference(
if (masm_->emit_debug_code()) {
__ Cmp(current_input_offset().X(), Operand(current_input_offset(), SXTW));
__ Ccmp(current_input_offset(), 0, NoFlag, eq);
- __ Check(le,
- "current_input_offset should be <= 0 and fit in a W register.");
+ // The current input offset should be <= 0, and fit in a W register.
+ // TODO(all): Add this error code to objects.h.
+ // __ Check(le, kCurrentInputOffsetOutOfRange);
+ __ Check(le, kUnknown);
}
__ Bind(&fallthrough);
}
@@ -773,7 +777,9 @@ Handle<HeapObject> RegExpMacroAssemblerA64::GetCode(Handle<String> source) {
// Check that the input string length is < 2^30.
__ Neg(x11, x10);
__ Cmp(x11, (1<<30) - 1);
- __ Check(ls, "The length of the input string cannot be >= 2^30.");
+ // TODO(all): Add this error code to objects.h.
+ // __ Check(ls, kInputStringTooLong);
+ __ Check(ls, kUnknown);
}
__ Mov(current_input_offset(), w10);
@@ -838,7 +844,9 @@ Handle<HeapObject> RegExpMacroAssemblerA64::GetCode(Handle<String> source) {
if (masm_->emit_debug_code()) {
// Check that the input string length is < 2^30.
__ Cmp(x10, (1<<30) - 1);
- __ Check(ls, "The length of the input string cannot be >= 2^30.");
+ // TODO(all): Add this error code to objects.h.
+ // __ Check(ls, kInputStringTooLong);
+ __ Check(ls, kUnknown);
}
// input_start has a start_offset offset on entry. We need to include
// it when computing the length of the whole string.
@@ -1135,7 +1143,10 @@ void RegExpMacroAssemblerA64::PushBacktrack(Label* label) {
__ Sub(x10, x10, code_pointer());
if (masm_->emit_debug_code()) {
__ Cmp(x10, kWRegMask);
- __ Check(ls, "The code offset needs to fit in a W register.");
+ // The code offset has to fit in a W register.
+ // TODO(all): Add this error code to objects.h.
+ // __ Check(ls, kCodeOffsetOutOfRange);
+ __ Check(ls, kUnknown);
}
}
Push(w10);
@@ -1292,7 +1303,10 @@ void RegExpMacroAssemblerA64::WriteStackPointerToRegister(int reg) {
__ Sub(x10, backtrack_stackpointer(), x10);
if (masm_->emit_debug_code()) {
__ Cmp(x10, Operand(w10, SXTW));
- __ Check(eq, "Offset from the stack base needs to fit in a W register.");
+ // The stack offset needs to fit in a W register.
+ // TODO(all): Add this error code to objects.h.
+ // __ Check(eq, kStackOffsetIsTooLarge);
+ __ Check(eq, kUnknown);
}
StoreRegister(reg, w10);
}
@@ -1694,7 +1708,10 @@ void RegExpMacroAssemblerA64::LoadCurrentCharacterUnchecked(int cp_offset,
__ Mov(x10, cp_offset * char_size());
__ Add(x10, x10, Operand(current_input_offset(), SXTW));
__ Cmp(x10, Operand(w10, SXTW));
- __ Check(eq, "The offset needs to fit in a W register.");
+ // The offset needs to fit in a W register.
+ // TODO(all): Add this error code to objects.h.
+ // __ Check(eq, kCurrentInputOffsetOutOfRange);
+ __ Check(eq, kUnknown);
} else {
__ Add(w10, current_input_offset(), cp_offset * char_size());
}
« no previous file with comments | « src/a64/macro-assembler-a64.cc ('k') | src/a64/stub-cache-a64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698