Eliminate the -gen_dest macro flag

Instructions that take a 'd' argument needs a -gen_dest flag in their
macros. For example:

  %macro:put_list PutList -pack -gen_dest
  put_list s s d

-gen_dest was needed when x(0) was stored in a register, since it is
not possible to take the address of a register. Now that x(0) is stored
in memory and we can take the address, we can eliminate gen_dest.

3 files changed, 44 insertions, 57 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index a90e6a0ba8..79d751d13e 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -158,7 +158,9 @@ do {                                     \
 /*
  * Register target (X or Y register).
  */
-#define REG_TARGET(Target) (*(((Target) & 1) ? &yb(Target-1) : &xb(Target)))
+
+#define REG_TARGET_PTR(Target) (((Target) & 1) ? &yb(Target-1) : &xb(Target))
+#define REG_TARGET(Target) (*REG_TARGET_PTR(Target))
 
 /*
  * Store a result into a register given a destination descriptor.
@@ -172,8 +174,6 @@ do {                                     \
     REG_TARGET(stb_reg) = (Result);		\
   } while (0)
 
-#define StoreSimpleDest(Src, Dest) Dest = (Src)
-
 /*
  * Store a result into a register and execute the next instruction.
  * Dst points to the word with a destination descriptor, which MUST
@@ -420,7 +420,7 @@ void** beam_ops;
 #define TestHeapPutList(Need, Reg)		\
   do {						\
      TestHeap((Need), 1);			\
-     PutList(Reg, r(0), r(0), StoreSimpleDest);	\
+     PutList(Reg, r(0), r(0));                  \
      CHECK_TERM(r(0));				\
   } while (0)
 
@@ -547,11 +547,11 @@ void** beam_ops;
      GetR((N)+1, Dst2);            \
    } while (0)
 
-#define PutList(H, T, Dst, Store)  \
-  do {                             \
-   HTOP[0] = (H); HTOP[1] = (T);   \
-   Store(make_list(HTOP), Dst);    \
-   HTOP += 2;                      \
+#define PutList(H, T, Dst)                      \
+  do {                                          \
+   HTOP[0] = (H); HTOP[1] = (T);                \
+   Dst = make_list(HTOP);                       \
+   HTOP += 2;                                   \
   } while (0)
 
 #define Swap(R1, R2)				\
@@ -568,11 +568,7 @@ void** beam_ops;
     R2 = Tmp = V;				\
   } while (0)
 
-#define Move(Src, Dst, Store)      \
-   do {                            \
-       Eterm term = (Src);         \
-       Store(term, Dst);           \
-   } while (0)
+#define Move(Src, Dst) Dst = (Src)
 
 #define Move2Par(S1, D1, S2, D2)		\
   do {						\
@@ -911,7 +907,7 @@ do {                                            \
       Target = _uint_size * Unit;				\
    } while (0)
 
-#define BsGetFloat2(Ms, Live, Sz, Flags, Dst, Store, Fail)		\
+#define BsGetFloat2(Ms, Live, Sz, Flags, Dst, Fail)                     \
  do {									\
    ErlBinMatchBuffer *_mb;						\
    Eterm _result; Sint _size;						\
@@ -922,12 +918,12 @@ do {                                            \
    LIGHT_SWAPOUT;							\
    _result = erts_bs_get_float_2(c_p, _size, (Flags), _mb);		\
    LIGHT_SWAPIN;							\
-   HEAP_SPACE_VERIFIED(0);                                          \
+   HEAP_SPACE_VERIFIED(0);                                              \
    if (is_non_value(_result)) { Fail; }					\
-   else { Store(_result, Dst); }					\
+   else { Dst = _result; }                                              \
  } while (0)
 
-#define BsGetBinaryImm_2(Ms, Live, Sz, Flags, Dst, Store, Fail)	\
+#define BsGetBinaryImm_2(Ms, Live, Sz, Flags, Dst, Fail)	\
   do {								\
     ErlBinMatchBuffer *_mb;					\
     Eterm _result;						\
@@ -936,12 +932,12 @@ do {                                            \
     LIGHT_SWAPOUT;						\
     _result = erts_bs_get_binary_2(c_p, (Sz), (Flags), _mb);	\
     LIGHT_SWAPIN;						\
-    HEAP_SPACE_VERIFIED(0);                                 \
+    HEAP_SPACE_VERIFIED(0);                                     \
     if (is_non_value(_result)) { Fail; }			\
-    else { Store(_result, Dst); }				\
+    else { Dst = _result; }                                     \
   } while (0)
 
-#define BsGetBinary_2(Ms, Live, Sz, Flags, Dst, Store, Fail)	\
+#define BsGetBinary_2(Ms, Live, Sz, Flags, Dst, Fail)           \
   do {								\
     ErlBinMatchBuffer *_mb;					\
     Eterm _result; Uint _size;					\
@@ -951,27 +947,27 @@ do {                                            \
     LIGHT_SWAPOUT;						\
     _result = erts_bs_get_binary_2(c_p, _size, (Flags), _mb);	\
     LIGHT_SWAPIN;						\
-    HEAP_SPACE_VERIFIED(0);                                 \
+    HEAP_SPACE_VERIFIED(0);                                     \
     if (is_non_value(_result)) { Fail; }			\
-    else { Store(_result, Dst); }				\
+    else { Dst = _result; }                                     \
   } while (0)
 
-#define BsGetBinaryAll_2(Ms, Live, Unit, Dst, Store, Fail)	\
-  do {								\
-    ErlBinMatchBuffer *_mb;					\
-    Eterm _result;						\
-    TestHeap(ERL_SUB_BIN_SIZE, Live);				\
-    _mb = ms_matchbuffer(Ms);					\
-    if (((_mb->size - _mb->offset) % Unit) == 0) {		\
-      LIGHT_SWAPOUT;						\
-      _result = erts_bs_get_binary_all_2(c_p, _mb);		\
-      LIGHT_SWAPIN;						\
-      HEAP_SPACE_VERIFIED(0);                               \
-      ASSERT(is_value(_result));				\
-      Store(_result, Dst);					\
-    } else {                                                    \
-	HEAP_SPACE_VERIFIED(0);                             \
-	Fail; }						        \
+#define BsGetBinaryAll_2(Ms, Live, Unit, Dst, Fail)	\
+  do {                                                  \
+    ErlBinMatchBuffer *_mb;                             \
+    Eterm _result;                                      \
+    TestHeap(ERL_SUB_BIN_SIZE, Live);                   \
+    _mb = ms_matchbuffer(Ms);                           \
+    if (((_mb->size - _mb->offset) % Unit) == 0) {      \
+      LIGHT_SWAPOUT;                                    \
+      _result = erts_bs_get_binary_all_2(c_p, _mb);     \
+      LIGHT_SWAPIN;                                     \
+      HEAP_SPACE_VERIFIED(0);                           \
+      ASSERT(is_value(_result));                        \
+      Dst = _result;					\
+    } else {                                            \
+	HEAP_SPACE_VERIFIED(0);                         \
+	Fail; }                                         \
  } while (0)
 
 #define BsSkipBits2(Ms, Bits, Unit, Fail)			\
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index 9b5bd7a749..896ab82a50 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -409,7 +409,7 @@ move3 x x x x x x
 move S=n D=y => init D
 move S=c D=y => move S x | move x D
 
-%macro:move Move -pack -gen_dest
+%macro:move Move -pack
 move x x
 move x y
 move y x
@@ -538,7 +538,7 @@ i_put_tuple y I
 #
 put_list Const=c n Dst => move Const x | put_list x n Dst
 
-%macro:put_list PutList -pack -gen_dest
+%macro:put_list PutList -pack
 
 put_list x n x
 put_list y n x
@@ -1209,9 +1209,9 @@ i_bs_get_integer_32 x f I d
 bs_get_binary2 Fail=f Ms=x Live=u Sz=sq Unit=u Flags=u Dst=d => \
 			gen_get_binary2(Fail, Ms, Live, Sz, Unit, Flags, Dst)
 
-%macro: i_bs_get_binary_imm2 BsGetBinaryImm_2 -fail_action -gen_dest
-%macro: i_bs_get_binary2 BsGetBinary_2 -fail_action -gen_dest
-%macro: i_bs_get_binary_all2 BsGetBinaryAll_2 -fail_action -gen_dest
+%macro: i_bs_get_binary_imm2 BsGetBinaryImm_2 -fail_action
+%macro: i_bs_get_binary2 BsGetBinary_2 -fail_action
+%macro: i_bs_get_binary_all2 BsGetBinaryAll_2 -fail_action
 
 i_bs_get_binary_imm2 f x I I I d
 i_bs_get_binary2 f x I s I d
@@ -1224,7 +1224,7 @@ bs_get_float2 Fail=f Ms=x Live=u Sz=s Unit=u Flags=u Dst=d => \
 
 bs_get_float2 Fail=f Ms=x Live=u Sz=q Unit=u Flags=u Dst=d => jump Fail
 
-%macro: i_bs_get_float2 BsGetFloat2 -fail_action -gen_dest
+%macro: i_bs_get_float2 BsGetFloat2 -fail_action
 i_bs_get_float2 f x I s I d
 
 # Miscellanous
diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index 9813142585..b2bc9a17a8 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -928,7 +928,6 @@ sub basic_generator {
     my($tmp_arg_num) = 1;
     my($pack_spec) = '';
     my($var_decls) = '';
-    my($gen_dest_arg) = 'StoreSimpleDest';
     my($i);
     my($no_prefetch) = 0;
 
@@ -994,11 +993,11 @@ sub basic_generator {
 			    push(@f_types, $_);
 			    $prefix .= "GetR($size, $tmp);\n";
 			    last SWITCH; };
-	    /d/    and do { $var_decls .= "Eterm dst; ";
-			    push(@f, "dst");
+	    /d/    and do { $var_decls .= "Eterm dst; Eterm* dst_ptr; ";
+			    push(@f, "*dst_ptr");
 			    push(@f_types, $_);
 			    $prefix .= "dst = Arg($size);\n";
-			    $gen_dest_arg = 'StoreResult';
+			    $prefix .= "dst_ptr = REG_TARGET_PTR(dst);\n";
 			    last SWITCH;
 			};
 	    defined($incl_arg{$_})
@@ -1017,14 +1016,6 @@ sub basic_generator {
     }
 
     #
-    # If requested, pass a pointer to the destination register.
-    # The destination must be the last operand.
-    #
-    if ($flags =~ /-gen_dest/) {
-	push(@f, $gen_dest_arg);
-    }
-
-    #
     # Add a fail action macro if requested.
     #