From b8470a470857bc6ead816ecd0543b5c76467d913 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Tue, 23 Nov 2010 20:21:45 +0300
Subject: [PATCH] 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>
---
 insns.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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");
                         }
-- 
2.11.4.GIT