From dad1a8b0a49a9f600fe93caa62eaef8125706e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 20 Nov 2023 05:46:05 +0100 Subject: [PATCH] fixup! x86_64: Optimize arithmetic instructions --- erts/emulator/beam/jit/x86/instr_arith.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erts/emulator/beam/jit/x86/instr_arith.cpp b/erts/emulator/beam/jit/x86/instr_arith.cpp index 1b2f3772f65a..ea47beacf4b5 100644 --- a/erts/emulator/beam/jit/x86/instr_arith.cpp +++ b/erts/emulator/beam/jit/x86/instr_arith.cpp @@ -555,7 +555,7 @@ void BeamGlobalAssembler::emit_int_div_rem_guard_shared() { * Quotient is returned in RAX, remainder in RDX. */ void BeamGlobalAssembler::emit_int_div_rem_body_shared() { Label div_zero = a.newLabel(), generic_div = a.newLabel(), - generic_error = a.newLabel(); + generic_error = a.newLabel(); emit_enter_frame(); @@ -925,7 +925,7 @@ void BeamGlobalAssembler::emit_mul_add_guard_shared() { * Result is returned in RET. */ void BeamGlobalAssembler::emit_mul_add_body_shared() { Label mul_only = a.newLabel(), error = a.newLabel(), - mul_error = a.newLabel(), do_error = a.newLabel(); + mul_error = a.newLabel(), do_error = a.newLabel(); emit_enter_frame(); emit_enter_runtime(); @@ -1015,7 +1015,7 @@ void BeamModuleAssembler::emit_i_mul_add(const ArgLabel &Fail, bool is_sum_small = is_sum_small_if_args_are_small(Src3, Src4); bool sometimes_small = !(Src2.isLiteral() || Src4.isLiteral()); bool is_increment_zero = - Src4.isSmall() && Src4.as().getSigned() == 0; + Src4.isSmall() && Src4.as().getSigned() == 0; Sint factor = 0; int left_shift = -1; @@ -1124,11 +1124,11 @@ void BeamModuleAssembler::emit_i_mul_add(const ArgLabel &Fail, a.and_(RETd, ARG3.r32()); a.and_(RETd, ARG4.r32()); if (always_one_of( - Src1) && + Src1) && always_one_of( - Src2) && + Src2) && always_one_of( - Src4)) { + Src4)) { emit_is_not_boxed(mixed, RET); } else { a.and_(RETb, imm(_TAG_IMMED1_MASK));