Fix further test-suite problems

Fix safe_mul in the loader, which caused failures in the bit
syntax test cases.

Fix yet another Uint in erl_alloc.h (ERTS_CACHE_LINE_SIZE) causing
segmentation fault when we have many schedulers (why only in that
situation?).

Clean up erl_mseg (remove old code for the Linux 32-bit mmap flag).

While at it, also remove compilation warnings.

1 files changed, 7 insertions, 7 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 0d1cce52ca..834cc8df61 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -4906,13 +4906,13 @@ apply_bif_or_nif_epilogue:
      em_call_error_handler = OpCode(call_error_handler);
      em_call_traced_function = OpCode(call_traced_function);
      em_apply_bif = OpCode(apply_bif);
-     beam_apply[0] = (Eterm) OpCode(i_apply);
-     beam_apply[1] = (Eterm) OpCode(normal_exit);
-     beam_exit[0] = (Eterm) OpCode(error_action_code);
-     beam_continue_exit[0] = (Eterm) OpCode(continue_exit);
-     beam_return_to_trace[0] = (Eterm) OpCode(i_return_to_trace);
-     beam_return_trace[0] = (Eterm) OpCode(return_trace);
-     beam_exception_trace[0] = (Eterm) OpCode(return_trace); /* UGLY */
+     beam_apply[0] = (BeamInstr) OpCode(i_apply);
+     beam_apply[1] = (BeamInstr) OpCode(normal_exit);
+     beam_exit[0] = (BeamInstr) OpCode(error_action_code);
+     beam_continue_exit[0] = (BeamInstr) OpCode(continue_exit);
+     beam_return_to_trace[0] = (BeamInstr) OpCode(i_return_to_trace);
+     beam_return_trace[0] = (BeamInstr) OpCode(return_trace);
+     beam_exception_trace[0] = (BeamInstr) OpCode(return_trace); /* UGLY */
 
      /*
       * Enter all BIFs into the export table.