Skip to content

Commit

Permalink
fixup! x86_64: Optimize arithmetic instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
bjorng committed Nov 20, 2023
1 parent db42487 commit dad1a8b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions erts/emulator/beam/jit/x86/instr_arith.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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<ArgSmall>().getSigned() == 0;
Src4.isSmall() && Src4.as<ArgSmall>().getSigned() == 0;
Sint factor = 0;
int left_shift = -1;

Expand Down Expand Up @@ -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<BeamTypeId::Integer, BeamTypeId::AlwaysBoxed>(
Src1) &&
Src1) &&
always_one_of<BeamTypeId::Integer, BeamTypeId::AlwaysBoxed>(
Src2) &&
Src2) &&
always_one_of<BeamTypeId::Integer, BeamTypeId::AlwaysBoxed>(
Src4)) {
Src4)) {
emit_is_not_boxed(mixed, RET);
} else {
a.and_(RETb, imm(_TAG_IMMED1_MASK));
Expand Down

0 comments on commit dad1a8b

Please sign in to comment.