AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[mips][cleanup][TurboProp] Unify DynamicMapChecks names.

Browse Source 
Port commit 7730fd94a2

Bug: v8:10582

Change-Id: I2597bbbbe06ba16dba042ee512119822305a5f70
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2570433
Reviewed-by: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Commit-Queue: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Cr-Commit-Position: refs/heads/master@{#71583}
This commit is contained in:
Liu Yu 2020-12-03 11:21:45 +08:00 committed by Commit Bot
parent e2f858a887
commit 6e9c60e638
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/builtins/mips/builtins-mips.cc
View File

@ -3847,23 +3847,23 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy); Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
} }
void Builtins::Generate_DynamicMapChecksTrampoline(MacroAssembler* masm) { void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
FrameScope scope(masm, StackFrame::MANUAL); FrameScope scope(masm, StackFrame::MANUAL);
__ EnterFrame(StackFrame::INTERNAL); __ EnterFrame(StackFrame::INTERNAL);
// Only save the registers that the DynamicMapChecks builtin can clobber. // Only save the registers that the DynamicCheckMaps builtin can clobber.
DynamicMapChecksDescriptor descriptor; DynamicCheckMapsDescriptor descriptor;
RegList registers = descriptor.allocatable_registers(); RegList registers = descriptor.allocatable_registers();
// FLAG_debug_code is enabled CSA checks will call C function and so we need // FLAG_debug_code is enabled CSA checks will call C function and so we need
// to save all CallerSaved registers too. // to save all CallerSaved registers too.
if (FLAG_debug_code) registers |= kJSCallerSaved; if (FLAG_debug_code) registers |= kJSCallerSaved;
__ SaveRegisters(registers); __ SaveRegisters(registers);
__ Call(BUILTIN_CODE(masm->isolate(), DynamicMapChecks), __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
RelocInfo::CODE_TARGET); RelocInfo::CODE_TARGET);
Label deopt, bailout; Label deopt, bailout;
__ Branch(&deopt, ne, v0, __ Branch(&deopt, ne, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kSuccess))); Operand(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
__ RestoreRegisters(registers); __ RestoreRegisters(registers);
__ LeaveFrame(StackFrame::INTERNAL); __ LeaveFrame(StackFrame::INTERNAL);
@ -3871,11 +3871,11 @@ void Builtins::Generate_DynamicMapChecksTrampoline(MacroAssembler* masm) {
__ bind(&deopt); __ bind(&deopt);
__ Branch(&bailout, eq, v0, __ Branch(&bailout, eq, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kBailout))); Operand(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
if (FLAG_debug_code) { if (FLAG_debug_code) {
__ Assert(eq, AbortReason::kUnexpectedDynamicMapChecksStatus, v0, __ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kDeopt))); Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
} }
__ RestoreRegisters(registers); __ RestoreRegisters(registers);
__ LeaveFrame(StackFrame::INTERNAL); __ LeaveFrame(StackFrame::INTERNAL);

16
src/builtins/mips64/builtins-mips64.cc
View File

@ -3409,23 +3409,23 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy); Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
} }
void Builtins::Generate_DynamicMapChecksTrampoline(MacroAssembler* masm) { void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
FrameScope scope(masm, StackFrame::MANUAL); FrameScope scope(masm, StackFrame::MANUAL);
__ EnterFrame(StackFrame::INTERNAL); __ EnterFrame(StackFrame::INTERNAL);
// Only save the registers that the DynamicMapChecks builtin can clobber. // Only save the registers that the DynamicCheckMaps builtin can clobber.
DynamicMapChecksDescriptor descriptor; DynamicCheckMapsDescriptor descriptor;
RegList registers = descriptor.allocatable_registers(); RegList registers = descriptor.allocatable_registers();
// FLAG_debug_code is enabled CSA checks will call C function and so we need // FLAG_debug_code is enabled CSA checks will call C function and so we need
// to save all CallerSaved registers too. // to save all CallerSaved registers too.
if (FLAG_debug_code) registers |= kJSCallerSaved; if (FLAG_debug_code) registers |= kJSCallerSaved;
__ SaveRegisters(registers); __ SaveRegisters(registers);
__ Call(BUILTIN_CODE(masm->isolate(), DynamicMapChecks), __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
RelocInfo::CODE_TARGET); RelocInfo::CODE_TARGET);
Label deopt, bailout; Label deopt, bailout;
__ Branch(&deopt, ne, v0, __ Branch(&deopt, ne, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kSuccess))); Operand(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
__ RestoreRegisters(registers); __ RestoreRegisters(registers);
__ LeaveFrame(StackFrame::INTERNAL); __ LeaveFrame(StackFrame::INTERNAL);
@ -3433,11 +3433,11 @@ void Builtins::Generate_DynamicMapChecksTrampoline(MacroAssembler* masm) {
__ bind(&deopt); __ bind(&deopt);
__ Branch(&bailout, eq, v0, __ Branch(&bailout, eq, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kBailout))); Operand(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
if (FLAG_debug_code) { if (FLAG_debug_code) {
__ Assert(eq, AbortReason::kUnexpectedDynamicMapChecksStatus, v0, __ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kDeopt))); Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
} }
__ RestoreRegisters(registers); __ RestoreRegisters(registers);
__ LeaveFrame(StackFrame::INTERNAL); __ LeaveFrame(StackFrame::INTERNAL);

2
src/codegen/mips/interface-descriptors-mips.cc
View File

@ -60,7 +60,7 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
data->InitializePlatformSpecific(kParameterCount, default_stub_registers); data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
} }
void DynamicMapChecksDescriptor::InitializePlatformSpecific( void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register default_stub_registers[] = {kReturnRegister0, a0, a1, a2, cp}; Register default_stub_registers[] = {kReturnRegister0, a0, a1, a2, cp};

2
src/codegen/mips64/interface-descriptors-mips64.cc
View File

@ -60,7 +60,7 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
data->InitializePlatformSpecific(kParameterCount, default_stub_registers); data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
} }
void DynamicMapChecksDescriptor::InitializePlatformSpecific( void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register default_stub_registers[] = {kReturnRegister0, a0, a1, a2, cp}; Register default_stub_registers[] = {kReturnRegister0, a0, a1, a2, cp};

2
test/cctest/test-macro-assembler-mips.cc
View File

@ -1350,7 +1350,7 @@ TEST(DeoptExitSizeIsFixed) {
masm.bind(&before_exit); masm.bind(&before_exit);
if (kind == DeoptimizeKind::kEagerWithResume) { if (kind == DeoptimizeKind::kEagerWithResume) {
Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin( Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
DeoptimizeReason::kDynamicMapCheck); DeoptimizeReason::kDynamicCheckMaps);
masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit, masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
nullptr); nullptr);
CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit), CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),

2
test/cctest/test-macro-assembler-mips64.cc
View File

@ -1702,7 +1702,7 @@ TEST(DeoptExitSizeIsFixed) {
masm.bind(&before_exit); masm.bind(&before_exit);
if (kind == DeoptimizeKind::kEagerWithResume) { if (kind == DeoptimizeKind::kEagerWithResume) {
Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin( Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
DeoptimizeReason::kDynamicMapCheck); DeoptimizeReason::kDynamicCheckMaps);
masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit, masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
nullptr); nullptr);
CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit), CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),