diff options
| author | Sudakshina Das <sudi.das@arm.com> | 2018-07-11 18:05:34 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2018-07-11 18:05:34 +0100 |
| commit | c597cc3d6eb76802dd079b1262f2d425e07da3eb (patch) | |
| tree | 053f9ae053c22f6ee6d71b047931f7b24a14918e /gas | |
| parent | 1cb83cac9a8974bdb12aac90018ad1165ba86274 (diff) | |
| download | gdb-c597cc3d6eb76802dd079b1262f2d425e07da3eb.zip gdb-c597cc3d6eb76802dd079b1262f2d425e07da3eb.tar.gz gdb-c597cc3d6eb76802dd079b1262f2d425e07da3eb.tar.bz2 | |
Adds the speculation barrier instructions to the ARM assembler and disassembler.
See:
https://developer.arm.com/support/arm-security-updates/speculative-processor-vulnerability/download-the-whitepaper
opcodes * arm-dis.c (arm_opcodes): Add ssbb and pssbb and move
csdb together with them.
(thumb32_opcodes): Likewise.
gas * config/tc-arm.c (insns): Add new ssbb and pssbb instructions.
* testsuite/gas/arm/csdb.s: Add new tests for ssbb and pssbb.
* testsuite/gas/arm/csdb.d: Likewise
* testsuite/gas/arm/thumb2_it_bad.s: Likewise.
* testsuite/gas/arm/thumb2_it_bad.l: Likewise.
* testsuite/gas/arm/barrier.d: Update with ssbb.
* testsuite/gas/arm/barrier-thumb.d: Likewise.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 10 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/barrier-thumb.d | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/barrier.d | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/csdb.d | 9 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/csdb.s | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/thumb2_it_bad.l | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/thumb2_it_bad.s | 4 |
8 files changed, 29 insertions, 6 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 712bec5..5127589 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2018-07-11 Sudakshina Das <sudi.das@arm.com> + + * config/tc-arm.c (insns): Add new ssbb and pssbb instructions. + * testsuite/gas/arm/csdb.s: Add new tests for ssbb and pssbb. + * testsuite/gas/arm/csdb.d: Likewise + * testsuite/gas/arm/thumb2_it_bad.s: Likewise. + * testsuite/gas/arm/thumb2_it_bad.l: Likewise. + * testsuite/gas/arm/barrier.d: Update with ssbb. + * testsuite/gas/arm/barrier-thumb.d: Likewise. + 2018-07-11 Jan Beulich <jbeulich@suse.com> * config/tc-i386.c (inoutportreg, reg16_inoutportreg): Delete. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index ef814ff..9f3988a 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -20051,6 +20051,8 @@ static const struct asm_opcode insns[] = #define THUMB_VARIANT & arm_ext_v6t2 TUE("csdb", 320f014, f3af8014, 0, (), noargs, t_csdb), + TUF("ssbb", 57ff040, f3bf8f40, 0, (), noargs, t_csdb), + TUF("pssbb", 57ff044, f3bf8f44, 0, (), noargs, t_csdb), #undef ARM_VARIANT #define ARM_VARIANT & arm_ext_v6t2 diff --git a/gas/testsuite/gas/arm/barrier-thumb.d b/gas/testsuite/gas/arm/barrier-thumb.d index 9194372..fd163fc 100644 --- a/gas/testsuite/gas/arm/barrier-thumb.d +++ b/gas/testsuite/gas/arm/barrier-thumb.d @@ -59,7 +59,7 @@ Disassembly of section .text: 000000b8 <[^>]*> f3bf 8f46 dsb (nshst|unst|#6) 000000bc <[^>]*> f3bf 8f43 dsb (osh|#3) 000000c0 <[^>]*> f3bf 8f6f isb (sy|#15) -000000c4 <[^>]*> f3bf 8f40 dsb #0 +000000c4 <[^>]*> f3bf 8f40 ssbb 000000c8 <[^>]*> f3bf 8f4f dsb (sy|#15) 000000cc <[^>]*> f3bf 8f50 dmb #0 000000d0 <[^>]*> f3bf 8f5f dmb (sy|#15) diff --git a/gas/testsuite/gas/arm/barrier.d b/gas/testsuite/gas/arm/barrier.d index a09b1ea..f747026 100644 --- a/gas/testsuite/gas/arm/barrier.d +++ b/gas/testsuite/gas/arm/barrier.d @@ -58,7 +58,7 @@ Disassembly of section .text: 000000b8 <[^>]*> f57ff046 dsb (nshst|unst|#6) 000000bc <[^>]*> f57ff043 dsb (osh|#3) 000000c0 <[^>]*> f57ff06f isb (sy|#15) -000000c4 <[^>]*> f57ff040 dsb #0 +000000c4 <[^>]*> f57ff040 ssbb 000000c8 <[^>]*> f57ff04f dsb (sy|#15) 000000cc <[^>]*> f57ff050 dmb #0 000000d0 <[^>]*> f57ff05f dmb (sy|#15) diff --git a/gas/testsuite/gas/arm/csdb.d b/gas/testsuite/gas/arm/csdb.d index baf5855..db73907 100644 --- a/gas/testsuite/gas/arm/csdb.d +++ b/gas/testsuite/gas/arm/csdb.d @@ -5,6 +5,9 @@ .*: +file format .*arm.* Disassembly of section .text: -0+000 <[^>]*> f3af 8014 ? csdb -0+004 <[^>]*> e320f014 ? csdb - +.*> f3af 8014 ? csdb +.*> f3bf 8f40 ? ssbb +.*> f3bf 8f44 ? pssbb +.*> e320f014 ? csdb +.*> f57ff040 ? ssbb +.*> f57ff044 ? pssbb diff --git a/gas/testsuite/gas/arm/csdb.s b/gas/testsuite/gas/arm/csdb.s index 133a5f0..f31f5df 100644 --- a/gas/testsuite/gas/arm/csdb.s +++ b/gas/testsuite/gas/arm/csdb.s @@ -2,5 +2,9 @@ .thumb .syntax unified csdb +ssbb +pssbb .arm csdb +ssbb +pssbb diff --git a/gas/testsuite/gas/arm/thumb2_it_bad.l b/gas/testsuite/gas/arm/thumb2_it_bad.l index da9341f..95ef273 100644 --- a/gas/testsuite/gas/arm/thumb2_it_bad.l +++ b/gas/testsuite/gas/arm/thumb2_it_bad.l @@ -11,3 +11,5 @@ [^:]*:20: Error: instruction not allowed in IT block -- `setendeq le' [^:]*:22: Error: IT falling in the range of a previous IT block -- `iteq eq' [^:]*:25: Error: instruction not allowed in IT block -- `csdbeq' +[^:]*:26: Error: instruction not allowed in IT block -- `ssbbeq' +[^:]*:27: Error: instruction not allowed in IT block -- `pssbbeq' diff --git a/gas/testsuite/gas/arm/thumb2_it_bad.s b/gas/testsuite/gas/arm/thumb2_it_bad.s index 72f305d..7cdb9f1 100644 --- a/gas/testsuite/gas/arm/thumb2_it_bad.s +++ b/gas/testsuite/gas/arm/thumb2_it_bad.s @@ -21,6 +21,8 @@ thumb2_it_bad: it eq iteq eq nop - it eq + ittt eq csdbeq + ssbbeq + pssbbeq foo: |