Skip to content

V
V8
Commit 6e9c60e6 authored by Liu Yu's avatar Liu Yu Committed by Commit Bot
Browse files
Options

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

Port commit 7730fd94

Bug: v8:10582

Change-Id: I2597bbbbe06ba16dba042ee512119822305a5f70
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2570433Reviewed-by: 's avatarZhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Commit-Queue: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Cr-Commit-Position: refs/heads/master@{#71583}
parent e2f858a8
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
src/builtins/mips/builtins-mips.cc
View file @ 6e9c60e6
......@@ -3847,23 +3847,23 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
}
void Builtins::Generate_DynamicMapChecksTrampoline(MacroAssembler* masm) {
void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
FrameScope scope(masm, StackFrame::MANUAL);
__ EnterFrame(StackFrame::INTERNAL);
// Only save the registers that the DynamicMapChecks builtin can clobber.
DynamicMapChecksDescriptor descriptor;
// Only save the registers that the DynamicCheckMaps builtin can clobber.
DynamicCheckMapsDescriptor descriptor;
RegList registers = descriptor.allocatable_registers();
// FLAG_debug_code is enabled CSA checks will call C function and so we need
// to save all CallerSaved registers too.
if (FLAG_debug_code) registers |= kJSCallerSaved;
__ SaveRegisters(registers);
__ Call(BUILTIN_CODE(masm->isolate(), DynamicMapChecks),
__ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
RelocInfo::CODE_TARGET);
Label deopt, bailout;
__ Branch(&deopt, ne, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kSuccess)));
Operand(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
__ RestoreRegisters(registers);
__ LeaveFrame(StackFrame::INTERNAL);
......@@ -3871,11 +3871,11 @@ void Builtins::Generate_DynamicMapChecksTrampoline(MacroAssembler* masm) {
__ bind(&deopt);
__ Branch(&bailout, eq, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kBailout)));
Operand(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
if (FLAG_debug_code) {
__ Assert(eq, AbortReason::kUnexpectedDynamicMapChecksStatus, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kDeopt)));
__ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus, v0,
Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
}
__ RestoreRegisters(registers);
__ LeaveFrame(StackFrame::INTERNAL);
......
src/builtins/mips64/builtins-mips64.cc
View file @ 6e9c60e6
......@@ -3409,23 +3409,23 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
}
void Builtins::Generate_DynamicMapChecksTrampoline(MacroAssembler* masm) {
void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
FrameScope scope(masm, StackFrame::MANUAL);
__ EnterFrame(StackFrame::INTERNAL);
// Only save the registers that the DynamicMapChecks builtin can clobber.
DynamicMapChecksDescriptor descriptor;
// Only save the registers that the DynamicCheckMaps builtin can clobber.
DynamicCheckMapsDescriptor descriptor;
RegList registers = descriptor.allocatable_registers();
// FLAG_debug_code is enabled CSA checks will call C function and so we need
// to save all CallerSaved registers too.
if (FLAG_debug_code) registers |= kJSCallerSaved;
__ SaveRegisters(registers);
__ Call(BUILTIN_CODE(masm->isolate(), DynamicMapChecks),
__ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
RelocInfo::CODE_TARGET);
Label deopt, bailout;
__ Branch(&deopt, ne, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kSuccess)));
Operand(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
__ RestoreRegisters(registers);
__ LeaveFrame(StackFrame::INTERNAL);
......@@ -3433,11 +3433,11 @@ void Builtins::Generate_DynamicMapChecksTrampoline(MacroAssembler* masm) {
__ bind(&deopt);
__ Branch(&bailout, eq, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kBailout)));
Operand(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
if (FLAG_debug_code) {
__ Assert(eq, AbortReason::kUnexpectedDynamicMapChecksStatus, v0,
Operand(static_cast<int>(DynamicMapChecksStatus::kDeopt)));
__ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus, v0,
Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
}
__ RestoreRegisters(registers);
__ LeaveFrame(StackFrame::INTERNAL);
......
src/codegen/mips/interface-descriptors-mips.cc
View file @ 6e9c60e6
......@@ -60,7 +60,7 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
}
void DynamicMapChecksDescriptor::InitializePlatformSpecific(
void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) {
Register default_stub_registers[] = {kReturnRegister0, a0, a1, a2, cp};
......
src/codegen/mips64/interface-descriptors-mips64.cc
View file @ 6e9c60e6
......@@ -60,7 +60,7 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
}
void DynamicMapChecksDescriptor::InitializePlatformSpecific(
void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) {
Register default_stub_registers[] = {kReturnRegister0, a0, a1, a2, cp};
......
test/cctest/test-macro-assembler-mips.cc
View file @ 6e9c60e6
......@@ -1350,7 +1350,7 @@ TEST(DeoptExitSizeIsFixed) {
masm.bind(&before_exit);
if (kind == DeoptimizeKind::kEagerWithResume) {
Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
DeoptimizeReason::kDynamicMapCheck);
DeoptimizeReason::kDynamicCheckMaps);
masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
nullptr);
CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
......
test/cctest/test-macro-assembler-mips64.cc
View file @ 6e9c60e6
......@@ -1702,7 +1702,7 @@ TEST(DeoptExitSizeIsFixed) {
masm.bind(&before_exit);
if (kind == DeoptimizeKind::kEagerWithResume) {
Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
DeoptimizeReason::kDynamicMapCheck);
DeoptimizeReason::kDynamicCheckMaps);
masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
nullptr);
CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
......
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