Don't generate multi-byte NOPs for i686.

[deliverable/binutils-gdb.git] / opcodes / xstormy16-ibld.c

diff --git a/opcodes/xstormy16-ibld.c b/opcodes/xstormy16-ibld.c
index 06e2f1a17fa27e73b2d6a6b63a4b357163da9276..caae89ba34e0109460e753d9bec9a154de79e7ac 100644 (file)
--- a/opcodes/xstormy16-ibld.c
+++ b/opcodes/xstormy16-ibld.c
@@ -33,6 +33,7 @@
 #include "symcat.h"
 #include "xstormy16-desc.h"
 #include "xstormy16-opc.h"
+#include "cgen/basic-modes.h"
 #include "opintl.h"
 #include "safe-ctype.h"
 
@@ -137,7 +138,7 @@ insert_normal (CGEN_CPU_DESC cd,
   if (length == 0)
     return NULL;
 
-  if (word_length > 32)
+  if (word_length > 8 * sizeof (CGEN_INSN_INT))
     abort ();
 
   /* For architectures with insns smaller than the base-insn-bitsize,
@@ -441,7 +442,7 @@ extract_normal (CGEN_CPU_DESC cd,
       return 1;
     }
 
-  if (word_length > 32)
+  if (word_length > 8 * sizeof (CGEN_INSN_INT))
     abort ();
 
   /* For architectures with insns smaller than the insn-base-bitsize,
@@ -468,7 +469,7 @@ extract_normal (CGEN_CPU_DESC cd,
     {
       unsigned char *bufp = ex_info->insn_bytes + word_offset / 8;
 
-      if (word_length > 32)
+      if (word_length > 8 * sizeof (CGEN_INSN_INT))
        abort ();
 
       if (fill_cache (cd, ex_info, word_offset / 8, word_length / 8, pc) == 0)
@@ -587,7 +588,7 @@ xstormy16_cgen_insert_operand (CGEN_CPU_DESC cd,
       {
 {
   FLD (f_abs24_1) = ((FLD (f_abs24)) & (255));
-  FLD (f_abs24_2) = ((unsigned int) (FLD (f_abs24)) >> (8));
+  FLD (f_abs24_2) = ((UINT) (FLD (f_abs24)) >> (8));
 }
         errmsg = insert_normal (cd, fields->f_abs24_1, 0, 0, 8, 8, 32, total_length, buffer);
         if (errmsg)
@@ -647,7 +648,7 @@ xstormy16_cgen_insert_operand (CGEN_CPU_DESC cd,
     case XSTORMY16_OPERAND_REL12A :
       {
         long value = fields->f_rel12a;
-        value = ((int) (((value) - (((pc) + (2))))) >> (1));
+        value = ((SI) (((value) - (((pc) + (2))))) >> (1));
         errmsg = insert_normal (cd, value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 4, 11, 32, total_length, buffer);
       }
       break;