diff options
| author | Maxim Fedorov <maximfca@gmail.com> | 2021-04-02 15:55:44 -0700 |
|---|---|---|
| committer | Maxim Fedorov <maximfca@gmail.com> | 2021-04-02 16:23:09 -0700 |
| commit | c535f1c67888c9f974a247ef31e1e8362848b7f6 (patch) | |
| tree | 9099acc5e8d4768508a763d0b1fdf7125e1aa9de | |
| parent | 40922798411c2d23ee8a99456f96d6637c62b762 (diff) | |
| download | erlang-c535f1c67888c9f974a247ef31e1e8362848b7f6.tar.gz | |
msacc: fix segfault caused when extra MSACC states are enabled
8346580b124a recovered extra MSACC states but caused BEAM to dump
core when msacc was switched off due to accidental rewrite of a
variable.
| -rw-r--r-- | erts/emulator/beam/jit/x86/instr_bif.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/emulator/beam/jit/x86/instr_bif.cpp b/erts/emulator/beam/jit/x86/instr_bif.cpp index 7d130595ba..ae329e3f0c 100644 --- a/erts/emulator/beam/jit/x86/instr_bif.cpp +++ b/erts/emulator/beam/jit/x86/instr_bif.cpp @@ -446,11 +446,12 @@ void BeamGlobalAssembler::emit_call_light_bif_shared() { a.cmp(erts_msacc_cache, imm(0)); a.short_().je(skip_msacc); - /* update cache if it was changed in the bif */ - a.mov(TMP_MEM1q, RET); + /* update cache if it was changed in the bif. + TMP_MEM1q is already taken to save ARG1 above */ + a.mov(TMP_MEM2q, RET); a.lea(ARG1, erts_msacc_cache); runtime_call<1>(erts_msacc_update_cache); - a.mov(RET, TMP_MEM1q); + a.mov(RET, TMP_MEM2q); /* set state to emulator if msacc has been enabled */ a.cmp(erts_msacc_cache, imm(0)); @@ -459,7 +460,7 @@ void BeamGlobalAssembler::emit_call_light_bif_shared() { a.mov(ARG2, imm(ERTS_MSACC_STATE_EMULATOR)); a.mov(ARG3, imm(1)); runtime_call<3>(erts_msacc_set_state_m__); - a.mov(RET, TMP_MEM1q); + a.mov(RET, TMP_MEM2q); a.bind(skip_msacc); } |