From 47ae51f70b86b53e58180f3c29e5b4756ff2cfe0 Mon Sep 17 00:00:00 2001 From: Predrag Rudic Date: Tue, 6 Nov 2018 19:57:56 +0100 Subject: [PATCH] MIPS[64] Fix build failure after porting Smi to new design. After commit 6d706ae3a0153cf0272760132b775ae06ef13b1a, MIPS builders started to fail. This CL completes that commit. Change-Id: Ib3fef6771f7878c8760b4820e54b06e853d6be3d Reviewed-on: https://chromium-review.googlesource.com/c/1320489 Reviewed-by: Jakob Kummerow Reviewed-by: Ivica Bogosavljevic Commit-Queue: Ivica Bogosavljevic Cr-Commit-Position: refs/heads/master@{#57309} --- src/builtins/mips/builtins-mips.cc | 8 ++++---- src/builtins/mips64/builtins-mips64.cc | 8 ++++---- src/mips/macro-assembler-mips.cc | 2 +- src/mips64/macro-assembler-mips64.cc | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/builtins/mips/builtins-mips.cc b/src/builtins/mips/builtins-mips.cc index 6a91c6316c..d298fbf1b6 100644 --- a/src/builtins/mips/builtins-mips.cc +++ b/src/builtins/mips/builtins-mips.cc @@ -1070,7 +1070,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) { Label builtin_trampoline, trampoline_loaded; Smi interpreter_entry_return_pc_offset( masm->isolate()->heap()->interpreter_entry_return_pc_offset()); - DCHECK_NE(interpreter_entry_return_pc_offset, Smi::kZero); + DCHECK_NE(interpreter_entry_return_pc_offset, Smi::zero()); // If the SFI function_data is an InterpreterData, get the trampoline stored // in it, otherwise get the trampoline from the builtins list. @@ -1303,7 +1303,7 @@ void Builtins::Generate_InterpreterOnStackReplacement(MacroAssembler* masm) { } // If the code object is null, just return to the caller. - __ Ret(eq, v0, Operand(Smi::kZero)); + __ Ret(eq, v0, Operand(Smi::zero())); // Drop the handler frame that is be sitting on top of the actual // JavaScript frame. This is the case then OSR is triggered from bytecode. @@ -1543,7 +1543,7 @@ static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) { __ sll(a0, a0, kSmiTagSize); __ li(t0, Operand(StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR))); __ MultiPush(a0.bit() | a1.bit() | t0.bit() | fp.bit() | ra.bit()); - __ Push(Smi::kZero); // Padding. + __ Push(Smi::zero()); // Padding. __ Addu(fp, sp, Operand(ArgumentsAdaptorFrameConstants::kFixedFrameSizeFromFp)); } @@ -2268,7 +2268,7 @@ void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) { WasmInstanceObject::kCEntryStubOffset)); // Initialize the JavaScript context with 0. CEntry will use it to // set the current context on the isolate. - __ Move(kContextRegister, Smi::kZero); + __ Move(kContextRegister, Smi::zero()); __ CallRuntimeWithCEntry(Runtime::kWasmCompileLazy, a2); // Restore registers. diff --git a/src/builtins/mips64/builtins-mips64.cc b/src/builtins/mips64/builtins-mips64.cc index cd0610b4b4..24f12af904 100644 --- a/src/builtins/mips64/builtins-mips64.cc +++ b/src/builtins/mips64/builtins-mips64.cc @@ -1069,7 +1069,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) { Label builtin_trampoline, trampoline_loaded; Smi interpreter_entry_return_pc_offset( masm->isolate()->heap()->interpreter_entry_return_pc_offset()); - DCHECK_NE(interpreter_entry_return_pc_offset, Smi::kZero); + DCHECK_NE(interpreter_entry_return_pc_offset, Smi::zero()); // If the SFI function_data is an InterpreterData, get the trampoline stored // in it, otherwise get the trampoline from the builtins list. @@ -1300,7 +1300,7 @@ void Builtins::Generate_InterpreterOnStackReplacement(MacroAssembler* masm) { } // If the code object is null, just return to the caller. - __ Ret(eq, v0, Operand(Smi::kZero)); + __ Ret(eq, v0, Operand(Smi::zero())); // Drop the handler frame that is be sitting on top of the actual // JavaScript frame. This is the case then OSR is triggered from bytecode. @@ -1556,7 +1556,7 @@ static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) { __ SmiTag(a0); __ li(a4, Operand(StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR))); __ MultiPush(a0.bit() | a1.bit() | a4.bit() | fp.bit() | ra.bit()); - __ Push(Smi::kZero); // Padding. + __ Push(Smi::zero()); // Padding. __ Daddu(fp, sp, Operand(ArgumentsAdaptorFrameConstants::kFixedFrameSizeFromFp)); } @@ -2286,7 +2286,7 @@ void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) { WasmInstanceObject::kCEntryStubOffset)); // Initialize the JavaScript context with 0. CEntry will use it to // set the current context on the isolate. - __ Move(kContextRegister, Smi::kZero); + __ Move(kContextRegister, Smi::zero()); __ CallRuntimeWithCEntry(Runtime::kWasmCompileLazy, a2); // Restore registers. diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc index 554a077383..e8e1eff1e6 100644 --- a/src/mips/macro-assembler-mips.cc +++ b/src/mips/macro-assembler-mips.cc @@ -4097,7 +4097,7 @@ void MacroAssembler::PushStackHandler() { STATIC_ASSERT(StackHandlerConstants::kSize == 2 * kPointerSize); STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0 * kPointerSize); - Push(Smi::kZero); // Padding. + Push(Smi::zero()); // Padding. // Link the current handler as the next handler. li(t2, diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc index 1c973cd9ae..8c4c9a4597 100644 --- a/src/mips64/macro-assembler-mips64.cc +++ b/src/mips64/macro-assembler-mips64.cc @@ -4442,7 +4442,7 @@ void MacroAssembler::PushStackHandler() { STATIC_ASSERT(StackHandlerConstants::kSize == 2 * kPointerSize); STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0 * kPointerSize); - Push(Smi::kZero); // Padding. + Push(Smi::zero()); // Padding. // Link the current handler as the next handler. li(a6,