Skip to content

V
V8
Commit 6b00c94c authored by Liu Yu's avatar Liu Yu Committed by V8 LUCI CQ
Browse files
Options

[loong64][mips][regexp] Various refactors 

Port commit 12ecb4f5

Change-Id: I7dab9491ad1216515f0a45f026419a55c7cda86a
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3218719Reviewed-by: 's avatarZhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Commit-Queue: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Auto-Submit: Liu yu <liuyu@loongson.cn>
Cr-Commit-Position: refs/heads/main@{#77343}
parent 7796d60e
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 39 deletions
src/regexp/loong64/regexp-macro-assembler-loong64.cc
View file @ 6b00c94c
......@@ -333,10 +333,9 @@ void RegExpMacroAssemblerLOONG64::CheckNotBackReferenceIgnoreCase(
{
AllowExternalCallThatCantCauseGC scope(masm_.get());
ExternalReference function =
unicode ? ExternalReference::re_case_insensitive_compare_unicode(
isolate())
: ExternalReference::re_case_insensitive_compare_non_unicode(
isolate());
unicode
? ExternalReference::re_case_insensitive_compare_unicode()
: ExternalReference::re_case_insensitive_compare_non_unicode();
__ CallCFunction(function, argument_count);
}
......@@ -548,8 +547,7 @@ bool RegExpMacroAssemblerLOONG64::CheckSpecialCharacterClass(
// Table is 256 entries, so all Latin1 characters can be tested.
BranchOrBacktrack(on_no_match, hi, current_character(), Operand('z'));
}
ExternalReference map =
ExternalReference::re_word_character_map(isolate());
ExternalReference map = ExternalReference::re_word_character_map();
__ li(a0, Operand(map));
__ Add_d(a0, a0, current_character());
__ Ld_bu(a0, MemOperand(a0, 0));
......@@ -562,8 +560,7 @@ bool RegExpMacroAssemblerLOONG64::CheckSpecialCharacterClass(
// Table is 256 entries, so all Latin1 characters can be tested.
__ Branch(&done, hi, current_character(), Operand('z'));
}
ExternalReference map =
ExternalReference::re_word_character_map(isolate());
ExternalReference map = ExternalReference::re_word_character_map();
__ li(a0, Operand(map));
__ Add_d(a0, a0, current_character());
__ Ld_bu(a0, MemOperand(a0, 0));
......@@ -916,8 +913,7 @@ Handle<HeapObject> RegExpMacroAssemblerLOONG64::GetCode(Handle<String> source) {
static const int kNumArguments = 1;
__ PrepareCallCFunction(kNumArguments, a0);
__ li(a0, Operand(ExternalReference::isolate_address(masm_->isolate())));
ExternalReference grow_stack =
ExternalReference::re_grow_stack(masm_->isolate());
ExternalReference grow_stack = ExternalReference::re_grow_stack();
__ CallCFunction(grow_stack, kNumArguments);
// Restore regexp registers.
__ MultiPop(regexp_registers);
......@@ -1134,7 +1130,7 @@ void RegExpMacroAssemblerLOONG64::CallCheckStackGuardState(Register scratch) {
__ mov(a0, sp);
ExternalReference stack_guard_check =
ExternalReference::re_check_stack_guard_state(masm_->isolate());
ExternalReference::re_check_stack_guard_state();
__ li(t7, Operand(stack_guard_check));
EmbeddedData d = EmbeddedData::FromBlob();
......
src/regexp/mips/regexp-macro-assembler-mips.cc
View file @ 6b00c94c
......@@ -338,10 +338,9 @@ void RegExpMacroAssemblerMIPS::CheckNotBackReferenceIgnoreCase(
{
AllowExternalCallThatCantCauseGC scope(masm_.get());
ExternalReference function =
unicode ? ExternalReference::re_case_insensitive_compare_unicode(
isolate())
: ExternalReference::re_case_insensitive_compare_non_unicode(
isolate());
unicode
? ExternalReference::re_case_insensitive_compare_unicode()
: ExternalReference::re_case_insensitive_compare_non_unicode();
__ CallCFunction(function, argument_count);
}
......@@ -564,7 +563,7 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(base::uc16 type,
// Table is 256 entries, so all Latin1 characters can be tested.
BranchOrBacktrack(on_no_match, hi, current_character(), Operand('z'));
}
ExternalReference map = ExternalReference::re_word_character_map(isolate());
ExternalReference map = ExternalReference::re_word_character_map();
__ li(a0, Operand(map));
__ Addu(a0, a0, current_character());
__ lbu(a0, MemOperand(a0, 0));
......@@ -577,7 +576,7 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(base::uc16 type,
// Table is 256 entries, so all Latin1 characters can be tested.
__ Branch(&done, hi, current_character(), Operand('z'));
}
ExternalReference map = ExternalReference::re_word_character_map(isolate());
ExternalReference map = ExternalReference::re_word_character_map();
__ li(a0, Operand(map));
__ Addu(a0, a0, current_character());
__ lbu(a0, MemOperand(a0, 0));
......@@ -921,8 +920,7 @@ Handle<HeapObject> RegExpMacroAssemblerMIPS::GetCode(Handle<String> source) {
static constexpr int kNumArguments = 1;
__ PrepareCallCFunction(kNumArguments, a0);
__ li(a0, Operand(ExternalReference::isolate_address(masm_->isolate())));
ExternalReference grow_stack =
ExternalReference::re_grow_stack(masm_->isolate());
ExternalReference grow_stack = ExternalReference::re_grow_stack();
__ CallCFunction(grow_stack, kNumArguments);
// Restore regexp registers.
__ MultiPop(regexp_registers);
......@@ -1122,10 +1120,7 @@ void RegExpMacroAssemblerMIPS::ClearRegisters(int reg_from, int reg_to) {
}
}
bool RegExpMacroAssemblerMIPS::CanReadUnaligned() {
return false;
}
bool RegExpMacroAssemblerMIPS::CanReadUnaligned() const { return false; }
// Private methods:
......@@ -1164,7 +1159,7 @@ void RegExpMacroAssemblerMIPS::CallCheckStackGuardState(Register scratch) {
__ mov(a0, sp);
ExternalReference stack_guard_check =
ExternalReference::re_check_stack_guard_state(masm_->isolate());
ExternalReference::re_check_stack_guard_state();
__ li(t9, Operand(stack_guard_check));
EmbeddedData d = EmbeddedData::FromBlob();
......
src/regexp/mips/regexp-macro-assembler-mips.h
View file @ 6b00c94c
......@@ -78,7 +78,7 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerMIPS
virtual void WriteCurrentPositionToRegister(int reg, int cp_offset);
virtual void ClearRegisters(int reg_from, int reg_to);
virtual void WriteStackPointerToRegister(int reg);
virtual bool CanReadUnaligned();
virtual bool CanReadUnaligned() const;
// Called from RegExp if the stack-guard is triggered.
// If the code object is relocated, the return address is fixed before
......
src/regexp/mips64/regexp-macro-assembler-mips64.cc
View file @ 6b00c94c
......@@ -376,10 +376,9 @@ void RegExpMacroAssemblerMIPS::CheckNotBackReferenceIgnoreCase(
{
AllowExternalCallThatCantCauseGC scope(masm_.get());
ExternalReference function =
unicode ? ExternalReference::re_case_insensitive_compare_unicode(
isolate())
: ExternalReference::re_case_insensitive_compare_non_unicode(
isolate());
unicode
? ExternalReference::re_case_insensitive_compare_unicode()
: ExternalReference::re_case_insensitive_compare_non_unicode();
__ CallCFunction(function, argument_count);
}
......@@ -596,7 +595,7 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(base::uc16 type,
// Table is 256 entries, so all Latin1 characters can be tested.
BranchOrBacktrack(on_no_match, hi, current_character(), Operand('z'));
}
ExternalReference map = ExternalReference::re_word_character_map(isolate());
ExternalReference map = ExternalReference::re_word_character_map();
__ li(a0, Operand(map));
__ Daddu(a0, a0, current_character());
__ Lbu(a0, MemOperand(a0, 0));
......@@ -609,7 +608,7 @@ bool RegExpMacroAssemblerMIPS::CheckSpecialCharacterClass(base::uc16 type,
// Table is 256 entries, so all Latin1 characters can be tested.
__ Branch(&done, hi, current_character(), Operand('z'));
}
ExternalReference map = ExternalReference::re_word_character_map(isolate());
ExternalReference map = ExternalReference::re_word_character_map();
__ li(a0, Operand(map));
__ Daddu(a0, a0, current_character());
__ Lbu(a0, MemOperand(a0, 0));
......@@ -960,8 +959,7 @@ Handle<HeapObject> RegExpMacroAssemblerMIPS::GetCode(Handle<String> source) {
static constexpr int kNumArguments = 1;
__ PrepareCallCFunction(kNumArguments, a0);
__ li(a0, Operand(ExternalReference::isolate_address(masm_->isolate())));
ExternalReference grow_stack =
ExternalReference::re_grow_stack(masm_->isolate());
ExternalReference grow_stack = ExternalReference::re_grow_stack();
__ CallCFunction(grow_stack, kNumArguments);
// Restore regexp registers.
__ MultiPop(regexp_registers);
......@@ -1160,10 +1158,7 @@ void RegExpMacroAssemblerMIPS::ClearRegisters(int reg_from, int reg_to) {
}
}
bool RegExpMacroAssemblerMIPS::CanReadUnaligned() {
return false;
}
bool RegExpMacroAssemblerMIPS::CanReadUnaligned() const { return false; }
// Private methods:
......@@ -1202,7 +1197,7 @@ void RegExpMacroAssemblerMIPS::CallCheckStackGuardState(Register scratch) {
__ mov(a0, sp);
ExternalReference stack_guard_check =
ExternalReference::re_check_stack_guard_state(masm_->isolate());
ExternalReference::re_check_stack_guard_state();
__ li(t9, Operand(stack_guard_check));
EmbeddedData d = EmbeddedData::FromBlob();
......
src/regexp/mips64/regexp-macro-assembler-mips64.h
View file @ 6b00c94c
......@@ -78,7 +78,7 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerMIPS
virtual void WriteCurrentPositionToRegister(int reg, int cp_offset);
virtual void ClearRegisters(int reg_from, int reg_to);
virtual void WriteStackPointerToRegister(int reg);
virtual bool CanReadUnaligned();
virtual bool CanReadUnaligned() const;
// Called from RegExp if the stack-guard is triggered.
// If the code object is relocated, the return address is fixed before
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment