Merge branch 'bjorn/erts/improve-beam-ops'

* bjorn/erts/improve-beam-ops:
  Move out variables from the head of combined instructions
  Change operand from 'P' to 'Q' for i_apply_last and i_apply_fun_last
  Add CHECK_ALIGNED() for testing storage destinations
  instrs.tab: Add missing -no_next directives
  beam_load.c: Generalize the 'P' operator in the packing engine
  Break out most of the initialization from process_main()
  Eliminate the OpCode() macro
  Eliminate unnecessary and inconsistent casts
  Refactor macros for accessing Beam instructions
  beam_emu: Make order of macros consistent
  beam_SUITE: Strengthen test of packed registers

1 files changed, 2 insertions, 2 deletions

diff --git a/erts/emulator/beam/trace_instrs.tab b/erts/emulator/beam/trace_instrs.tab
index b10442c5e7..3eee81c053 100644
--- a/erts/emulator/beam/trace_instrs.tab
+++ b/erts/emulator/beam/trace_instrs.tab
@@ -61,12 +61,12 @@ i_return_to_trace() {
         Uint *cpp = (Uint*) E;
         for(;;) {
             ASSERT(is_CP(*cpp));
-            if (*cp_val(*cpp) == (BeamInstr) OpCode(return_trace)) {
+            if (IsOpCode(*cp_val(*cpp), return_trace)) {
                 do
                     ++cpp;
                 while (is_not_CP(*cpp));
                 cpp += 2;
-            } else if (*cp_val(*cpp) == (BeamInstr) OpCode(i_return_to_trace)) {
+            } else if (IsOpCode(*cp_val(*cpp), i_return_to_trace)) {
                 do
                     ++cpp;
                 while (is_not_CP(*cpp));