OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm-dis.c (print_insn_coprocessor): Rename index to index_operand. 

Older gcc warns, arguably incorrectly, about name collisions between
global functions and function-local variable names.  Consesus has been
to rename local variables whenever this is spotted, hence committed as
obvious.  Note the pre-existing variable named idx; "index_operand"
seemed logical given the context.

	* arm-dis.c (print_insn_coprocessor): Rename index to
	index_operand.
This commit is contained in:
Hans-Peter Nilsson 2019-07-10 18:38:19 +02:00
parent 5c458ae8f5
commit 43dd762689
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opcodes/ChangeLog
View File

@ -1,3 +1,8 @@
2019-07-10 Hans-Peter Nilsson <hp@bitrange.com>
* arm-dis.c (print_insn_coprocessor): Rename index to
index_operand.
2019-07-05 Kito Cheng <kito.cheng@sifive.com> 2019-07-05 Kito Cheng <kito.cheng@sifive.com>
* riscv-opc.c (riscv_insn_types): Add r4 type. * riscv-opc.c (riscv_insn_types): Add r4 type.

10
opcodes/arm-dis.c
View File

@ -6767,23 +6767,23 @@ print_mve_vmov_index (struct disassemble_info *info, unsigned long given)
unsigned long op1 = arm_decode_field (given, 21, 22); unsigned long op1 = arm_decode_field (given, 21, 22);
unsigned long op2 = arm_decode_field (given, 5, 6); unsigned long op2 = arm_decode_field (given, 5, 6);
unsigned long h = arm_decode_field (given, 16, 16); unsigned long h = arm_decode_field (given, 16, 16);
unsigned long index, esize, targetBeat, idx; unsigned long index_operand, esize, targetBeat, idx;
void *stream = info->stream; void *stream = info->stream;
fprintf_ftype func = info->fprintf_func; fprintf_ftype func = info->fprintf_func;
if ((op1 & 0x2) == 0x2) if ((op1 & 0x2) == 0x2)
{ {
index = op2; index_operand = op2;
esize = 8; esize = 8;
} }
else if (((op1 & 0x2) == 0x0) && ((op2 & 0x1) == 0x1)) else if (((op1 & 0x2) == 0x0) && ((op2 & 0x1) == 0x1))
{ {
index = op2 >> 1; index_operand = op2 >> 1;
esize = 16; esize = 16;
} }
else if (((op1 & 0x2) == 0) && ((op2 & 0x3) == 0)) else if (((op1 & 0x2) == 0) && ((op2 & 0x3) == 0))
{ {
index = 0; index_operand = 0;
esize = 32; esize = 32;
} }
else else
@ -6793,7 +6793,7 @@ print_mve_vmov_index (struct disassemble_info *info, unsigned long given)
} }
targetBeat = (op1 & 0x1) | (h << 1); targetBeat = (op1 & 0x1) | (h << 1);
idx = index + targetBeat * (32/esize); idx = index_operand + targetBeat * (32/esize);
func (stream, "%lu", idx); func (stream, "%lu", idx);
} }