Change the size field of MSP430_Opcode_Decoded to a plain integer.

The size field was defined as an instance of an enum, but existing code
treats the size field as a plain integer containing a bit count.

include/ChangeLog:

	* opcode/msp430-decode.h (MSP430_Size): Remove.
	(Msp430_Opcode_Decoded): Change type of size to int.

diff --git a/include/ChangeLog b/include/ChangeLog
index 722b8a5..46a2f3a 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-14  John Baldwin  <jhb@FreeBSD.org>
+
+       * opcode/msp430-decode.h (MSP430_Size): Remove.
+       (Msp430_Opcode_Decoded): Change type of size to int.
+
 2016-06-11  Alan Modra  <amodra@gmail.com>
 
        * coff/sparc.h (COFF_ADJUST_SYM_OUT_POST): Define.

diff --git a/include/opcode/msp430-decode.h b/include/opcode/msp430-decode.h
index b19a51a..f9e1b4c 100644 (file)
--- a/include/opcode/msp430-decode.h
+++ b/include/opcode/msp430-decode.h
@@ -87,13 +87,6 @@ typedef struct
   unsigned char               condition : 3;
 } MSP430_Opcode_Operand;
 
-typedef enum
-{
-  MSP430_Byte = 0,
-  MSP430_Word,
-  MSP430_Addr
-} MSP430_Size;
-
 /* These numerically match the bit encoding.  */
 typedef enum
 {
@@ -125,7 +118,7 @@ typedef struct
   unsigned             repeats:5;      /* Contains COUNT-1, or register number.  */
   int                  n_bytes;        /* Opcode size in BYTES.  */
   char *               syntax;
-  MSP430_Size          size;           /* Operand size in BITS.  */
+  int                  size;           /* Operand size in BITS.  */
   MSP430_Condition     cond;
   /* By convention, these are [0]destination, [1]source.  */
   MSP430_Opcode_Operand        op[2];