diff options
| author | Thomas Preud'homme <thomas.preudhomme@arm.com> | 2016-08-25 17:26:01 +0100 |
|---|---|---|
| committer | Thomas Preud'homme <thomas.preudhomme@arm.com> | 2016-08-25 17:26:01 +0100 |
| commit | 3e8151d37613bd4468de1a96e26a1101380ddadb (patch) | |
| tree | 8b52d68e37ed0f9e198a7551dda991aacce128a2 | |
| parent | 81dc17df1b58c2b02d5b5e8a9556ae2a266460f5 (diff) | |
| download | gdb-3e8151d37613bd4468de1a96e26a1101380ddadb.zip gdb-3e8151d37613bd4468de1a96e26a1101380ddadb.tar.gz gdb-3e8151d37613bd4468de1a96e26a1101380ddadb.tar.bz2 | |
2016-08-25 Thomas Preud'homme <thomas.preudhomme@arm.com>
Backport from mainline
2016-08-25 Thomas Preud'homme <thomas.preudhomme@arm.com>
* 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.
| -rw-r--r-- | gas/ChangeLog.arm | 13 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/archv8m-cmse-msr-base.d | 8 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/archv8m-cmse-msr-main.d | 8 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/archv8m-cmse-msr.s | 8 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/archv8m-main-dsp-4.d | 8 |
6 files changed, 15 insertions, 34 deletions
diff --git a/gas/ChangeLog.arm b/gas/ChangeLog.arm index a50d688..ad5c281 100644 --- a/gas/ChangeLog.arm +++ b/gas/ChangeLog.arm @@ -1,3 +1,16 @@ +2016-08-25 Thomas Preud'homme <thomas.preudhomme@arm.com> + + Backport from mainline + 2016-08-25 Thomas Preud'homme <thomas.preudhomme@arm.com> + + * 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 <thomas.preudhomme@arm.com> * 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 453e2c5..e26f845 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 8377677..4f162ce 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 ca8b000..f4035d8 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 4a61761..1d5a4af 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 5e07e9e..a61dc72 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 |