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

* opcodes/arm-dis.c (COND_UNCOND): New constant. 

(print_insn_coprocessor): Add support for %u format specifier.
	(print_insn_neon): Likewise.
This commit is contained in:
Matthew Gretton-Dann 2012-08-24 07:59:05 +00:00
parent 12e37cbc4b
commit e2efe87d8a
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opcodes/ChangeLog
View File

@ -1,3 +1,9 @@
2012-08-24 Matthew Gretton-Dann <matthew.gretton-dann@arm.com
* arm-dis.c (COND_UNCOND): New constant.
(print_insn_coprocessor): Add support for %u format specifier.
(print_insn_neon): Likewise.
2012-08-21 David S. Miller <davem@davemloft.net> 2012-08-21 David S. Miller <davem@davemloft.net>
* sparc-opc.c (4-argument crypto instructions): Fix encoding using * sparc-opc.c (4-argument crypto instructions): Fix encoding using

28
opcodes/arm-dis.c
View File

@ -92,7 +92,8 @@ struct opcode16
%c print condition code (always bits 28-31 in ARM mode) %c print condition code (always bits 28-31 in ARM mode)
%q print shifter argument %q print shifter argument
%u print condition code (unconditional in ARM mode) %u print condition code (unconditional in ARM mode,
UNPREDICTABLE if not AL in Thumb)
%A print address for ldc/stc/ldf/stf instruction %A print address for ldc/stc/ldf/stf instruction
%B print vstm/vldm register list %B print vstm/vldm register list
%I print cirrus signed shift immediate: bits 0..3|4..6 %I print cirrus signed shift immediate: bits 0..3|4..6
@ -519,6 +520,8 @@ static const struct opcode32 coprocessor_opcodes[] =
%% % %% %
%c print condition code %c print condition code
%u print condition code (unconditional in ARM mode,
UNPREDICTABLE if not AL in Thumb)
%A print v{st,ld}[1234] operands %A print v{st,ld}[1234] operands
%B print v{st,ld}[1234] any one operands %B print v{st,ld}[1234] any one operands
%C print v{st,ld}[1234] single->all operands %C print v{st,ld}[1234] single->all operands
@ -1692,6 +1695,9 @@ static unsigned int ifthen_next_state;
/* The address of the insn for which the IT state is valid. */ /* The address of the insn for which the IT state is valid. */
static bfd_vma ifthen_address; static bfd_vma ifthen_address;
#define IFTHEN_COND ((ifthen_state >> 4) & 0xf) #define IFTHEN_COND ((ifthen_state >> 4) & 0xf)
/* Indicates that the current Conditional state is unconditional or outside
an IT block. */
#define COND_UNCOND 16
/* Functions. */ /* Functions. */
@ -1870,7 +1876,7 @@ print_insn_coprocessor (bfd_vma pc,
if (ifthen_state) if (ifthen_state)
cond = IFTHEN_COND; cond = IFTHEN_COND;
else else
cond = 16; cond = COND_UNCOND;
} }
else else
{ {
@ -1879,13 +1885,13 @@ print_insn_coprocessor (bfd_vma pc,
if ((given & 0xf0000000) == 0xf0000000) if ((given & 0xf0000000) == 0xf0000000)
{ {
mask |= 0xf0000000; mask |= 0xf0000000;
cond = 16; cond = COND_UNCOND;
} }
else else
{ {
cond = (given >> 28) & 0xf; cond = (given >> 28) & 0xf;
if (cond == 0xe) if (cond == 0xe)
cond = 16; cond = COND_UNCOND;
} }
} }
@ -1979,6 +1985,11 @@ print_insn_coprocessor (bfd_vma pc,
} }
break; break;
case 'u':
if (cond != COND_UNCOND)
is_unpredictable = TRUE;
/* Fall through. */
case 'c': case 'c':
func (stream, "%s", arm_conditional[cond]); func (stream, "%s", arm_conditional[cond]);
break; break;
@ -2488,6 +2499,7 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
if ((given & insn->mask) == insn->value) if ((given & insn->mask) == insn->value)
{ {
signed long value_in_comment = 0; signed long value_in_comment = 0;
bfd_boolean is_unpredictable = FALSE;
const char *c; const char *c;
for (c = insn->assembler; *c; c++) for (c = insn->assembler; *c; c++)
@ -2500,6 +2512,11 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
func (stream, "%%"); func (stream, "%%");
break; break;
case 'u':
if (thumb && ifthen_state)
is_unpredictable = TRUE;
/* Fall through. */
case 'c': case 'c':
if (thumb && ifthen_state) if (thumb && ifthen_state)
func (stream, "%s", arm_conditional[IFTHEN_COND]); func (stream, "%s", arm_conditional[IFTHEN_COND]);
@ -2913,6 +2930,9 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
if (value_in_comment > 32 || value_in_comment < -16) if (value_in_comment > 32 || value_in_comment < -16)
func (stream, "\t; 0x%lx", value_in_comment); func (stream, "\t; 0x%lx", value_in_comment);
if (is_unpredictable)
func (stream, UNPREDICTABLE_INSTRUCTION);
return TRUE; return TRUE;
} }
} }