From: Thomas Preud'homme Date: Thu, 25 Aug 2016 16:26:01 +0000 (+0100) Subject: 2016-08-25 Thomas Preud'homme X-Git-Tag: users/ARM/embedded-binutils-2_26-branch-2016q3~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e8151d37613bd4468de1a96e26a1101380ddadb;p=thirdparty%2Fbinutils-gdb.git 2016-08-25 Thomas Preud'homme Backport from mainline 2016-08-25 Thomas Preud'homme * config/tc-arm.c (v7m_psrs): Remove msp_s, MSP_S, psp_s and PSP_S special registers. * testsuite/gas/arm/archv8m-cmse-msr.s: Remove test for above special registers. * testsuite/gas/arm/archv8m-cmse-msr-base.d: Likewise. * testsuite/gas/arm/archv8m-cmse-msr-main.d: Likewise. * testsuite/gas/arm/archv8m-main-dsp-4.d: Likewise. --- diff --git a/gas/ChangeLog.arm b/gas/ChangeLog.arm index a50d688b6e7..ad5c2814464 100644 --- a/gas/ChangeLog.arm +++ b/gas/ChangeLog.arm @@ -1,3 +1,16 @@ +2016-08-25 Thomas Preud'homme + + Backport from mainline + 2016-08-25 Thomas Preud'homme + + * config/tc-arm.c (v7m_psrs): Remove msp_s, MSP_S, psp_s and PSP_S + special registers. + * testsuite/gas/arm/archv8m-cmse-msr.s: Remove test for above special + registers. + * testsuite/gas/arm/archv8m-cmse-msr-base.d: Likewise. + * testsuite/gas/arm/archv8m-cmse-msr-main.d: Likewise. + * testsuite/gas/arm/archv8m-main-dsp-4.d: Likewise. + 2016-05-20 Thomas Preud'homme * NEWS: Document support for ARMv8-M and its DSP and Security diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 453e2c531d2..e26f8450329 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -18396,8 +18396,8 @@ static const struct asm_psr v7m_psrs[] = {"ipsr", 5 }, {"IPSR", 5 }, {"epsr", 6 }, {"EPSR", 6 }, {"iepsr", 7 }, {"IEPSR", 7 }, - {"msp", 8 }, {"MSP", 8 }, {"msp_s", 8 }, {"MSP_S", 8 }, - {"psp", 9 }, {"PSP", 9 }, {"psp_s", 9 }, {"PSP_S", 9 }, + {"msp", 8 }, {"MSP", 8 }, + {"psp", 9 }, {"PSP", 9 }, {"primask", 16}, {"PRIMASK", 16}, {"basepri", 17}, {"BASEPRI", 17}, {"basepri_max", 18}, {"BASEPRI_MAX", 18}, diff --git a/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d b/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d index 837767717d0..4f162ce9338 100644 --- a/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d +++ b/gas/testsuite/gas/arm/archv8m-cmse-msr-base.d @@ -7,26 +7,18 @@ Disassembly of section .text: 0+.* <[^>]*> f380 8808 msr MSP, r0 -0+.* <[^>]*> f380 8808 msr MSP, r0 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 0+.* <[^>]*> f380 8809 msr PSP, r0 -0+.* <[^>]*> f380 8809 msr PSP, r0 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 0+.* <[^>]*> f380 8808 msr MSP, r0 -0+.* <[^>]*> f380 8808 msr MSP, r0 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 0+.* <[^>]*> f380 8809 msr PSP, r0 -0+.* <[^>]*> f380 8809 msr PSP, r0 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 0+.* <[^>]*> f3ef 8008 mrs r0, MSP -0+.* <[^>]*> f3ef 8008 mrs r0, MSP 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS 0+.* <[^>]*> f3ef 8009 mrs r0, PSP -0+.* <[^>]*> f3ef 8009 mrs r0, PSP 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS 0+.* <[^>]*> f3ef 8008 mrs r0, MSP -0+.* <[^>]*> f3ef 8008 mrs r0, MSP 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS 0+.* <[^>]*> f3ef 8009 mrs r0, PSP -0+.* <[^>]*> f3ef 8009 mrs r0, PSP 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS diff --git a/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d b/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d index ca8b000c20e..f4035d80fb3 100644 --- a/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d +++ b/gas/testsuite/gas/arm/archv8m-cmse-msr-main.d @@ -7,26 +7,18 @@ Disassembly of section .text: 0+.* <[^>]*> f380 8808 msr MSP, r0 -0+.* <[^>]*> f380 8808 msr MSP, r0 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 0+.* <[^>]*> f380 8809 msr PSP, r0 -0+.* <[^>]*> f380 8809 msr PSP, r0 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 0+.* <[^>]*> f380 8808 msr MSP, r0 -0+.* <[^>]*> f380 8808 msr MSP, r0 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 0+.* <[^>]*> f380 8809 msr PSP, r0 -0+.* <[^>]*> f380 8809 msr PSP, r0 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 0+.* <[^>]*> f3ef 8008 mrs r0, MSP -0+.* <[^>]*> f3ef 8008 mrs r0, MSP 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS 0+.* <[^>]*> f3ef 8009 mrs r0, PSP -0+.* <[^>]*> f3ef 8009 mrs r0, PSP 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS 0+.* <[^>]*> f3ef 8008 mrs r0, MSP -0+.* <[^>]*> f3ef 8008 mrs r0, MSP 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS 0+.* <[^>]*> f3ef 8009 mrs r0, PSP -0+.* <[^>]*> f3ef 8009 mrs r0, PSP 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS diff --git a/gas/testsuite/gas/arm/archv8m-cmse-msr.s b/gas/testsuite/gas/arm/archv8m-cmse-msr.s index 4a617610139..1d5a4af07b7 100644 --- a/gas/testsuite/gas/arm/archv8m-cmse-msr.s +++ b/gas/testsuite/gas/arm/archv8m-cmse-msr.s @@ -1,24 +1,16 @@ msr MSP, r0 -msr MSP_S, r0 msr MSP_NS, r0 msr PSP, r0 -msr PSP_S, r0 msr PSP_NS, r0 msr msp, r0 -msr msp_s, r0 msr msp_ns, r0 msr psp, r0 -msr psp_s, r0 msr psp_ns, r0 mrs r0, MSP -mrs r0, MSP_S mrs r0, MSP_NS mrs r0, PSP -mrs r0, PSP_S mrs r0, PSP_NS mrs r0, msp -mrs r0, msp_s mrs r0, msp_ns mrs r0, psp -mrs r0, psp_s mrs r0, psp_ns diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-4.d b/gas/testsuite/gas/arm/archv8m-main-dsp-4.d index 5e07e9ea783..a61dc72979f 100644 --- a/gas/testsuite/gas/arm/archv8m-main-dsp-4.d +++ b/gas/testsuite/gas/arm/archv8m-main-dsp-4.d @@ -7,26 +7,18 @@ Disassembly of section .text: 0+.* <[^>]*> f380 8808 msr MSP, r0 -0+.* <[^>]*> f380 8808 msr MSP, r0 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 0+.* <[^>]*> f380 8809 msr PSP, r0 -0+.* <[^>]*> f380 8809 msr PSP, r0 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 0+.* <[^>]*> f380 8808 msr MSP, r0 -0+.* <[^>]*> f380 8808 msr MSP, r0 0+.* <[^>]*> f380 8888 msr MSP_NS, r0 0+.* <[^>]*> f380 8809 msr PSP, r0 -0+.* <[^>]*> f380 8809 msr PSP, r0 0+.* <[^>]*> f380 8889 msr PSP_NS, r0 0+.* <[^>]*> f3ef 8008 mrs r0, MSP -0+.* <[^>]*> f3ef 8008 mrs r0, MSP 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS 0+.* <[^>]*> f3ef 8009 mrs r0, PSP -0+.* <[^>]*> f3ef 8009 mrs r0, PSP 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS 0+.* <[^>]*> f3ef 8008 mrs r0, MSP -0+.* <[^>]*> f3ef 8008 mrs r0, MSP 0+.* <[^>]*> f3ef 8088 mrs r0, MSP_NS 0+.* <[^>]*> f3ef 8009 mrs r0, PSP -0+.* <[^>]*> f3ef 8009 mrs r0, PSP 0+.* <[^>]*> f3ef 8089 mrs r0, PSP_NS