summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2010-11-23 20:21:45 +0300
committerCyrill Gorcunov <gorcunov@gmail.com>2010-11-23 20:21:45 +0300
commitb8470a470857bc6ead816ecd0543b5c76467d913 (patch)
tree5c205347de190799f1247c7e641c8c204a400189
parentdc7574599487e6d73267cef65bb60a52289ac47d (diff)
downloadnasm-b8470a470857bc6ead816ecd0543b5c76467d913.tar.gz
insns.pl: Fix up merge conflict for sure
Now it should be fixed in real (one code snipped escaped me during merge conflict resolving). Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
-rwxr-xr-xinsns.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/insns.pl b/insns.pl
index 7f830dfa..851d2d06 100755
--- a/insns.pl
+++ b/insns.pl
@@ -442,7 +442,7 @@ sub format_insn($$$$$) {
if ($opp =~ /^(.*[^\d])(8|16|32|64|80|128|256)$/) {
my $ox = $1;
my $on = $2;
- if ($ox !~ /^sbyte$/) {
+ if ($ox !~ /^(sbyte|sdword|udword)$/) {
$opp = $ox;
push(@oppx, "bits$on");
}