arc: Change max instruction length to 64-bits

The current handling for arc instructions longer than 32-bits is all
handled as a special case in both the assembler and disassembler.

The problem with this approach is that it leads to code duplication,
selecting a long instruction is exactly the same process as selecting a
short instruction, except over more bits, in both cases we select based
on bit comparison, and initial operand insertion and extraction.

This commit unifies both the long and short instruction worlds,
converting the core opcodes library from being largely 32-bit focused,
to being largely 64-bit focused.

The changes are, on the whole, not too much.  There's obviously a lot of
type changes but otherwise the bulk of the code just works.  Most of the
actual functional changes are to code that previously handled the longer
48 or 64 bit instructions.  The insert/extract handlers for these have
now been brought into line with the short instruction insert/extract
handlers.

All of the special case handling code that was previously added has now
been removed again.  Overall, this commit reduces the amount of code in
the arc assembler and disassembler.

gas/ChangeLog:

	* config/tc-arc.c (struct arc_insn): Change type of insn field.
	(md_number_to_chars_midend): Support 6- and 8-byte values.
	(emit_insn0): Update debug output.
	(find_opcode_match): Likewise.
	(build_fake_opcode_hash_entry): Delete.
	(find_special_case_long_opcode): Delete.
	(find_special_case): Remove long format special case handling.
	(insert_operand): Change instruction type and update debug print
	format.
	(assemble_insn): Change instruction type, update debug print
	formats, and remove unneeded assert.

include/ChangeLog:

	* opcode/arc.h (struct arc_opcode): Change type of opcode and mask
	fields.
	(struct arc_long_opcode): Delete.
	(struct arc_operand): Change types for insert and extract
	handlers.

opcodes/ChangeLog:

	* arc-dis.c (struct arc_operand_iterator): Remove all fields
	relating to long instruction processing, add new limm field.
	(OPCODE): Rename to...
	(OPCODE_32BIT_INSN): ...this.
	(OPCODE_AC): Delete.
	(skip_this_opcode): Handle different instruction lengths, update
	macro name.
	(special_flag_p): Update parameter type.
	(find_format_from_table): Update for more instruction lengths.
	(find_format_long_instructions): Delete.
	(find_format): Update for more instruction lengths.
	(arc_insn_length): Likewise.
	(extract_operand_value): Update for more instruction lengths.
	(operand_iterator_next): Remove code relating to long
	instructions.
	(arc_opcode_to_insn_type): New function.
	(print_insn_arc):Update for more instructions lengths.
	* arc-ext.c (extInstruction_t): Change argument type.
	* arc-ext.h (extInstruction_t): Change argument type.
	* arc-fxi.h: Change type unsigned to unsigned long long
	extensively throughout.
	* arc-nps400-tbl.h: Add long instructions taken from
	arc_long_opcodes table in arc-opc.c.
	* arc-opc.c: Update parameter types on insert/extract handlers.
	(arc_long_opcodes): Delete.
	(arc_num_long_opcodes): Delete.
	(arc_opcode_len): Update for more instruction lengths.

1 files changed, 300 insertions, 482 deletions

diff --git a/opcodes/arc-opc.c b/opcodes/arc-opc.c
index 9eb58d3..ee14fed 100644
--- a/opcodes/arc-opc.c
+++ b/opcodes/arc-opc.c
@@ -31,16 +31,16 @@
    this reduces the chances that regressions might creep in.  */
 
 /* Insert RB register into a 32-bit opcode.  */
