Teach beam_makeops to pack operands for move3 and move_window

It is currently only possible to pack up to 4 operands. However,
the move_window4 instrucion has 5 operands and move_window5 and
move3 instrucations have 6 operands.

Teach beam_makeops to pack instructions with 5 or 6 operands.
Also rewrite the move_window instructions in beam_emu.c to macros
to allow their operands to get packed.

1 files changed, 21 insertions, 9 deletions

diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index 974b29e9d8..44977ecffc 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -54,6 +54,11 @@ $pack_mask[4]  = ['BEAM_LOOSE_MASK', # Only for 64 bit wordsize
 		  'BEAM_LOOSE_MASK',
 		  $WHOLE_WORD];
 
+# Mapping from packagable arguments to number of packed arguments per
+# word.  Initialized after the wordsize is known.
+
+my @args_per_word;
+
 # There are two types of instructions: generic and specific.
 # The generic instructions are those generated by the Beam compiler.
 # Corresponding to each generic instruction, there is generally a
@@ -237,6 +242,20 @@ while (@ARGV && $ARGV[0] =~ /^-(.*)/) {
 }
 
 #
+# Initialize number of arguments per packed word.
+#
+
+$args_per_word[2] = 2;
+$args_per_word[3] = 3;
+$args_per_word[4] = 2;
+$args_per_word[5] = 3;
+$args_per_word[6] = 3;
+
+if ($wordsize == 64) {
+    $args_per_word[4] = 4;
+}
+
+#
 # Parse the input files.
 #
 
@@ -736,7 +755,7 @@ sub init_item {
 	    print "${sep}NULL";
 	} elsif (/^\{/) {
 	    print "$sep$_";
-	} elsif (/^-?\d/) {
+	} elsif (/^-?\d+$/) {
 	    print "$sep$_";
 	} else {
 	    print "$sep\"$_\"";
@@ -1105,7 +1124,6 @@ sub do_pack {
     # Get out of here if too few or too many arguments.
     #
     return ('', '', @args) if $packable_args < 2;
-    &error("too many packable arguments") if $packable_args > 4;
 
     my($size) = 0;
     my($pack_prefix) = '';
@@ -1113,14 +1131,8 @@ sub do_pack {
 				# beginning).
     my($up) = '';		# Pack commands (storing back while
 				# moving forward).
-    my $args_per_word;
-    if ($packable_args < 4 or $wordsize == 64) {
-	$args_per_word = $packable_args;
-    } else {
-	# 4 packable argument, 32 bit wordsize. Need 2 words.
-	$args_per_word = 2;
-    }
 
+    my $args_per_word = $args_per_word[$packable_args];
     my @shift;
     my @mask;
     my @instr;