* 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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 52a3df2..0cc109a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-19  Nick Clifton  <nickc@redhat.com>
+
+       * config/tc-arm.c (v7m_psrs): Revert previous delta.
+
 2011-04-18  Julian Brown  <julian@codesourcery.com>
            Nick Clifton  <nickc@redhat.com>
 

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index ff4d090..af8c4aa 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -16634,8 +16634,8 @@ static const struct asm_psr v7m_psrs[] =
   {"psp",        9 }, {"PSP",          9 },
   {"primask",    16}, {"PRIMASK",      16},
   {"basepri",    17}, {"BASEPRI",      17},
-  {"basepri_max", 18}, {"BASEPRI_MAX", 18}, /* Typo, preserved for backwards compatibility.  */
-  {"basepri_mask",18}, {"BASEPRI_MASK",        18},
+  {"basepri_max", 18}, {"BASEPRI_MAX", 18},
+  {"basepri_max", 18}, {"BASEPRI_MASK",        18}, /* Typo, preserved for backwards compatibility.  */
   {"faultmask",          19}, {"FAULTMASK",    19},
   {"control",    20}, {"CONTROL",      20}
 };

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 4e4f6ae..e1bb02e 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-19  Nick Clifton  <nickc@redhat.com>
+
+       * 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.
+
 2011-04-18  Nick Clifton  <nickc@redhat.com>
 
        * gas/arm/arch7.s: Fix typo basepri_max should be basepri_mask.

diff --git a/gas/testsuite/gas/arm/arch7.d b/gas/testsuite/gas/arm/arch7.d
index 8641995..a7149a6 100644 (file)
--- a/gas/testsuite/gas/arm/arch7.d
+++ b/gas/testsuite/gas/arm/arch7.d
@@ -57,7 +57,7 @@ Disassembly of section .text:
 0+0c0 <[^>]*> f3ef 8009        mrs     r0, PSP
 0+0c4 <[^>]*> f3ef 8010        mrs     r0, PRIMASK
 0+0c8 <[^>]*> f3ef 8011        mrs     r0, BASEPRI
-0+0cc <[^>]*> f3ef 8012        mrs     r0, BASEPRI_MASK
+0+0cc <[^>]*> f3ef 8012        mrs     r0, BASEPRI_MAX
 0+0d0 <[^>]*> f3ef 8013        mrs     r0, FAULTMASK
 0+0d4 <[^>]*> f3ef 8014        mrs     r0, CONTROL
 0+0d8 <[^>]*> f380 8800        msr     (CPSR_f|APSR_nzcvq), r0
@@ -71,7 +71,7 @@ Disassembly of section .text:
 0+0f8 <[^>]*> f380 8809        msr     PSP, r0
 0+0fc <[^>]*> f380 8810        msr     PRIMASK, r0
 0+100 <[^>]*> f380 8811        msr     BASEPRI, r0
-0+104 <[^>]*> f380 8812        msr     BASEPRI_MASK, r0
+0+104 <[^>]*> f380 8812        msr     BASEPRI_MAX, r0
 0+108 <[^>]*> f380 8813        msr     FAULTMASK, r0
 0+10c <[^>]*> f380 8814        msr     CONTROL, r0
 0+110 <[^>]*> f3ef 8003        mrs     r0, PSR

diff --git a/gas/testsuite/gas/arm/arch7.s b/gas/testsuite/gas/arm/arch7.s
index 551935b..7a732fe 100644 (file)
--- a/gas/testsuite/gas/arm/arch7.s
+++ b/gas/testsuite/gas/arm/arch7.s
@@ -60,7 +60,7 @@ label2:
        mrs     r0, psp
        mrs     r0, primask
        mrs     r0, basepri
-       mrs     r0, basepri_mask
+       mrs     r0, basepri_max
        mrs     r0, faultmask
        mrs     r0, control
        msr     apsr_nzcvq, r0
@@ -74,7 +74,7 @@ label2:
        msr     psp, r0
        msr     primask, r0
        msr     basepri, r0
-       msr     BASEPRI_MASK, r0
+       msr     BASEPRI_MAX, r0
        msr     faultmask, r0
        msr     control, r0
        mrs     r0, xpsr

diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d b/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
index a778386..a1595ca 100644 (file)
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
@@ -12,4 +12,4 @@ Disassembly of section .text:
 0+08 <[^>]*> f3ef 8610         mrs     r6, PRIMASK
 0+0c <[^>]*> f384 8c00         msr     CPSR_fs, r4
 0+10 <[^>]*> f385 8401         msr     IAPSR, r5
-0+14 <[^>]*> f386 8812         msr     BASEPRI_MASK, r6
+0+14 <[^>]*> f386 8812         msr     BASEPRI_MAX, r6

diff --git a/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.s b/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.s
index ccc4b68..e9e8588 100644 (file)
--- a/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.s
+++ b/gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.s
@@ -7,4 +7,4 @@
        mrs r6, primask
        msr apsr_nzcvqg, r4
        msr iapsr_g, r5
-       msr basepri_mask, r6
+       msr basepri_max, r6

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d8d5819..ad85706 100644 (file)
--- 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 (file)
--- 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>";