Fix bug with ONE generation (overwrote both [0] and [1] indexes with opcode

for ONE version).

svn path=/trunk/yasm/; revision=366

diff --git a/modules/parsers/nasm/gen_instr.pl b/modules/parsers/nasm/gen_instr.pl
index 26108c3134aeb23c5207d2cde2128906365c2758..8160c0eb95d68c322111659408f4c4c58eb85f11 100755 (executable)
--- a/modules/parsers/nasm/gen_instr.pl
+++ b/modules/parsers/nasm/gen_instr.pl
@@ -739,6 +739,7 @@ sub output_yacc ($@)
                            $tokens =~ s/imm8x/imm/;
                            die "no space for ONE?" if $args[3] !~ m/0;/;
                            my $oneval = $ONE->[3]->[2];
+                           $oneval =~ s/(idata\.op\[\d\]=)|;//g;
                            $args[3] =~ s/0/$oneval/;
                            print GRAMMAR action_setshiftflag ($rule, $tokens, $func, \@args, $count++);
                        }

diff --git a/src/parsers/nasm/gen_instr.pl b/src/parsers/nasm/gen_instr.pl
index 26108c3134aeb23c5207d2cde2128906365c2758..8160c0eb95d68c322111659408f4c4c58eb85f11 100755 (executable)
--- a/src/parsers/nasm/gen_instr.pl
+++ b/src/parsers/nasm/gen_instr.pl
@@ -739,6 +739,7 @@ sub output_yacc ($@)
                            $tokens =~ s/imm8x/imm/;
                            die "no space for ONE?" if $args[3] !~ m/0;/;
                            my $oneval = $ONE->[3]->[2];
+                           $oneval =~ s/(idata\.op\[\d\]=)|;//g;
                            $args[3] =~ s/0/$oneval/;
                            print GRAMMAR action_setshiftflag ($rule, $tokens, $func, \@args, $count++);
                        }