From: Peter Johnson <peter@tortall.net>
Date: Sat, 1 Dec 2001 06:10:19 +0000 (-0000)
Subject: Fix bug with ONE generation (overwrote both [0] and [1] indexes with opcode
X-Git-Tag: v0.1.0~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff1fba3febcfc7c32597269a25dfbfd4b14e0d57;p=yasm

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 26108c31..8160c0eb 100755
--- 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 26108c31..8160c0eb 100755
--- 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++);
 			}