[ARC] Fix support for double assist instructions.

[binutils-gdb.git] / opcodes / sh-opc.h

diff --git a/opcodes/sh-opc.h b/opcodes/sh-opc.h
index 70ed8897aad77b0cdea974885e9feb5f54c0df7a..b2bbbfdc489c42716730e7974d9792cb29fe62ee 100644 (file)
--- a/opcodes/sh-opc.h
+++ b/opcodes/sh-opc.h
@@ -1,5 +1,5 @@
 /* Definitions for SH opcodes.
-   Copyright (C) 1993-2015 Free Software Foundation, Inc.
+   Copyright (C) 1993-2016 Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
 
@@ -201,10 +201,10 @@ typedef enum
 sh_dsp_reg_nums;
 
 /* Return a mask with bits LO to HI (inclusive) set.  */
-#define MASK(LO,HI)  (  LO < 1   ? ((1 << (HI + 1)) - 1) \
-                     : HI > 30  ? (-1 << LO) \
-                     : LO == HI ? (1 << LO) \
-                     :            (((1 << (HI + 1)) - 1) & (-1 << LO)))
+#define MASK(LO,HI)  (  LO < 1   ? ((1U << (HI + 1)) - 1) \
+                     : HI > 30  ? (-1U << LO)   \
+                     : LO == HI ? (1U << LO) \
+                     :            (((1U << (HI + 1)) - 1) & (-1U << LO)))
 
 #define arch_sh1_base      (1 << 0)
 #define arch_sh2_base      (1 << 1)
@@ -371,7 +371,7 @@ SH4AL-dsp                                          SH4A
 
 typedef struct
 {
-  char *name;
+  const char *name;
   sh_arg_type arg[4];
   sh_nibble_type nibbles[9];
   unsigned int arch;