Refactor macros for accessing Beam instructions

The BeamOp() macro in erl_vm.h is clumsy to use. All users
cast the return value to BeamInstr.

Define new macros that are easier to use. In the future,
we might want to pack an operand into the same word as
the pointer to the instruction, so we will define two macros.

BeamIsOpCode() is used to rewrite code like this:

  if (Instr == (BeamInstr) BeamOp(op_i_func_info_IaaI) {
    ...
  }

to:

  if (BeamIsOpCode(Instr, op_i_func_info_IaaI)) {
    ...
  }

BeamOpCodeAddr(op_apply_bif) is used when we need the address
for an instruction.

Also elimiminate the global variables em_* in beam_emu.c.
They are not really needed. Use the BeamOpCodeAddr() macro
instead.

1 files changed, 0 insertions, 5 deletions

diff --git a/erts/emulator/beam/beam_load.h b/erts/emulator/beam/beam_load.h
index c4a90d3f3a..156c3c45e2 100644
--- a/erts/emulator/beam/beam_load.h
+++ b/erts/emulator/beam/beam_load.h
@@ -37,11 +37,6 @@ typedef struct gen_op_entry {
 
 extern const GenOpEntry gen_opc[];
 
-extern BeamInstr beam_debug_apply[];
-extern BeamInstr* em_call_error_handler;
-extern BeamInstr* em_apply_bif;
-extern BeamInstr* em_call_nif;
-
 struct ErtsLiteralArea_;
 
 /*