aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/utils
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-08-05 15:15:43 +0200
committerBjörn Gustavsson <[email protected]>2011-10-11 11:36:36 +0200
commit3f8f70e8594ee956dba7edb3602dc9e26e144a69 (patch)
tree319ec392c6687f35fa8a5d6e4e3be34fd81d13af /erts/emulator/utils
parentcac63dbe2da001e050be70664cb6421cdea33430 (diff)
downloadotp-3f8f70e8594ee956dba7edb3602dc9e26e144a69.tar.gz
otp-3f8f70e8594ee956dba7edb3602dc9e26e144a69.tar.bz2
otp-3f8f70e8594ee956dba7edb3602dc9e26e144a69.zip
Merge 'next_instr' and 'is_op' into 'next_instr'
'next_instr' is always followed by 'is_op'.
Diffstat (limited to 'erts/emulator/utils')
-rwxr-xr-xerts/emulator/utils/beam_makeops11
1 files changed, 4 insertions, 7 deletions
diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index d71531a1f1..5e86356e10 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -1416,10 +1416,8 @@ sub tr_gen_from {
my $var;
my(@args);
- my $next_instr = pop(@code); # Get rid of 'next_instr'
push(@fix_pred_funcs, scalar(@code));
push(@code, [$name, @ops]);
- push(@code, $next_instr);
next;
}
@@ -1431,7 +1429,7 @@ sub tr_gen_from {
unless defined $gen_opnum{$name,$arity};
$opnum = $gen_opnum{$name,$arity};
- push(@code, &make_op("$name/$arity", 'is_op', $opnum));
+ push(@code, make_op("$name/$arity", 'next_instr', $opnum));
$min_window++;
foreach $op (@ops) {
my($var, $type, $type_val, $cond, $val) = @$op;
@@ -1506,16 +1504,15 @@ sub tr_gen_from {
push(@code, &make_op($ignored_var, 'next_arg'));
}
}
- # Remove redundant 'next_arg' instructions before 'next_instr'.
+
+ # Remove redundant 'next_arg' instructions before the end
+ # of the instruction.
pop(@code) while is_instr($code[$#code], 'next_arg');
- push(@code, &make_op('', 'next_instr'));
}
#
# Insert the commit operation.
#
- pop(@code); # Get rid of 'next_instr'
-
push(@code, make_op($may_fail ? '' : 'always reached', 'commit'));
#