diff options
author | Nick Clifton <nickc@redhat.com> | 2011-04-19 07:44:12 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2011-04-19 07:44:12 +0000 |
commit | 00bbc0bdc6f5437c55d1a13907b6f22ecef6671f (patch) | |
tree | 0bfc579a5086bf2248631575137e1070f6dd2ccf /opcodes | |
parent | ac7f631be1d010ef8efa59a6d862709277e834d8 (diff) | |
download | binutils-00bbc0bdc6f5437c55d1a13907b6f22ecef6671f.zip binutils-00bbc0bdc6f5437c55d1a13907b6f22ecef6671f.tar.gz binutils-00bbc0bdc6f5437c55d1a13907b6f22ecef6671f.tar.bz2 |
* config/tc-arm.c (v7m_psrs): Revert previous delta.
* gas/arm/mrs-msr-thumb-v7e-m.s: Restore name of basepri_max
register.
* gas/arm/mrs-msr-thumb-v7e-m.d: Likewise.
* gas/arm/arch7.d: Likewise.
* gas/arm/arch7.s: Likewise.
* arm-dis.c: Revert previous reversion.
Diffstat (limited to 'opcodes')
-rw-r--r-- | opcodes/ChangeLog | 4 | ||||
-rw-r--r-- | opcodes/arm-dis.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index d8d5819..ad85706 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,7 +1,3 @@ -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 7264ef2..8e27d60 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_MASK"; + case 18: return "BASEPRI_MAX"; case 19: return "FAULTMASK"; case 20: return "CONTROL"; default: return "<unknown>"; |