forked from Imagelibrary/binutils-gdb
Add -Wshadow to the gcc command line options used when compiling the binutils.
Fix up all warnings generated by the addition of this switch.
This commit is contained in:
@@ -53,7 +53,7 @@ init_spu_disassemble (void)
|
||||
static const struct spu_opcode *
|
||||
get_index_for_opcode (unsigned int insn)
|
||||
{
|
||||
const struct spu_opcode *index;
|
||||
const struct spu_opcode *op_index;
|
||||
unsigned int opcode = insn >> (32-11);
|
||||
|
||||
/* Init the table. This assumes that element 0/opcode 0 (currently
|
||||
@@ -61,28 +61,28 @@ get_index_for_opcode (unsigned int insn)
|
||||
if (spu_disassemble_table[0] == 0)
|
||||
init_spu_disassemble ();
|
||||
|
||||
if ((index = spu_disassemble_table[opcode & 0x780]) != 0
|
||||
&& index->insn_type == RRR)
|
||||
return index;
|
||||
if ((op_index = spu_disassemble_table[opcode & 0x780]) != 0
|
||||
&& op_index->insn_type == RRR)
|
||||
return op_index;
|
||||
|
||||
if ((index = spu_disassemble_table[opcode & 0x7f0]) != 0
|
||||
&& (index->insn_type == RI18 || index->insn_type == LBT))
|
||||
return index;
|
||||
if ((op_index = spu_disassemble_table[opcode & 0x7f0]) != 0
|
||||
&& (op_index->insn_type == RI18 || op_index->insn_type == LBT))
|
||||
return op_index;
|
||||
|
||||
if ((index = spu_disassemble_table[opcode & 0x7f8]) != 0
|
||||
&& index->insn_type == RI10)
|
||||
return index;
|
||||
if ((op_index = spu_disassemble_table[opcode & 0x7f8]) != 0
|
||||
&& op_index->insn_type == RI10)
|
||||
return op_index;
|
||||
|
||||
if ((index = spu_disassemble_table[opcode & 0x7fc]) != 0
|
||||
&& (index->insn_type == RI16))
|
||||
return index;
|
||||
if ((op_index = spu_disassemble_table[opcode & 0x7fc]) != 0
|
||||
&& (op_index->insn_type == RI16))
|
||||
return op_index;
|
||||
|
||||
if ((index = spu_disassemble_table[opcode & 0x7fe]) != 0
|
||||
&& (index->insn_type == RI8))
|
||||
return index;
|
||||
if ((op_index = spu_disassemble_table[opcode & 0x7fe]) != 0
|
||||
&& (op_index->insn_type == RI8))
|
||||
return op_index;
|
||||
|
||||
if ((index = spu_disassemble_table[opcode & 0x7ff]) != 0)
|
||||
return index;
|
||||
if ((op_index = spu_disassemble_table[opcode & 0x7ff]) != 0)
|
||||
return op_index;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -97,7 +97,7 @@ print_insn_spu (bfd_vma memaddr, struct disassemble_info *info)
|
||||
int hex_value;
|
||||
int status;
|
||||
unsigned int insn;
|
||||
const struct spu_opcode *index;
|
||||
const struct spu_opcode *op_index;
|
||||
enum spu_insns tag;
|
||||
|
||||
status = (*info->read_memory_func) (memaddr, buffer, 4, info);
|
||||
@@ -109,9 +109,9 @@ print_insn_spu (bfd_vma memaddr, struct disassemble_info *info)
|
||||
|
||||
insn = bfd_getb32 (buffer);
|
||||
|
||||
index = get_index_for_opcode (insn);
|
||||
op_index = get_index_for_opcode (insn);
|
||||
|
||||
if (index == 0)
|
||||
if (op_index == 0)
|
||||
{
|
||||
(*info->fprintf_func) (info->stream, ".long 0x%x", insn);
|
||||
}
|
||||
@@ -119,8 +119,8 @@ print_insn_spu (bfd_vma memaddr, struct disassemble_info *info)
|
||||
{
|
||||
int i;
|
||||
int paren = 0;
|
||||
tag = (enum spu_insns)(index - spu_opcodes);
|
||||
(*info->fprintf_func) (info->stream, "%s", index->mnemonic);
|
||||
tag = (enum spu_insns)(op_index - spu_opcodes);
|
||||
(*info->fprintf_func) (info->stream, "%s", op_index->mnemonic);
|
||||
if (tag == M_BI || tag == M_BISL || tag == M_IRET || tag == M_BISLED
|
||||
|| tag == M_BIHNZ || tag == M_BIHZ || tag == M_BINZ || tag == M_BIZ
|
||||
|| tag == M_SYNC || tag == M_HBR)
|
||||
@@ -133,12 +133,12 @@ print_insn_spu (bfd_vma memaddr, struct disassemble_info *info)
|
||||
if (fb & 0x10)
|
||||
(*info->fprintf_func) (info->stream, "e");
|
||||
}
|
||||
if (index->arg[0] != 0)
|
||||
if (op_index->arg[0] != 0)
|
||||
(*info->fprintf_func) (info->stream, "\t");
|
||||
hex_value = 0;
|
||||
for (i = 1; i <= index->arg[0]; i++)
|
||||
for (i = 1; i <= op_index->arg[0]; i++)
|
||||
{
|
||||
int arg = index->arg[i];
|
||||
int arg = op_index->arg[i];
|
||||
if (arg != A_P && !paren && i > 1)
|
||||
(*info->fprintf_func) (info->stream, ",");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user