diff options
author | Michaël Zasso <targos@protonmail.com> | 2017-12-05 16:41:55 +0100 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2017-12-06 12:52:07 +0100 |
commit | 1854ba04e9a68f062beb299dd6e1479279b26363 (patch) | |
tree | d5b2df9b8c1deb6388f7a728fca8e1c98c779abe /deps/v8/src/regexp/x64 | |
parent | b52c23b75f96e1c9d2c7b3a7e5619170d0a0d8e1 (diff) | |
download | node-new-1854ba04e9a68f062beb299dd6e1479279b26363.tar.gz |
deps: update V8 to 6.3.292.46
PR-URL: https://github.com/nodejs/node/pull/16271
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/v8/src/regexp/x64')
-rw-r--r-- | deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc b/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc index 9b0352d863..5c03f65e3d 100644 --- a/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc +++ b/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc @@ -139,8 +139,8 @@ void RegExpMacroAssemblerX64::AdvanceCurrentPosition(int by) { void RegExpMacroAssemblerX64::AdvanceRegister(int reg, int by) { - DCHECK(reg >= 0); - DCHECK(reg < num_registers_); + DCHECK_LE(0, reg); + DCHECK_GT(num_registers_, reg); if (by != 0) { __ addp(register_location(reg), Immediate(by)); } @@ -312,8 +312,8 @@ void RegExpMacroAssemblerX64::CheckNotBackReferenceIgnoreCase( // size_t byte_length - length of capture in bytes(!) // Isolate* isolate or 0 if unicode flag. #ifdef _WIN64 - DCHECK(rcx.is(arg_reg_1)); - DCHECK(rdx.is(arg_reg_2)); + DCHECK(rcx == arg_reg_1); + DCHECK(rdx == arg_reg_2); // Compute and set byte_offset1 (start of capture). __ leap(rcx, Operand(rsi, rdx, times_1, 0)); // Set byte_offset2. @@ -322,8 +322,8 @@ void RegExpMacroAssemblerX64::CheckNotBackReferenceIgnoreCase( __ subq(rdx, rbx); } #else // AMD64 calling convention - DCHECK(rdi.is(arg_reg_1)); - DCHECK(rsi.is(arg_reg_2)); + DCHECK(rdi == arg_reg_1); + DCHECK(rsi == arg_reg_2); // Compute byte_offset2 (current position = rsi+rdi). __ leap(rax, Operand(rsi, rdi, times_1, 0)); // Compute and set byte_offset1 (start of capture). @@ -493,7 +493,7 @@ void RegExpMacroAssemblerX64::CheckNotCharacterAfterMinusAnd( uc16 minus, uc16 mask, Label* on_not_equal) { - DCHECK(minus < String::kMaxUtf16CodeUnit); + DCHECK_GT(String::kMaxUtf16CodeUnit, minus); __ leap(rax, Operand(current_character(), -minus)); __ andp(rax, Immediate(mask)); __ cmpl(rax, Immediate(c)); @@ -1007,9 +1007,8 @@ Handle<HeapObject> RegExpMacroAssemblerX64::GetCode(Handle<String> source) { CodeDesc code_desc; Isolate* isolate = this->isolate(); masm_.GetCode(isolate, &code_desc); - Handle<Code> code = isolate->factory()->NewCode( - code_desc, Code::ComputeFlags(Code::REGEXP), - masm_.CodeObject()); + Handle<Code> code = + isolate->factory()->NewCode(code_desc, Code::REGEXP, masm_.CodeObject()); PROFILE(isolate, RegExpCodeCreateEvent(AbstractCode::cast(*code), *source)); return Handle<HeapObject>::cast(code); } @@ -1290,7 +1289,7 @@ void RegExpMacroAssemblerX64::SafeReturn() { void RegExpMacroAssemblerX64::Push(Register source) { - DCHECK(!source.is(backtrack_stackpointer())); + DCHECK(source != backtrack_stackpointer()); // Notice: This updates flags, unlike normal Push. __ subp(backtrack_stackpointer(), Immediate(kIntSize)); __ movl(Operand(backtrack_stackpointer(), 0), source); @@ -1330,7 +1329,7 @@ void RegExpMacroAssemblerX64::Push(Label* backtrack_target) { void RegExpMacroAssemblerX64::Pop(Register target) { - DCHECK(!target.is(backtrack_stackpointer())); + DCHECK(target != backtrack_stackpointer()); __ movsxlq(target, Operand(backtrack_stackpointer(), 0)); // Notice: This updates flags, unlike normal Pop. __ addp(backtrack_stackpointer(), Immediate(kIntSize)); @@ -1379,7 +1378,7 @@ void RegExpMacroAssemblerX64::LoadCurrentCharacterUnchecked(int cp_offset, } else if (characters == 2) { __ movzxwl(current_character(), Operand(rsi, rdi, times_1, cp_offset)); } else { - DCHECK(characters == 1); + DCHECK_EQ(1, characters); __ movzxbl(current_character(), Operand(rsi, rdi, times_1, cp_offset)); } } else { @@ -1388,7 +1387,7 @@ void RegExpMacroAssemblerX64::LoadCurrentCharacterUnchecked(int cp_offset, __ movl(current_character(), Operand(rsi, rdi, times_1, cp_offset * sizeof(uc16))); } else { - DCHECK(characters == 1); + DCHECK_EQ(1, characters); __ movzxwl(current_character(), Operand(rsi, rdi, times_1, cp_offset * sizeof(uc16))); } |