X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fd30v-dis.c;h=972d367ad75ae82a89554c13a17dc5e76be55325;hb=41dc8db876c8ee46687555fbff68b497b48d5ee4;hp=ec21305dc8c058c31330d85f98b82883c5408481;hpb=9b201bb5e5daa9b4f783e6ece9cbfbdbf9f1d6f4;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/d30v-dis.c b/opcodes/d30v-dis.c
index ec21305dc8..972d367ad7 100644
--- a/opcodes/d30v-dis.c
+++ b/opcodes/d30v-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble D30V instructions.
-   Copyright 1997, 1998, 2000, 2001, 2005, 2007
+   Copyright 1997, 1998, 2000, 2001, 2005, 2007, 2012
    Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
@@ -19,8 +19,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#include <stdio.h>
 #include "sysdep.h"
+#include <stdio.h>
 #include "opcode/d30v.h"
 #include "dis-asm.h"
 #include "opintl.h"
@@ -34,7 +34,7 @@
 static int
 lookup_opcode (struct d30v_insn *insn, long num, int is_long)
 {
-  int i = 0, index;
+  int i = 0, op_index;
   struct d30v_format *f;
   struct d30v_opcode *op = (struct d30v_opcode *) d30v_opcode_table;
   int op1 = (num >> 25) & 0x7;
@@ -56,11 +56,11 @@ lookup_opcode (struct d30v_insn *insn, long num, int is_long)
   while (op->op1 == op1 && op->op2 == op2)
     {
       /* Scan through all the formats for the opcode.  */
-      index = op->format[i++];
+      op_index = op->format[i++];
       do
 	{
-	  f = (struct d30v_format *) &d30v_format_table[index];
-	  while (f->form == index)
+	  f = (struct d30v_format *) &d30v_format_table[op_index];
+	  while (f->form == op_index)
 	    {
 	      if ((!is_long || f->form >= LONG) && (f->modifier == mod))
 		{
@@ -72,7 +72,7 @@ lookup_opcode (struct d30v_insn *insn, long num, int is_long)
 	  if (insn->form)
 	    break;
 	}
-      while ((index = op->format[i++]) != 0);
+      while ((op_index = op->format[i++]) != 0);
       if (insn->form)
 	break;
       op++;