From d4f5317c354b529aa80fd969a05b25f15f41f893 Mon Sep 17 00:00:00 2001 From: Wouter Vermeiren Date: Tue, 11 Aug 2020 15:18:34 +0200 Subject: [PATCH] Fix preprocessor typo and use ConvertDoubleToInt32NoPPC64 for ppc32 --- deps/v8/src/builtins/ppc/builtins-ppc.cc | 13 ++++--------- deps/v8/src/codegen/ppc/macro-assembler-ppc.cc | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/deps/v8/src/builtins/ppc/builtins-ppc.cc b/deps/v8/src/builtins/ppc/builtins-ppc.cc index fe65b4d9..435e11d6 100644 --- a/deps/v8/src/builtins/ppc/builtins-ppc.cc +++ b/deps/v8/src/builtins/ppc/builtins-ppc.cc @@ -2827,17 +2827,12 @@ void Builtins::Generate_DoubleToI(MacroAssembler* masm) { __ lfd(double_scratch, MemOperand(sp, argument_offset)); // Do fast-path convert from double to int. - __ ConvertDoubleToInt64(double_scratch, #if !V8_TARGET_ARCH_PPC64 - scratch, -#endif - result_reg, d0); - -// Test for overflow -#if V8_TARGET_ARCH_PPC64 - __ TestIfInt32(result_reg, r0); -#else + __ ConvertDoubleToInt32NoPPC64(double_scratch, result_reg, scratch); __ TestIfInt32(scratch, result_reg, r0); +#else + __ ConvertDoubleToInt64(double_scratch, result_reg, d0); + __ TestIfInt32(result_reg, r0); #endif __ beq(&fastpath_done); diff --git a/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc b/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc index 2ab66c43..30fe1f45 100644 --- a/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc +++ b/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc @@ -855,7 +855,7 @@ void TurboAssembler::ConvertDoubleToInt64(const DoubleRegister double_input, fctid(double_dst, double_input); ResetRoundingMode(); } -else +#else if (rounding_mode == kRoundToZero) { fctiwz(double_dst, double_input); } else { -- 2.20.1