2011-10-31 Pedro Alves <pedro@codesourcery.com>

[deliverable/binutils-gdb.git] / opcodes / cgen-opc.c

diff --git a/opcodes/cgen-opc.c b/opcodes/cgen-opc.c
index 9c1e302cb5c0ff94c07ab77d16135235a3d9df1b..263eb2c4d58f393dd87ae99d56868ef083a1a931 100644 (file)
--- a/opcodes/cgen-opc.c
+++ b/opcodes/cgen-opc.c
@@ -1,6 +1,6 @@
 /* CGEN generic opcode support.
 
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005, 2007
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2009
    Free Software Foundation, Inc.
 
    This file is part of libopcodes.
@@ -19,6 +19,7 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+#include "alloca-conf.h"
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
@@ -28,10 +29,6 @@
 #include "symcat.h"
 #include "opcode/cgen.h"
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
 static unsigned int hash_keyword_name
   (const CGEN_KEYWORD *, const char *, int);
 static unsigned int hash_keyword_value
@@ -379,10 +376,11 @@ cgen_get_insn_value (CGEN_CPU_DESC cd, unsigned char *buf, int length)
 
       for (i = 0; i < length; i += insn_chunk_bitsize) /* NB: i == bits */
        {
-         int index;
+         int bit_index;
          bfd_vma this_value;
-         index = i; /* NB: not dependent on endianness; opposite of cgen_put_insn_value! */
-         this_value = bfd_get_bits (& buf[index / 8], insn_chunk_bitsize, big_p);
+
+         bit_index = i; /* NB: not dependent on endianness; opposite of cgen_put_insn_value! */
+         this_value = bfd_get_bits (& buf[bit_index / 8], insn_chunk_bitsize, big_p);
          value = (value << insn_chunk_bitsize) | this_value;
        }
     }
@@ -417,9 +415,10 @@ cgen_put_insn_value (CGEN_CPU_DESC cd,
 
       for (i = 0; i < length; i += insn_chunk_bitsize) /* NB: i == bits */
        {
-         int index;
-         index = (length - insn_chunk_bitsize - i); /* NB: not dependent on endianness! */
-         bfd_put_bits ((bfd_vma) value, & buf[index / 8], insn_chunk_bitsize, big_p);
+         int bit_index;
+
+         bit_index = (length - insn_chunk_bitsize - i); /* NB: not dependent on endianness! */
+         bfd_put_bits ((bfd_vma) value, & buf[bit_index / 8], insn_chunk_bitsize, big_p);
          value >>= insn_chunk_bitsize;
        }
     }