summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2021-10-12 06:48:03 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2021-10-12 06:48:03 +0200
commit744aca148e3c709e7c7f87caede3c0f4adb2ee5f (patch)
treee7f70e45bd5ce5c17e9afbb7faa7493a4e7aeaca
parent76e19ed7c62bcb410ea7bbf9219651441f690648 (diff)
parentb0584c8d31bad9c0d624a57c32ce5d611766610a (diff)
downloaderlang-744aca148e3c709e7c7f87caede3c0f4adb2ee5f.tar.gz
Merge branch 'maint'
* maint: Improve argument testing in the bs_add instruction
-rw-r--r--erts/emulator/beam/jit/x86/instr_bs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/jit/x86/instr_bs.cpp b/erts/emulator/beam/jit/x86/instr_bs.cpp
index 1aad5060ef..2d68db3aae 100644
--- a/erts/emulator/beam/jit/x86/instr_bs.cpp
+++ b/erts/emulator/beam/jit/x86/instr_bs.cpp
@@ -1413,8 +1413,8 @@ void BeamModuleAssembler::emit_bs_add(const ArgVal &Fail,
a.and_(RETd, ARG1d);
}
}
- a.and_(RETb, imm(_TAG_PRIMARY_MASK));
- a.cmp(RETb, imm(TAG_PRIMARY_IMMED1));
+ a.and_(RETb, imm(_TAG_IMMED1_MASK));
+ a.cmp(RETb, imm(_TAG_IMMED1_SMALL));
a.jne(fail);
/* Verify that ARG2 >= 0 and multiply ARG2 by the unit. The