1 files changed, 32 insertions, 35 deletions

diff --git a/erts/emulator/beam/instrs.tab b/erts/emulator/beam/instrs.tab
index 1af01e53bd..b79b960fd7 100644
--- a/erts/emulator/beam/instrs.tab
+++ b/erts/emulator/beam/instrs.tab
@@ -110,15 +110,11 @@ i_call_only(CallDest) {
     $DISPATCH($CallDest);
 }
 
-i_move_call_only(CallDest, Src) {
+move_call_only(Src, CallDest) {
     x(0) = $Src;
     $i_call_only($CallDest);
 }
 
-move_call_only(Src, CallDest) {
-    $i_move_call_only($CallDest, $Src);
-}
-
 DISPATCHX(Dest) {
     //| -no_next
     DTRACE_GLOBAL_CALL_FROM_EXPORT(c_p, $Dest);
@@ -156,10 +152,10 @@ i_move_call_ext_last(Dest, StackOffset, Src) {
     $i_call_ext_last($Dest, $StackOffset);
 }
 
-APPLY(I, Deallocate) {
+APPLY(I, Deallocate, Next) {
     //| -no_next
     HEAVY_SWAPOUT;
-    next = apply(c_p, r(0), x(1), x(2), reg, $I, $Deallocate);
+    $Next = apply(c_p, reg, $I, $Deallocate);
     HEAVY_SWAPIN;
 }
 
@@ -170,8 +166,8 @@ HANDLE_APPLY_ERROR() {
 
 i_apply() {
     BeamInstr *next;
-    $APPLY(NULL, 0);
-    if (next != NULL) {
+    $APPLY(NULL, 0, next);
+    if (ERTS_LIKELY(next != NULL)) {
         $i_call(next);
     }
     $HANDLE_APPLY_ERROR();
@@ -179,8 +175,8 @@ i_apply() {
 
 i_apply_last(Deallocate) {
     BeamInstr *next;
-    $APPLY(I, $Deallocate);
-    if (next != NULL) {
+    $APPLY(I, $Deallocate, next);
+    if (ERTS_LIKELY(next != NULL)) {
         $i_call_last(next, $Deallocate);
     }
     $HANDLE_APPLY_ERROR();
@@ -188,24 +184,24 @@ i_apply_last(Deallocate) {
 
 i_apply_only() {
     BeamInstr *next;
-    $APPLY(I, 0);
-    if (next != NULL) {
+    $APPLY(I, 0, next);
+    if (ERTS_LIKELY(next != NULL)) {
         $i_call_only(next);
     }
     $HANDLE_APPLY_ERROR();
 }
 
-FIXED_APPLY(Arity, I, Deallocate) {
+FIXED_APPLY(Arity, I, Deallocate, Next) {
     //| -no_next
     HEAVY_SWAPOUT;
-    next = fixed_apply(c_p, reg, $Arity, $I, $Deallocate);
+    $Next = fixed_apply(c_p, reg, $Arity, $I, $Deallocate);
     HEAVY_SWAPIN;
 }
 
 apply(Arity) {
     BeamInstr *next;
-    $FIXED_APPLY($Arity, NULL, 0);
-    if (next != NULL) {
+    $FIXED_APPLY($Arity, NULL, 0, next);
+    if (ERTS_LIKELY(next != NULL)) {
         $i_call(next);
     }
     $HANDLE_APPLY_ERROR();
@@ -213,16 +209,16 @@ apply(Arity) {
 
 apply_last(Arity, Deallocate) {
     BeamInstr *next;
-    $FIXED_APPLY($Arity, I, $Deallocate);
-    if (next != NULL) {
+    $FIXED_APPLY($Arity, I, $Deallocate, next);
+    if (ERTS_LIKELY(next != NULL)) {
         $i_call_last(next, $Deallocate);
     }
     $HANDLE_APPLY_ERROR();
 }
 
-APPLY_FUN() {
+APPLY_FUN(Next) {
     HEAVY_SWAPOUT;
-    next = apply_fun(c_p, r(0), x(1), reg);
+    $Next = apply_fun(c_p, r(0), x(1), reg);
     HEAVY_SWAPIN;
 }
 
@@ -237,8 +233,8 @@ DISPATCH_FUN(I) {
 
 i_apply_fun() {
     BeamInstr *next;
-    $APPLY_FUN();
-    if (next != NULL) {
+    $APPLY_FUN(next);
+    if (ERTS_LIKELY(next != NULL)) {
         SET_CP(c_p, $NEXT_INSTRUCTION);
         $DISPATCH_FUN(next);
     }
@@ -247,8 +243,8 @@ i_apply_fun() {
 
 i_apply_fun_last(Deallocate) {
     BeamInstr *next;
-    $APPLY_FUN();
-    if (next != NULL) {
+    $APPLY_FUN(next);
+    if (ERTS_LIKELY(next != NULL)) {
         $deallocate($Deallocate);
         $DISPATCH_FUN(next);
     }
@@ -257,24 +253,24 @@ i_apply_fun_last(Deallocate) {
 
 i_apply_fun_only() {
     BeamInstr *next;
-    $APPLY_FUN();
-    if (next != NULL) {
+    $APPLY_FUN(next);
+    if (ERTS_LIKELY(next != NULL)) {
         $DISPATCH_FUN(next);
     }
     $HANDLE_APPLY_FUN_ERROR();
 }
 
-CALL_FUN(Fun) {
+CALL_FUN(Fun, Next) {
     //| -no_next
     HEAVY_SWAPOUT;
-    next = call_fun(c_p, $Fun, reg, THE_NON_VALUE);
+    $Next = call_fun(c_p, $Fun, reg, THE_NON_VALUE);
     HEAVY_SWAPIN;
 }
 
 i_call_fun(Fun) {
     BeamInstr *next;
-    $CALL_FUN($Fun);
-    if (next != NULL) {
+    $CALL_FUN($Fun, next);
+    if (ERTS_LIKELY(next != NULL)) {
         SET_CP(c_p, $NEXT_INSTRUCTION);
         $DISPATCH_FUN(next);
     }
@@ -283,8 +279,8 @@ i_call_fun(Fun) {
 
 i_call_fun_last(Fun, Deallocate) {
     BeamInstr *next;
-    $CALL_FUN($Fun);
-    if (next != NULL) {
+    $CALL_FUN($Fun, next);
+    if (ERTS_LIKELY(next != NULL)) {
         $deallocate($Deallocate);
         $DISPATCH_FUN(next);
     }
@@ -378,7 +374,7 @@ element_group.fetch(Src) {
 
 element_group.execute(Fail, Index, Dst) {
     element_index = $Index;
-    if (is_small(element_index) && is_tuple(element_tuple)) {
+    if (ERTS_LIKELY(is_small(element_index) && is_tuple(element_tuple))) {
         Eterm* tp = tuple_val(element_tuple);
 
         if ((signed_val(element_index) >= 1) &&
@@ -402,7 +398,7 @@ fast_element_group.fetch(Src) {
 }
 
 fast_element_group.execute(Fail, Index, Dst) {
-    if (is_tuple(fast_element_tuple)) {
+    if (ERTS_LIKELY(is_tuple(fast_element_tuple))) {
         Eterm* tp = tuple_val(fast_element_tuple);
         Eterm pos = $Index;	/* Untagged integer >= 1 */
         if (pos <= arityval(*tp)) {
@@ -906,5 +902,6 @@ i_raise() {
         c_p->freason = PRIMARY_EXCEPTION(s->freason);
     }
     goto find_func_info;
+    //| -no_next
 }