diff options
author | Nick Clifton <nickc@redhat.com> | 2011-04-19 07:27:32 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2011-04-19 07:27:32 +0000 |
commit | ac7f631be1d010ef8efa59a6d862709277e834d8 (patch) | |
tree | e64ac83f31522c5c358ed8056aaa3b65be7d1a2f /opcodes | |
parent | 1448a0a258317fbe7566a0a3f48970b2a5b3912e (diff) | |
download | binutils-ac7f631be1d010ef8efa59a6d862709277e834d8.zip binutils-ac7f631be1d010ef8efa59a6d862709277e834d8.tar.gz binutils-ac7f631be1d010ef8efa59a6d862709277e834d8.tar.bz2 |
* gas/arm/arch7.s: Fix typo basepri_max should be basepri_mask.
* gas/arm/mrs-msr-thumb-v7e-m.s: Likewise.
* gas/arm/arch7.d: Update expected disassembly.
* gas/arm/attr-march-armv7.d: Remove Microcontroller tag.
* gas/arm/blx-bad.d: Only run for ELF based targets.
* gas/arm/mrs-msr-thumb-v6t2.d: Likewise.
* gas/arm/vldm-arm.d: Likewise.
* gas/arm/mrs-msr-thumb-v7-m.d: Likewise.
Remove qualifiers from PSR and IAPSR regsiter names.
* gas/arm/mrs-msr-thumb-v7e-m.d: Likewise.
* gas/arm/thumb2_bcond.d: Update expected disassembly to allow for
relaxing of branch insns.
* gas/arm/thumb32.d: Fix whitespace problems in disassembly.
* config/tc-arm.c (parse_psr): Use selected_cpu not cpu_variant to
detect M-profile targets.
(do_t_swi): Exclude v7 and higher variants from arm_ext_os test.
(v7m_psrs): Fix typo: basepri_max should be basepri_mask.
* arm-dis.c (psr_name): Revert previous delta.
* arm.h (ARM_AEXT_V7_ARM): Remove ARM_EXT_OS from bitmask.
Diffstat (limited to 'opcodes')
-rw-r--r-- | opcodes/ChangeLog | 4 | ||||
-rw-r--r-- | opcodes/arm-dis.c | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index ad85706..d8d5819 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2011-04-18 Nick Clifton <nickc@redhat.com> + + * arm-dis.c (psr_name): Revert previous delta. + 2011-04-13 Nick Clifton <nickc@redhat.com> * v850-dis.c (disassemble): Always print a closing square brace if diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index c8b090b..7264ef2 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -3722,7 +3722,7 @@ psr_name (int regno) case 9: return "PSP"; case 16: return "PRIMASK"; case 17: return "BASEPRI"; - case 18: return "BASEPRI_MAX"; + case 18: return "BASEPRI_MASK"; case 19: return "FAULTMASK"; case 20: return "CONTROL"; default: return "<unknown>"; @@ -4192,15 +4192,6 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given) else func (stream, "(UNDEF: %lu)", sysm); } - else if ((given & 0xff) <= 3) - { - func (stream, "%s_", psr_name (given & 0xff)); - - if (given & 0x800) - func (stream, "nzcvq"); - if (given & 0x400) - func (stream, "g"); - } else { func (stream, psr_name (given & 0xff)); |