-static unsigned
-insert_rb (unsigned insn,
-	   int value,
+static unsigned long long
+insert_rb (unsigned long long insn,
+	   long long int value,
 	   const char **errmsg ATTRIBUTE_UNUSED)
 {
   return insn | ((value & 0x07) << 24) | (((value >> 3) & 0x07) << 12);
 }
 
-static int
-extract_rb (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_rb (unsigned long long insn ATTRIBUTE_UNUSED,
 	    bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = (((insn >> 12) & 0x07) << 3) | ((insn >> 24) & 0x07);
@@ -52,9 +52,9 @@ extract_rb (unsigned insn ATTRIBUTE_UNUSED,
   return value;
 }
 
-static unsigned
-insert_rad (unsigned insn,
-	    int value,
+static unsigned long long
+insert_rad (unsigned long long insn,
+	    long long int value,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value & 0x01)
@@ -63,9 +63,9 @@ insert_rad (unsigned insn,
   return insn | (value & 0x3F);
 }
 
-static unsigned
-insert_rcd (unsigned insn,
-	    int value,
+static unsigned long long
+insert_rcd (unsigned long long insn,
+	    long long int value,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value & 0x01)
@@ -76,9 +76,9 @@ insert_rcd (unsigned insn,
 
 /* Dummy insert ZERO operand function.  */
 
-static unsigned
-insert_za (unsigned insn,
-	   int value,
+static unsigned long long
+insert_za (unsigned long long insn,
+	   long long int value,
 	   const char **errmsg)
 {
   if (value)
@@ -89,9 +89,9 @@ insert_za (unsigned insn,
 /* Insert Y-bit in bbit/br instructions.  This function is called only
    when solving fixups.  */
 
-static unsigned
-insert_Ybit (unsigned insn,
-	     int value,
+static unsigned long long
+insert_Ybit (unsigned long long insn,
+	     long long int value,
 	     const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value > 0)
@@ -103,9 +103,9 @@ insert_Ybit (unsigned insn,
 /* Insert Y-bit in bbit/br instructions.  This function is called only
    when solving fixups.  */
 
-static unsigned
-insert_NYbit (unsigned insn,
-	      int value,
+static unsigned long long
+insert_NYbit (unsigned long long insn,
+	      long long int value,
 	      const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value < 0)
@@ -116,16 +116,16 @@ insert_NYbit (unsigned insn,
 
 /* Insert H register into a 16-bit opcode.  */
 
-static unsigned
-insert_rhv1 (unsigned insn,
-	     int value,
+static unsigned long long
+insert_rhv1 (unsigned long long insn,
+	     long long int value,
 	     const char **errmsg ATTRIBUTE_UNUSED)
 {
   return insn |= ((value & 0x07) << 5) | ((value >> 3) & 0x07);
 }
 
-static int
-extract_rhv1 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_rhv1 (unsigned long long insn ATTRIBUTE_UNUSED,
 	      bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = ((insn & 0x7) << 3) | ((insn >> 5) & 0x7);
@@ -135,9 +135,9 @@ extract_rhv1 (unsigned insn ATTRIBUTE_UNUSED,
 
 /* Insert H register into a 16-bit opcode.  */
 
-static unsigned
-insert_rhv2 (unsigned insn,
-	     int value,
+static unsigned long long
+insert_rhv2 (unsigned long long insn,
+	     long long int value,
 	     const char **errmsg)
 {
   if (value == 0x1E)
@@ -146,8 +146,8 @@ insert_rhv2 (unsigned insn,
   return insn |= ((value & 0x07) << 5) | ((value >> 3) & 0x03);
 }
 
-static int
-extract_rhv2 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_rhv2 (unsigned long long insn ATTRIBUTE_UNUSED,
 	      bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = ((insn >> 5) & 0x07) | ((insn & 0x03) << 3);
@@ -155,9 +155,9 @@ extract_rhv2 (unsigned insn ATTRIBUTE_UNUSED,
   return value;
 }
 
-static unsigned
-insert_r0 (unsigned insn,
-	   int value,
+static unsigned long long
+insert_r0 (unsigned long long insn,
+	   long long int value,
 	   const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 0)
@@ -165,17 +165,17 @@ insert_r0 (unsigned insn,
   return insn;
 }
 
-static int
-extract_r0 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_r0 (unsigned long long insn ATTRIBUTE_UNUSED,
 	    bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 
-static unsigned
-insert_r1 (unsigned insn,
-	   int value,
+static unsigned long long
+insert_r1 (unsigned long long insn,
+	   long long int value,
 	   const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 1)
@@ -183,16 +183,16 @@ insert_r1 (unsigned insn,
   return insn;
 }
 
-static int
-extract_r1 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_r1 (unsigned long long insn ATTRIBUTE_UNUSED,
 	    bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 1;
 }
 
-static unsigned
-insert_r2 (unsigned insn,
-	   int value,
+static unsigned long long
+insert_r2 (unsigned long long insn,
+	   long long int value,
 	   const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 2)
@@ -200,16 +200,16 @@ insert_r2 (unsigned insn,
   return insn;
 }
 
-static int
-extract_r2 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_r2 (unsigned long long insn ATTRIBUTE_UNUSED,
 	    bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 2;
 }
 
-static unsigned
-insert_r3 (unsigned insn,
-	   int value,
+static unsigned long long
+insert_r3 (unsigned long long insn,
+	   long long int value,
 	   const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 3)
@@ -217,16 +217,16 @@ insert_r3 (unsigned insn,
   return insn;
 }
 
-static int
-extract_r3 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_r3 (unsigned long long insn ATTRIBUTE_UNUSED,
 	    bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 3;
 }
 
-static unsigned
-insert_sp (unsigned insn,
-	   int value,
+static unsigned long long
+insert_sp (unsigned long long insn,
+	   long long int value,
 	   const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 28)
@@ -234,16 +234,16 @@ insert_sp (unsigned insn,
   return insn;
 }
 
-static int
-extract_sp (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_sp (unsigned long long insn ATTRIBUTE_UNUSED,
 	    bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 28;
 }
 
-static unsigned
-insert_gp (unsigned insn,
-	   int value,
+static unsigned long long
+insert_gp (unsigned long long insn,
+	   long long int value,
 	   const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 26)
@@ -251,16 +251,16 @@ insert_gp (unsigned insn,
   return insn;
 }
 
-static int
-extract_gp (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_gp (unsigned long long insn ATTRIBUTE_UNUSED,
 	    bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 26;
 }
 
-static unsigned
-insert_pcl (unsigned insn,
-	    int value,
+static unsigned long long
+insert_pcl (unsigned long long insn,
+	    long long int value,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 63)
@@ -268,16 +268,16 @@ insert_pcl (unsigned insn,
   return insn;
 }
 
-static int
-extract_pcl (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_pcl (unsigned long long insn ATTRIBUTE_UNUSED,
 	     bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 63;
 }
 
-static unsigned
-insert_blink (unsigned insn,
-	      int value,
+static unsigned long long
+insert_blink (unsigned long long insn,
+	      long long int value,
 	      const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 31)
@@ -285,16 +285,16 @@ insert_blink (unsigned insn,
   return insn;
 }
 
-static int
-extract_blink (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_blink (unsigned long long insn ATTRIBUTE_UNUSED,
 	       bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 31;
 }
 
-static unsigned
-insert_ilink1 (unsigned insn,
-	       int value,
+static unsigned long long
+insert_ilink1 (unsigned long long insn,
+	       long long int value,
 	       const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 29)
@@ -302,16 +302,16 @@ insert_ilink1 (unsigned insn,
   return insn;
 }
 
-static int
-extract_ilink1 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_ilink1 (unsigned long long insn ATTRIBUTE_UNUSED,
 		bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 29;
 }
 
-static unsigned
-insert_ilink2 (unsigned insn,
-	       int value,
+static unsigned long long
+insert_ilink2 (unsigned long long insn,
+	       long long int value,
 	       const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 30)
@@ -319,16 +319,16 @@ insert_ilink2 (unsigned insn,
   return insn;
 }
 
-static int
-extract_ilink2 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_ilink2 (unsigned long long insn ATTRIBUTE_UNUSED,
 		bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return 30;
 }
 
-static unsigned
-insert_ras (unsigned insn,
-	    int value,
+static unsigned long long
+insert_ras (unsigned long long insn,
+	    long long int value,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
   switch (value)
@@ -352,8 +352,8 @@ insert_ras (unsigned insn,
   return insn;
 }
 
-static int
-extract_ras (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_ras (unsigned long long insn ATTRIBUTE_UNUSED,
 	     bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = insn & 0x07;
@@ -363,9 +363,9 @@ extract_ras (unsigned insn ATTRIBUTE_UNUSED,
     return value;
 }
 
-static unsigned
-insert_rbs (unsigned insn,
-	    int value,
+static unsigned long long
+insert_rbs (unsigned long long insn,
+	    long long int value,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
   switch (value)
@@ -389,8 +389,8 @@ insert_rbs (unsigned insn,
   return insn;
 }
 
-static int
-extract_rbs (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_rbs (unsigned long long insn ATTRIBUTE_UNUSED,
 	     bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = (insn >> 8) & 0x07;
@@ -400,9 +400,9 @@ extract_rbs (unsigned insn ATTRIBUTE_UNUSED,
     return value;
 }
 
-static unsigned
-insert_rcs (unsigned insn,
-	    int value,
+static unsigned long long
+insert_rcs (unsigned long long insn,
+	    long long int value,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
   switch (value)
@@ -426,8 +426,8 @@ insert_rcs (unsigned insn,
   return insn;
 }
 
-static int
-extract_rcs (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_rcs (unsigned long long insn ATTRIBUTE_UNUSED,
 	     bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = (insn >> 5) & 0x07;
@@ -437,9 +437,9 @@ extract_rcs (unsigned insn ATTRIBUTE_UNUSED,
     return value;
 }
 
-static unsigned
-insert_simm3s (unsigned insn,
-	       int value,
+static unsigned long long
+insert_simm3s (unsigned long long insn,
+	       long long int value,
 	       const char **errmsg ATTRIBUTE_UNUSED)
 {
   int tmp = 0;
@@ -478,8 +478,8 @@ insert_simm3s (unsigned insn,
   return insn;
 }
 
-static int
-extract_simm3s (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_simm3s (unsigned long long insn ATTRIBUTE_UNUSED,
 		bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = (insn >> 8) & 0x07;
@@ -489,9 +489,9 @@ extract_simm3s (unsigned insn ATTRIBUTE_UNUSED,
     return value;
 }
 
-static unsigned
-insert_rrange (unsigned insn,
-	       int value,
+static unsigned long long
+insert_rrange (unsigned long long insn,
+	       long long int value,
 	       const char **errmsg ATTRIBUTE_UNUSED)
 {
   int reg1 = (value >> 16) & 0xFFFF;
@@ -510,16 +510,16 @@ insert_rrange (unsigned insn,
   return insn;
 }
 
-static int
-extract_rrange (unsigned insn  ATTRIBUTE_UNUSED,
+static long long int
+extract_rrange (unsigned long long insn  ATTRIBUTE_UNUSED,
 		bfd_boolean * invalid  ATTRIBUTE_UNUSED)
 {
   return (insn >> 1) & 0x0F;
 }
 
-static unsigned
-insert_fpel (unsigned insn,
-	     int value,
+static unsigned long long
+insert_fpel (unsigned long long insn,
+	     long long int value,
 	     const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 27)
@@ -532,16 +532,16 @@ insert_fpel (unsigned insn,
   return insn;
 }
 
-static int
-extract_fpel (unsigned insn  ATTRIBUTE_UNUSED,
+static long long int
+extract_fpel (unsigned long long insn  ATTRIBUTE_UNUSED,
 	      bfd_boolean * invalid  ATTRIBUTE_UNUSED)
 {
   return (insn & 0x0100) ? 27 : -1;
 }
 
-static unsigned
-insert_blinkel (unsigned insn,
-		int value,
+static unsigned long long
+insert_blinkel (unsigned long long insn,
+		long long int value,
 		const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 31)
@@ -554,16 +554,16 @@ insert_blinkel (unsigned insn,
   return insn;
 }
 
-static int
-extract_blinkel (unsigned insn  ATTRIBUTE_UNUSED,
+static long long int
+extract_blinkel (unsigned long long insn  ATTRIBUTE_UNUSED,
 		 bfd_boolean * invalid  ATTRIBUTE_UNUSED)
 {
   return (insn & 0x0200) ? 31 : -1;
 }
 
-static unsigned
-insert_pclel (unsigned insn,
-	      int value,
+static unsigned long long
+insert_pclel (unsigned long long insn,
+	      long long int value,
 	      const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value != 63)
@@ -576,8 +576,8 @@ insert_pclel (unsigned insn,
   return insn;
 }
 
-static int
-extract_pclel (unsigned insn  ATTRIBUTE_UNUSED,
+static long long int
+extract_pclel (unsigned long long insn  ATTRIBUTE_UNUSED,
 	       bfd_boolean * invalid  ATTRIBUTE_UNUSED)
 {
   return (insn & 0x0400) ? 63 : -1;
@@ -586,9 +586,9 @@ extract_pclel (unsigned insn  ATTRIBUTE_UNUSED,
 #define INSERT_W6
 /* mask = 00000000000000000000111111000000
    insn = 00011bbb000000000BBBwwwwwwDaaZZ1.  */
-static unsigned
-insert_w6 (unsigned insn ATTRIBUTE_UNUSED,
-	   int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_w6 (unsigned long long insn ATTRIBUTE_UNUSED,
+	   long long int value ATTRIBUTE_UNUSED,
 	   const char **errmsg ATTRIBUTE_UNUSED)
 {
   insn |= ((value >> 0) & 0x003f) << 6;
@@ -598,8 +598,8 @@ insert_w6 (unsigned insn ATTRIBUTE_UNUSED,
 
 #define EXTRACT_W6
 /* mask = 00000000000000000000111111000000.  */
-static int
-extract_w6 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_w6 (unsigned long long insn ATTRIBUTE_UNUSED,
 	    bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   unsigned value = 0;
@@ -612,9 +612,9 @@ extract_w6 (unsigned insn ATTRIBUTE_UNUSED,
 #define INSERT_G_S
 /* mask = 0000011100022000
    insn = 01000ggghhhGG0HH.  */
-static unsigned
-insert_g_s (unsigned insn ATTRIBUTE_UNUSED,
-	    int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_g_s (unsigned long long insn ATTRIBUTE_UNUSED,
+	    long long int value ATTRIBUTE_UNUSED,
 	    const char **errmsg ATTRIBUTE_UNUSED)
 {
   insn |= ((value >> 0) & 0x0007) << 8;
@@ -625,8 +625,8 @@ insert_g_s (unsigned insn ATTRIBUTE_UNUSED,
 
 #define EXTRACT_G_S
 /* mask = 0000011100022000.  */
-static int
-extract_g_s (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_g_s (unsigned long long insn ATTRIBUTE_UNUSED,
 	     bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = 0;
@@ -642,157 +642,58 @@ extract_g_s (unsigned insn ATTRIBUTE_UNUSED,
 }
 
 /* ARC NPS400 Support: See comment near head of file.  */
-static unsigned
-insert_nps_3bit_dst (unsigned insn ATTRIBUTE_UNUSED,
-                     int value ATTRIBUTE_UNUSED,
-                     const char **errmsg ATTRIBUTE_UNUSED)
-{
-  switch (value)
-    {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      insn |= value << 24;
-      break;
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-      insn |= (value - 8) << 24;
-      break;
-    default:
-      *errmsg = _("Register must be either r0-r3 or r12-r15.");
-      break;
-    }
-  return insn;
-}
-
-static int
-extract_nps_3bit_dst (unsigned insn ATTRIBUTE_UNUSED,
-                      bfd_boolean * invalid ATTRIBUTE_UNUSED)
-{
-  int value = (insn >> 24) & 0x07;
-  if (value > 3)
-    return (value + 8);
-  else
-    return value;
-}
-
-static unsigned
-insert_nps_3bit_dst_short (unsigned insn ATTRIBUTE_UNUSED,
-                           int value ATTRIBUTE_UNUSED,
-                           const char **errmsg ATTRIBUTE_UNUSED)
-{
-  switch (value)
-    {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      insn |= value << 8;
-      break;
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-      insn |= (value - 8) << 8;
-      break;
-    default:
-      *errmsg = _("Register must be either r0-r3 or r12-r15.");
-      break;
-    }
-  return insn;
-}
-
-static int
-extract_nps_3bit_dst_short (unsigned insn ATTRIBUTE_UNUSED,
-                            bfd_boolean * invalid ATTRIBUTE_UNUSED)
-{
-  int value = (insn >> 8) & 0x07;
-  if (value > 3)
-    return (value + 8);
-  else
-    return value;
-}
-
-static unsigned
-insert_nps_3bit_src2 (unsigned insn ATTRIBUTE_UNUSED,
-                      int value ATTRIBUTE_UNUSED,
-                      const char **errmsg ATTRIBUTE_UNUSED)
-{
-  switch (value)
-    {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      insn |= value << 21;
-      break;
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-      insn |= (value - 8) << 21;
-      break;
-    default:
-      *errmsg = _("Register must be either r0-r3 or r12-r15.");
-      break;
-    }
-  return insn;
-}
-
-static int
-extract_nps_3bit_src2 (unsigned insn ATTRIBUTE_UNUSED,
-                       bfd_boolean * invalid ATTRIBUTE_UNUSED)
-{
-  int value = (insn >> 21) & 0x07;
-  if (value > 3)
-    return (value + 8);
-  else
-    return value;
-}
-
-static unsigned
-insert_nps_3bit_src2_short (unsigned insn ATTRIBUTE_UNUSED,
-                            int value ATTRIBUTE_UNUSED,
-                            const char **errmsg ATTRIBUTE_UNUSED)
-{
-  switch (value)
-    {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      insn |= value << 5;
-      break;
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-      insn |= (value - 8) << 5;
-      break;
-    default:
-      *errmsg = _("Register must be either r0-r3 or r12-r15.");
-      break;
-    }
-  return insn;
-}
-
-static int
-extract_nps_3bit_src2_short (unsigned insn ATTRIBUTE_UNUSED,
-                             bfd_boolean * invalid ATTRIBUTE_UNUSED)
-{
-  int value = (insn >> 5) & 0x07;
-  if (value > 3)
-    return (value + 8);
-  else
-    return value;
-}
-
-static unsigned
-insert_nps_bitop_size_2b (unsigned insn ATTRIBUTE_UNUSED,
-                          int value ATTRIBUTE_UNUSED,
+#define MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(NAME,OFFSET)          \
+static unsigned long long					 \
+insert_nps_3bit_reg_at_##OFFSET##_##NAME		         \
+                    (unsigned long long insn ATTRIBUTE_UNUSED,   \
+                     long long int value ATTRIBUTE_UNUSED,	 \
+                     const char **errmsg ATTRIBUTE_UNUSED)	 \
+{								 \
+  switch (value)						 \
+    {								 \
+    case 0:                                                      \
+    case 1:                                                      \
+    case 2:                                                      \
+    case 3:                                                      \
+      insn |= value << (OFFSET);                                 \
+      break;                                                     \
+    case 12:                                                     \
+    case 13:                                                     \
+    case 14:                                                     \
+    case 15:                                                     \
+      insn |= (value - 8) << (OFFSET);                           \
+      break;                                                     \
+    default:                                                     \
+      *errmsg = _("Register must be either r0-r3 or r12-r15.");  \
+      break;                                                     \
+    }                                                            \
+  return insn;                                                   \
+}                                                                \
+                                                                 \
+static long long int						 \
+extract_nps_3bit_reg_at_##OFFSET##_##NAME                        \
+                    (unsigned long long insn ATTRIBUTE_UNUSED,   \
+                     bfd_boolean * invalid ATTRIBUTE_UNUSED)     \
+{                                                                \
+  int value = (insn >> (OFFSET)) & 0x07;			 \
+  if (value > 3)                                                 \
+    value += 8;                                                  \
+  return value;                                                  \
+}                                                                \
+
+MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(dst,8)
+MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(dst,24)
+MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(dst,40)
+MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(dst,56)
+
+MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(src2,5)
+MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(src2,21)
+MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(src2,37)
+MAKE_3BIT_REG_INSERT_EXTRACT_FUNCS(src2,53)
+
+static unsigned long long
+insert_nps_bitop_size_2b (unsigned long long insn ATTRIBUTE_UNUSED,
+                          long long int value ATTRIBUTE_UNUSED,
                           const char **errmsg ATTRIBUTE_UNUSED)
 {
   switch (value)
@@ -819,16 +720,16 @@ insert_nps_bitop_size_2b (unsigned insn ATTRIBUTE_UNUSED,
   return insn;
 }
 
-static int
-extract_nps_bitop_size_2b (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_bitop_size_2b (unsigned long long insn ATTRIBUTE_UNUSED,
                            bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return  1 << ((insn >> 10) & 0x3);
 }
 
-static unsigned
-insert_nps_bitop_uimm8 (unsigned insn ATTRIBUTE_UNUSED,
-                        int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_bitop_uimm8 (unsigned long long insn ATTRIBUTE_UNUSED,
+                        long long int value ATTRIBUTE_UNUSED,
                         const char **errmsg ATTRIBUTE_UNUSED)
 {
   insn |= ((value >> 5) & 7) << 12;
@@ -836,16 +737,16 @@ insert_nps_bitop_uimm8 (unsigned insn ATTRIBUTE_UNUSED,
   return insn;
 }
 
-static int
-extract_nps_bitop_uimm8 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_bitop_uimm8 (unsigned long long insn ATTRIBUTE_UNUSED,
                          bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return (((insn >> 12) & 0x7) << 5) | (insn & 0x1f);
 }
 
-static unsigned
-insert_nps_rflt_uimm6 (unsigned insn ATTRIBUTE_UNUSED,
-                       int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_rflt_uimm6 (unsigned long long insn ATTRIBUTE_UNUSED,
+                       long long int value ATTRIBUTE_UNUSED,
                        const char **errmsg ATTRIBUTE_UNUSED)
 {
   switch (value)
@@ -864,32 +765,32 @@ insert_nps_rflt_uimm6 (unsigned insn ATTRIBUTE_UNUSED,
   return insn;
 }
 
-static int
-extract_nps_rflt_uimm6 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_rflt_uimm6 (unsigned long long insn ATTRIBUTE_UNUSED,
                          bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return (insn >> 6) & 0x3f;
 }
 
-static unsigned
-insert_nps_dst_pos_and_size (unsigned insn ATTRIBUTE_UNUSED,
-                             int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_dst_pos_and_size (unsigned long long insn ATTRIBUTE_UNUSED,
+                             long long int value ATTRIBUTE_UNUSED,
                              const char **errmsg ATTRIBUTE_UNUSED)
 {
   insn |= ((value & 0x1f) | (((32 - value - 1) & 0x1f) << 10));
   return insn;
 }
 
-static int
-extract_nps_dst_pos_and_size (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_dst_pos_and_size (unsigned long long insn ATTRIBUTE_UNUSED,
                               bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return (insn & 0x1f);
 }
 
-static unsigned
-insert_nps_cmem_uimm16 (unsigned insn ATTRIBUTE_UNUSED,
-                        int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_cmem_uimm16 (unsigned long long insn ATTRIBUTE_UNUSED,
+                        long long int value ATTRIBUTE_UNUSED,
                         const char **errmsg ATTRIBUTE_UNUSED)
 {
   int top = (value >> 16) & 0xffff;
@@ -899,17 +800,17 @@ insert_nps_cmem_uimm16 (unsigned insn ATTRIBUTE_UNUSED,
   return insn;
 }
 
-static int
-extract_nps_cmem_uimm16 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_cmem_uimm16 (unsigned long long insn ATTRIBUTE_UNUSED,
                          bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   return (NPS_CMEM_HIGH_VALUE << 16) | (insn & 0xffff);
 }
 
 #define MAKE_SRC_POS_INSERT_EXTRACT_FUNCS(NAME,SHIFT)         \
-static unsigned                                               \
-insert_nps_##NAME##_pos (unsigned insn ATTRIBUTE_UNUSED,      \
-                        int value ATTRIBUTE_UNUSED,           \
+static unsigned long long                                               \
+insert_nps_##NAME##_pos (unsigned long long insn ATTRIBUTE_UNUSED,      \
+                        long long int value ATTRIBUTE_UNUSED,           \
                         const char **errmsg ATTRIBUTE_UNUSED) \
 {                                                             \
  switch (value)                                               \
@@ -928,8 +829,8 @@ insert_nps_##NAME##_pos (unsigned insn ATTRIBUTE_UNUSED,      \
   return insn;                                                \
 }                                                             \
                                                               \
-static int                                                    \
-extract_nps_##NAME##_pos (unsigned insn ATTRIBUTE_UNUSED,     \
+static long long int                                                    \
+extract_nps_##NAME##_pos (unsigned long long insn ATTRIBUTE_UNUSED,     \
                           bfd_boolean * invalid ATTRIBUTE_UNUSED)     \
 {                                                                     \
   return ((insn >> SHIFT) & 0x3) * 8;                                 \
@@ -939,9 +840,9 @@ MAKE_SRC_POS_INSERT_EXTRACT_FUNCS (src2, 12)
 MAKE_SRC_POS_INSERT_EXTRACT_FUNCS (src1, 10)
 
 #define MAKE_BIAS_INSERT_EXTRACT_FUNCS(NAME,LOWER,UPPER,BITS,BIAS,SHIFT)\
-static unsigned                                                         \
-insert_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                      \
-                   int value ATTRIBUTE_UNUSED,                          \
+static unsigned long long                                                         \
+insert_nps_##NAME (unsigned long long insn ATTRIBUTE_UNUSED,                      \
+                   long long int value ATTRIBUTE_UNUSED,                          \
                    const char **errmsg ATTRIBUTE_UNUSED)                \
   {                                                                     \
     if (value < LOWER || value > UPPER)                                 \
@@ -955,8 +856,8 @@ insert_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                      \
     return insn;                                                        \
   }                                                                     \
                                                                         \
-static int                                                              \
-extract_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                     \
+static long long int                                                              \
+extract_nps_##NAME (unsigned long long insn ATTRIBUTE_UNUSED,                     \
                     bfd_boolean * invalid ATTRIBUTE_UNUSED)             \
 {                                                                       \
   return ((insn >> SHIFT) & ((1 << BITS) - 1)) + BIAS;                  \
@@ -974,8 +875,8 @@ MAKE_BIAS_INSERT_EXTRACT_FUNCS (hash_width,1,32,5,1,6)
 MAKE_BIAS_INSERT_EXTRACT_FUNCS (hash_len,1,8,3,1,2)
 MAKE_BIAS_INSERT_EXTRACT_FUNCS (index3,4,7,2,4,0)
 
-static int
-extract_nps_qcmp_m3 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_qcmp_m3 (unsigned long long insn ATTRIBUTE_UNUSED,
                      bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int m3 = (insn >> 5) & 0xf;
@@ -984,8 +885,8 @@ extract_nps_qcmp_m3 (unsigned insn ATTRIBUTE_UNUSED,
   return m3;
 }
 
-static int
-extract_nps_qcmp_m2 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_qcmp_m2 (unsigned long long insn ATTRIBUTE_UNUSED,
                      bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   bfd_boolean tmp_invalid = FALSE;
@@ -997,8 +898,8 @@ extract_nps_qcmp_m2 (unsigned insn ATTRIBUTE_UNUSED,
   return m2;
 }
 
-static int
-extract_nps_qcmp_m1 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_qcmp_m1 (unsigned long long insn ATTRIBUTE_UNUSED,
                      bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   bfd_boolean tmp_invalid = FALSE;
@@ -1011,9 +912,9 @@ extract_nps_qcmp_m1 (unsigned insn ATTRIBUTE_UNUSED,
   return m1;
 }
 
-static unsigned
-insert_nps_calc_entry_size (unsigned insn ATTRIBUTE_UNUSED,
-                            int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_calc_entry_size (unsigned long long insn ATTRIBUTE_UNUSED,
+                            long long int value ATTRIBUTE_UNUSED,
                             const char **errmsg ATTRIBUTE_UNUSED)
 {
   unsigned pwr;
@@ -1036,64 +937,49 @@ insert_nps_calc_entry_size (unsigned insn ATTRIBUTE_UNUSED,
   return insn | (pwr << 8);
 }
 
-static int
-extract_nps_calc_entry_size (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_calc_entry_size (unsigned long long insn ATTRIBUTE_UNUSED,
                              bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   unsigned entry_size = (insn >> 8) & 0xf;
   return 1 << entry_size;
 }
 
-static unsigned
-insert_nps_bitop_mod4_msb (unsigned insn ATTRIBUTE_UNUSED,
-                           int value ATTRIBUTE_UNUSED,
-                           const char **errmsg ATTRIBUTE_UNUSED)
-{
-  return insn | ((value & 0x2) << 30);
-}
-
-static int
-extract_nps_bitop_mod4_msb (unsigned insn ATTRIBUTE_UNUSED,
-                            bfd_boolean * invalid ATTRIBUTE_UNUSED)
-{
-  return (insn >> 30) & 0x2;
-}
-
-static unsigned
-insert_nps_bitop_mod4_lsb (unsigned insn ATTRIBUTE_UNUSED,
-                           int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_bitop_mod4 (unsigned long long insn ATTRIBUTE_UNUSED,
+                           long long int value ATTRIBUTE_UNUSED,
                            const char **errmsg ATTRIBUTE_UNUSED)
 {
-  return insn | ((value & 0x1) << 15);
+  return insn | ((value & 0x2) << 30) | ((value & 0x1) << 47);
 }
 
-static int
-extract_nps_bitop_mod4_lsb (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_bitop_mod4 (unsigned long long insn ATTRIBUTE_UNUSED,
                             bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
-  return (insn >> 15) & 0x1;
+  return ((insn >> 30) & 0x2) | ((insn >> 47) & 0x1);
 }
 
-static unsigned
-insert_nps_bitop_dst_pos3_pos4 (unsigned insn ATTRIBUTE_UNUSED,
-                                int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_bitop_dst_pos3_pos4 (unsigned long long insn ATTRIBUTE_UNUSED,
+                                long long int value ATTRIBUTE_UNUSED,
                                 const char **errmsg ATTRIBUTE_UNUSED)
 {
-  return insn | (value << 10) | (value << 5);
+  return insn | (value << 42) | (value << 37);
 }
 
-static int
-extract_nps_bitop_dst_pos3_pos4 (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_bitop_dst_pos3_pos4 (unsigned long long insn ATTRIBUTE_UNUSED,
                                  bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
-  if (((insn >> 10) & 0x1f) != ((insn >> 5) & 0x1f))
+  if (((insn >> 42) & 0x1f) != ((insn >> 37) & 0x1f))
     *invalid = TRUE;
-  return ((insn >> 5) & 0x1f);
+  return ((insn >> 37) & 0x1f);
 }
 
-static unsigned
-insert_nps_bitop_ins_ext (unsigned insn ATTRIBUTE_UNUSED,
-                          int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_bitop_ins_ext (unsigned long long insn ATTRIBUTE_UNUSED,
+                          long long int value ATTRIBUTE_UNUSED,
                           const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value < 0 || value > 28)
@@ -1101,8 +987,8 @@ insert_nps_bitop_ins_ext (unsigned insn ATTRIBUTE_UNUSED,
   return insn | (value << 20);
 }
 
-static int
-extract_nps_bitop_ins_ext (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_bitop_ins_ext (unsigned long long insn ATTRIBUTE_UNUSED,
                            bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = (insn >> 20) & 0x1f;
@@ -1112,9 +998,9 @@ extract_nps_bitop_ins_ext (unsigned insn ATTRIBUTE_UNUSED,
 }
 
 #define MAKE_1BASED_INSERT_EXTRACT_FUNCS(NAME,SHIFT,UPPER,BITS)         \
-static unsigned                                                         \
-insert_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                      \
-                   int value ATTRIBUTE_UNUSED,                          \
+static unsigned long long                                                         \
+insert_nps_##NAME (unsigned long long insn ATTRIBUTE_UNUSED,                      \
+                   long long int value ATTRIBUTE_UNUSED,                          \
                    const char **errmsg ATTRIBUTE_UNUSED)                \
 {                                                                       \
   if (value < 1 || value > UPPER)                                       \
@@ -1124,8 +1010,8 @@ insert_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                      \
   return insn | (value << SHIFT);                                       \
 }                                                                       \
                                                                         \
-static int                                                              \
-extract_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                     \
+static long long int                                                              \
+extract_nps_##NAME (unsigned long long insn ATTRIBUTE_UNUSED,                     \
                     bfd_boolean * invalid ATTRIBUTE_UNUSED)             \
 {                                                                       \
   int value = (insn >> SHIFT) & ((1 << BITS) - 1);                      \
@@ -1141,9 +1027,9 @@ MAKE_1BASED_INSERT_EXTRACT_FUNCS (bdlen_max_len, 5, 256, 8)
 MAKE_1BASED_INSERT_EXTRACT_FUNCS (bd_num_buff, 6, 8, 3)
 MAKE_1BASED_INSERT_EXTRACT_FUNCS (pmu_num_job, 6, 4, 2)
 
-static unsigned
-insert_nps_min_hofs (unsigned insn ATTRIBUTE_UNUSED,
-                     int value ATTRIBUTE_UNUSED,
+static unsigned long long
+insert_nps_min_hofs (unsigned long long insn ATTRIBUTE_UNUSED,
+                     long long int value ATTRIBUTE_UNUSED,
                      const char **errmsg ATTRIBUTE_UNUSED)
 {
   if (value < 0 || value > 240)
@@ -1154,8 +1040,8 @@ insert_nps_min_hofs (unsigned insn ATTRIBUTE_UNUSED,
   return insn | (value << 6);
 }
 
-static int
-extract_nps_min_hofs (unsigned insn ATTRIBUTE_UNUSED,
+static long long int
+extract_nps_min_hofs (unsigned long long insn ATTRIBUTE_UNUSED,
                       bfd_boolean * invalid ATTRIBUTE_UNUSED)
 {
   int value = (insn >> 6) & 0xF;
@@ -1163,9 +1049,9 @@ extract_nps_min_hofs (unsigned insn ATTRIBUTE_UNUSED,
 }
 
 #define MAKE_INSERT_NPS_ADDRTYPE(NAME,VALUE)                           \
-static unsigned                                                        \
-insert_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                     \
-                   int value ATTRIBUTE_UNUSED,                         \
+static unsigned long long                                              \
+insert_nps_##NAME (unsigned long long insn ATTRIBUTE_UNUSED,           \
+                   long long int value ATTRIBUTE_UNUSED,               \
                    const char **errmsg ATTRIBUTE_UNUSED)               \
 {                                                                      \
   if (value != ARC_NPS400_ADDRTYPE_##VALUE)                            \
@@ -1173,8 +1059,8 @@ insert_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                     \
   return insn;                                                         \
 }                                                                      \
                                                                        \
-static int                                                             \
-extract_nps_##NAME (unsigned insn ATTRIBUTE_UNUSED,                    \
+static long long int                                                   \
+extract_nps_##NAME (unsigned long long insn ATTRIBUTE_UNUSED,          \
                     bfd_boolean * invalid ATTRIBUTE_UNUSED)            \
 {                                                                      \
   return ARC_NPS400_ADDRTYPE_##VALUE;                                  \
@@ -1197,7 +1083,6 @@ MAKE_INSERT_NPS_ADDRTYPE (csd, CSD)
 MAKE_INSERT_NPS_ADDRTYPE (cxa, CXA)
 MAKE_INSERT_NPS_ADDRTYPE (cxd, CXD)
 
-
 /* Include the generic extract/insert functions.  Order is important
    as some of the functions present in the .h may be disabled via
    defines.  */
@@ -1919,13 +1804,13 @@ const struct arc_operand arc_operands[] =
 
   /* ARC NPS400 Support: See comment near head of file.  */
 #define NPS_R_DST_3B	(UIMM6_5_S + 1)
-  { 3, 24, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_dst, extract_nps_3bit_dst },
+  { 3, 24, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_24_dst, extract_nps_3bit_reg_at_24_dst },
 
 #define NPS_R_SRC1_3B	(NPS_R_DST_3B + 1)
-  { 3, 24, 0, ARC_OPERAND_IR | ARC_OPERAND_DUPLICATE | ARC_OPERAND_NCHK, insert_nps_3bit_dst, extract_nps_3bit_dst },
+  { 3, 24, 0, ARC_OPERAND_IR | ARC_OPERAND_DUPLICATE | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_24_dst, extract_nps_3bit_reg_at_24_dst },
 
 #define NPS_R_SRC2_3B	(NPS_R_SRC1_3B + 1)
-  { 3, 21, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_src2, extract_nps_3bit_src2 },
+  { 3, 21, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_21_src2, extract_nps_3bit_reg_at_21_src2 },
 
 #define NPS_R_DST	(NPS_R_SRC2_3B + 1)
   { 6, 21, 0, ARC_OPERAND_IR, NULL, NULL },
@@ -2003,13 +1888,13 @@ const struct arc_operand arc_operands[] =
   { 0, 0, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_calc_entry_size, extract_nps_calc_entry_size },
 
 #define NPS_R_DST_3B_SHORT	(NPS_CALC_ENTRY_SIZE + 1)
-  { 3, 8, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_dst_short, extract_nps_3bit_dst_short },
+  { 3, 8, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_8_dst, extract_nps_3bit_reg_at_8_dst },
 
 #define NPS_R_SRC1_3B_SHORT	(NPS_R_DST_3B_SHORT + 1)
-  { 3, 8, 0, ARC_OPERAND_IR | ARC_OPERAND_DUPLICATE | ARC_OPERAND_NCHK, insert_nps_3bit_dst_short, extract_nps_3bit_dst_short },
+  { 3, 8, 0, ARC_OPERAND_IR | ARC_OPERAND_DUPLICATE | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_8_dst, extract_nps_3bit_reg_at_8_dst },
 
 #define NPS_R_SRC2_3B_SHORT	(NPS_R_SRC1_3B_SHORT + 1)
-  { 3, 5, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_src2_short, extract_nps_3bit_src2_short },
+  { 3, 5, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_5_src2, extract_nps_3bit_reg_at_5_src2 },
 
 #define NPS_BITOP_SIZE2		(NPS_R_SRC2_3B_SHORT + 1)
   { 5, 25, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_bitop2_size, extract_nps_bitop2_size },
@@ -2021,10 +1906,10 @@ const struct arc_operand arc_operands[] =
   { 5, 0, 0, ARC_OPERAND_UNSIGNED, insert_nps_bitop_dst_pos3_pos4, extract_nps_bitop_dst_pos3_pos4 },
 
 #define NPS_BITOP_DST_POS4		(NPS_BITOP_DST_POS3_POS4 + 1)
-  { 5, 10, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
+  { 5, 42, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
 
 #define NPS_BITOP_DST_POS3		(NPS_BITOP_DST_POS4 + 1)
-  { 5, 5, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
+  { 5, 37, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
 
 #define NPS_BITOP_DST_POS2		(NPS_BITOP_DST_POS3 + 1)
   { 5, 15, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
@@ -2033,7 +1918,7 @@ const struct arc_operand arc_operands[] =
   { 5, 10, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
 
 #define NPS_BITOP_SRC_POS4		(NPS_BITOP_DST_POS1 + 1)
-  { 5, 0, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
+  { 5, 32, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
 
 #define NPS_BITOP_SRC_POS3		(NPS_BITOP_SRC_POS4 + 1)
   { 5, 20, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
@@ -2044,13 +1929,10 @@ const struct arc_operand arc_operands[] =
 #define NPS_BITOP_SRC_POS1		(NPS_BITOP_SRC_POS2 + 1)
   { 5, 0, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
 
-#define NPS_BITOP_MOD4_MSB		(NPS_BITOP_SRC_POS1 + 1)
-  { 2, 0, 0, ARC_OPERAND_UNSIGNED, insert_nps_bitop_mod4_msb, extract_nps_bitop_mod4_msb },
-
-#define NPS_BITOP_MOD4_LSB		(NPS_BITOP_MOD4_MSB + 1)
-  { 2, 0, 0, ARC_OPERAND_UNSIGNED, insert_nps_bitop_mod4_lsb, extract_nps_bitop_mod4_lsb },
+#define NPS_BITOP_MOD4			(NPS_BITOP_SRC_POS1 + 1)
+  { 2, 0, 0, ARC_OPERAND_UNSIGNED, insert_nps_bitop_mod4, extract_nps_bitop_mod4 },
 
-#define NPS_BITOP_MOD3		(NPS_BITOP_MOD4_LSB + 1)
+#define NPS_BITOP_MOD3		(NPS_BITOP_MOD4 + 1)
   { 2, 29, 0, ARC_OPERAND_UNSIGNED, NULL, NULL },
 
 #define NPS_BITOP_MOD2		(NPS_BITOP_MOD3 + 1)
@@ -2091,7 +1973,7 @@ const struct arc_operand arc_operands[] =
 
   /* NPS_DPI_SRC1_3B is similar to NPS_R_SRC1_3B but doesn't duplicate an operand */
 #define NPS_DPI_SRC1_3B    (NPS_DPI_DST + 1)
-  { 3, 24, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_dst, extract_nps_3bit_dst },
+  { 3, 24, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_24_dst, extract_nps_3bit_reg_at_24_dst },
 
 #define NPS_HASH_WIDTH       (NPS_DPI_SRC1_3B + 1)
   { 5, 6, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_hash_width, extract_nps_hash_width },
@@ -2188,6 +2070,24 @@ const struct arc_operand arc_operands[] =
 
 #define NPS_PMU_NUM_JOB     (NPS_PMU_NXT_DST + 1)
   { 2, 6, 0, ARC_OPERAND_UNSIGNED | ARC_OPERAND_NCHK, insert_nps_pmu_num_job, extract_nps_pmu_num_job },
+
+#define NPS_R_DST_3B_48	(NPS_PMU_NUM_JOB + 1)
+  { 3, 40, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_40_dst, extract_nps_3bit_reg_at_40_dst },
+
+#define NPS_R_SRC1_3B_48	(NPS_R_DST_3B_48 + 1)
+  { 3, 40, 0, ARC_OPERAND_IR | ARC_OPERAND_DUPLICATE | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_40_dst, extract_nps_3bit_reg_at_40_dst },
+
+#define NPS_R_SRC2_3B_48	(NPS_R_SRC1_3B_48 + 1)
+  { 3, 37, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_37_src2, extract_nps_3bit_reg_at_37_src2 },
+
+#define NPS_R_DST_3B_64		(NPS_R_SRC2_3B_48 + 1)
+  { 3, 56, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_56_dst, extract_nps_3bit_reg_at_56_dst },
+
+#define NPS_R_SRC1_3B_64	(NPS_R_DST_3B_64 + 1)
+  { 3, 56, 0, ARC_OPERAND_IR | ARC_OPERAND_DUPLICATE | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_56_dst, extract_nps_3bit_reg_at_56_dst },
+
+#define NPS_R_SRC2_3B_64	(NPS_R_SRC1_3B_64 + 1)
+  { 3, 53, 0, ARC_OPERAND_IR | ARC_OPERAND_NCHK, insert_nps_3bit_reg_at_53_src2, extract_nps_3bit_reg_at_53_src2 },
 };
 
 const unsigned arc_num_operands = ARRAY_SIZE (arc_operands);
@@ -2560,101 +2460,19 @@ const struct arc_opcode arc_relax_opcodes[] =
 
 const unsigned arc_num_relax_opcodes = ARRAY_SIZE (arc_relax_opcodes);
 
-/* The following instructions are all either 48 or 64 bits long, and
-   require special handling in the assembler and disassembler.
-
-   The first part of each ARC_LONG_OPCODE is the base ARC_OPCODE, this is
-   either the 16 or 32 bit base instruction, and its opcode list will
-   always end in a LIMM.
-
-   The rest of the ARC_LONG_OPCODE describes how to build the LIMM from the
-   instruction operands.  There are therefore two lists of operands for
-   each ARC_LONG_OPCODE, the second list contains operands that are merged
-   into the limm template, in the same way that a standard 32-bit
-   instruction is built.  This generated limm is then added to the list of
-   tokens that is passed to the standard instruction encoder, along with
-   the first list of operands (from the base arc_opcode).
-
-   The first list of operands then, describes how to build the base
-   instruction, and includes the 32-bit limm that was previously generated
-   as the last operand.
-
-   In most cases operands are either encoded into the base instruction or
-   into the limm.  When this happens the operand slot will be filled with
-   an operand identifier in one list, and will be IGNORED in the other
-   list, this special operand value causes the operand to be ignored,
-   without being encoded at this point.
-
-   However, in some cases, an operand is split between the base instruction
-   and the 32-bit limm, in this case the operand slot will be filled in
-   both operand lists (see mov4b for one example of this).   */
-const struct arc_long_opcode arc_long_opcodes[] =
-  {
-    /* mrgb - (48 bit instruction).  */
-    { { "mrgb", 0x5803, 0xf81f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B_SHORT, NPS_R_SRC1_3B_SHORT, NPS_R_SRC2_3B_SHORT, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, LIMM }, { 0 }},
-      0x00000000, 0x80000000, { IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_SRC_POS1, NPS_BITOP_SIZE1, NPS_BITOP_DST_POS2, NPS_BITOP_SRC_POS2, NPS_BITOP_SIZE2 }},
-
-    /* mrgb.cl - (48 bit instruction).  */
-    { { "mrgb", 0x5803, 0xf81f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B_SHORT, NPS_R_SRC1_3B_SHORT, NPS_R_SRC2_3B_SHORT, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, LIMM }, { C_NPS_CL }},
-      0x80000000, 0x80000000, { IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_SRC_POS1, NPS_BITOP_SIZE1, NPS_BITOP_DST_POS2, NPS_BITOP_SRC_POS2, NPS_BITOP_SIZE2 }},
-
-    /* mov2b - (48 bit instruction).  */
-    { { "mov2b", 0x5800, 0xf81f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B_SHORT, NPS_R_SRC1_3B_SHORT, NPS_R_SRC2_3B_SHORT,  IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, LIMM }, { 0 }},
-      0x00000000, 0x80000000, { IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_MOD1, NPS_BITOP_SRC_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_MOD2, NPS_BITOP_SRC_POS2 }},
-
-    /* mov2b.cl - (48 bit instruction).  */
-    { { "mov2b", 0x5800, 0xf81f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B_SHORT, NPS_R_SRC2_3B_SHORT,  IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, LIMM }, { C_NPS_CL }},
-      0x80000000, 0x80000000, { IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_MOD1, NPS_BITOP_SRC_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_MOD2, NPS_BITOP_SRC_POS2 }},
-
-    /* ext4 - (48 bit instruction).  */
-    { { "ext4b", 0x5801, 0xf81f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B_SHORT, NPS_R_SRC1_3B_SHORT, NPS_R_SRC2_3B_SHORT,  IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, LIMM }, { 0 }},
-      0x00000000, 0x80000000, { IGNORED, IGNORED, IGNORED, NPS_BITOP_INS_EXT, NPS_BITOP_SRC_POS1, NPS_BITOP_SRC_POS2, NPS_BITOP_DST_POS1, NPS_BITOP_DST_POS2 }},
-
-    /* ext4.cl - (48 bit instruction).  */
-    { { "ext4b", 0x5801, 0xf81f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B_SHORT, NPS_R_SRC2_3B_SHORT,  IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, LIMM }, { C_NPS_CL }},
-      0x80000000, 0x80000000, { IGNORED, IGNORED, NPS_BITOP_INS_EXT, NPS_BITOP_SRC_POS1, NPS_BITOP_SRC_POS2, NPS_BITOP_DST_POS1, NPS_BITOP_DST_POS2 }},
-
-    /* ins4 - (48 bit instruction).  */
-    { { "ins4b", 0x5802, 0xf81f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B_SHORT, NPS_R_SRC1_3B_SHORT, NPS_R_SRC2_3B_SHORT,  IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, LIMM }, { 0 }},
-      0x00000000, 0x80000000, { IGNORED, IGNORED, IGNORED, NPS_BITOP_SRC_POS1, NPS_BITOP_SRC_POS2, NPS_BITOP_DST_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_INS_EXT }},
-
-    /* ins4.cl - (48 bit instruction).  */
-    { { "ins4b", 0x5802, 0xf81f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B_SHORT, NPS_R_SRC2_3B_SHORT,  IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, LIMM }, { C_NPS_CL }},
-      0x80000000, 0x80000000, { IGNORED, IGNORED, NPS_BITOP_SRC_POS1, NPS_BITOP_SRC_POS2, NPS_BITOP_DST_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_INS_EXT }},
-
-    /* mov3b - (64 bit instruction).  */
-    { { "mov3b", 0x58100000, 0xf81f801f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS3_POS4, IGNORED, IGNORED, LIMM }, { 0 }},
-      0x80000000, 0x80000000, { IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_MOD1, NPS_BITOP_SRC_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_MOD2, NPS_BITOP_SRC_POS2, IGNORED, NPS_BITOP_MOD3, NPS_BITOP_SRC_POS3 }},
-
-    /* mov4b - (64 bit instruction).  */
-    { { "mov4b", 0x58100000, 0xf81f0000, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B, NPS_R_SRC1_3B, NPS_R_SRC2_3B, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS3, IGNORED, IGNORED, NPS_BITOP_DST_POS4, NPS_BITOP_MOD4_LSB, NPS_BITOP_SRC_POS4, LIMM }, { 0 }},
-      0x00000000, 0x00000000, { IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_MOD1, NPS_BITOP_SRC_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_MOD2, NPS_BITOP_SRC_POS2, IGNORED, NPS_BITOP_MOD3, NPS_BITOP_SRC_POS3, IGNORED, NPS_BITOP_MOD4_MSB, IGNORED}},
-
-    /* mov3bcl - (64 bit instruction).  */
-    { { "mov3bcl", 0x58110000, 0xf81f801f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B, NPS_R_SRC2_3B, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS3_POS4, IGNORED, IGNORED, LIMM }, { 0 }},
-      0x80000000, 0x80000000, { IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_MOD1, NPS_BITOP_SRC_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_MOD2, NPS_BITOP_SRC_POS2, IGNORED, NPS_BITOP_MOD3, NPS_BITOP_SRC_POS3 }},
-
-    /* mov4bcl - (64 bit instruction).  */
-    { { "mov4bcl", 0x58110000, 0xf81f0000, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B, NPS_R_SRC2_3B, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS3, IGNORED, IGNORED, NPS_BITOP_DST_POS4, NPS_BITOP_MOD4_LSB, NPS_BITOP_SRC_POS4, LIMM }, { 0 }},
-      0x00000000, 0x00000000, { IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_MOD1, NPS_BITOP_SRC_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_MOD2, NPS_BITOP_SRC_POS2, IGNORED, NPS_BITOP_MOD3, NPS_BITOP_SRC_POS3, IGNORED, NPS_BITOP_MOD4_MSB, IGNORED}},
-
-    /* mov3b.cl - (64 bit instruction).  */
-    { { "mov3b", 0x58110000, 0xf81f801f, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B, NPS_R_SRC2_3B, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS3_POS4, IGNORED, IGNORED, LIMM }, { C_NPS_CL }},
-      0x80000000, 0x80000000, { IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_MOD1, NPS_BITOP_SRC_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_MOD2, NPS_BITOP_SRC_POS2, IGNORED, NPS_BITOP_MOD3, NPS_BITOP_SRC_POS3 }},
-
-    /* mov4b.cl - (64 bit instruction).  */
-    { { "mov4b", 0x58110000, 0xf81f0000, ARC_OPCODE_ARC700, BITOP, NPS400, { NPS_R_DST_3B, NPS_R_SRC2_3B, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, IGNORED, NPS_BITOP_DST_POS3, IGNORED, IGNORED, NPS_BITOP_DST_POS4, NPS_BITOP_MOD4_LSB, NPS_BITOP_SRC_POS4, LIMM }, { C_NPS_CL }},
-      0x00000000, 0x00000000, { IGNORED, IGNORED, NPS_BITOP_DST_POS1, NPS_BITOP_MOD1, NPS_BITOP_SRC_POS1, NPS_BITOP_DST_POS2, NPS_BITOP_MOD2, NPS_BITOP_SRC_POS2, IGNORED, NPS_BITOP_MOD3, NPS_BITOP_SRC_POS3, IGNORED, NPS_BITOP_MOD4_MSB, IGNORED}},
-};
-
-const unsigned arc_num_long_opcodes = ARRAY_SIZE (arc_long_opcodes);
-
-/* Return length of instruction represented by OPCODE in bytes.  */
+/* Return length of an opcode in bytes.  */
 
 int
 arc_opcode_len (const struct arc_opcode *opcode)
 {
   if (opcode->mask < 0x10000ull)
     return 2;
-  return 4;
+
+  if (opcode->mask < 0x100000000ull)
+    return 4;
+
+  if (opcode->mask < 0x1000000000000ull)
+    return 6;
+
+  return 8;
 }