From ddfded2f7bba485d6c967b502337a72310f24913 Mon Sep 17 00:00:00 2001 From: Matthew Wahab Date: Tue, 2 Jun 2015 12:30:38 +0100 Subject: [ARM] Add support for ARMv8.1 PAN extension --- gas/ChangeLog | 10 ++++++++++ gas/config/tc-arm.c | 29 +++++++++++++++++++++++++++++ gas/doc/c-arm.texi | 1 + gas/testsuite/ChangeLog | 23 ++++++++++++++--------- gas/testsuite/gas/arm/armv8-a+pan.d | 11 +++++++++++ gas/testsuite/gas/arm/armv8-a+pan.s | 14 ++++++++++++++ 6 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 gas/testsuite/gas/arm/armv8-a+pan.d create mode 100644 gas/testsuite/gas/arm/armv8-a+pan.s (limited to 'gas') diff --git a/gas/ChangeLog b/gas/ChangeLog index aa7195e..eb3fcca 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,15 @@ 2015-06-02 Matthew Wahab + * config/tc-arm.c (arm_ext_pan): New. + (do_setpan): New, encode an ARM SETPAN instruction. + (do_t_setpan): New, encode a Thumb SETPAN instruction. + (insns): Add "setpan". + (arm_extensions): Add "pan". + * doc/c-arm.texi (ARM Options): Add "pan" to list of -mcpu processor + extensions. + +2015-06-02 Matthew Wahab + * config/tc-aarch64.c (aarch64_features): Add "rdma". * doc/c-aarch64.texi (AArch64 Extensions): Add "rdma". diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 683774f..ece5ebc 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -207,6 +207,7 @@ static const arm_feature_set arm_ext_sec = ARM_FEATURE_CORE_LOW (ARM_EXT_SEC); static const arm_feature_set arm_ext_os = ARM_FEATURE_CORE_LOW (ARM_EXT_OS); static const arm_feature_set arm_ext_adiv = ARM_FEATURE_CORE_LOW (ARM_EXT_ADIV); static const arm_feature_set arm_ext_virt = ARM_FEATURE_CORE_LOW (ARM_EXT_VIRT); +static const arm_feature_set arm_ext_pan = ARM_FEATURE_CORE_HIGH (ARM_EXT2_PAN); static const arm_feature_set arm_arch_any = ARM_ANY; static const arm_feature_set arm_arch_full = ARM_FEATURE (-1, -1, -1); @@ -9181,6 +9182,24 @@ do_swi (void) inst.reloc.pc_rel = 0; } +static void +do_setpan (void) +{ + constraint (!ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_pan), + _("selected processor does not support SETPAN instruction")); + + inst.instruction |= ((inst.operands[0].imm & 1) << 9); +} + +static void +do_t_setpan (void) +{ + constraint (!ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_pan), + _("selected processor does not support SETPAN instruction")); + + inst.instruction |= (inst.operands[0].imm << 3); +} + /* ARM V5E (El Segundo) signed-multiply-accumulate (argument parse) SMLAxy{cond} Rd,Rm,Rs,Rn SMLAWy{cond} Rd,Rm,Rs,Rn @@ -18884,6 +18903,13 @@ static const struct asm_opcode insns[] = TCE("hvc", 1400070, f7e08000, 1, (EXPi), hvc, t_hvc), TCE("eret", 160006e, f3de8f00, 0, (), noargs, noargs), +#undef ARM_VARIANT +#define ARM_VARIANT & arm_ext_pan +#undef THUMB_VARIANT +#define THUMB_VARIANT & arm_ext_pan + + TUF("setpan", 1100000, b610, 1, (I7), setpan, t_setpan), + #undef ARM_VARIANT #define ARM_VARIANT & arm_ext_v6t2 #undef THUMB_VARIANT @@ -24662,6 +24688,9 @@ static const struct arm_option_extension_value_table arm_extensions[] = ARM_EXT_OPT ("os", ARM_FEATURE_CORE_LOW (ARM_EXT_OS), ARM_FEATURE_CORE_LOW (ARM_EXT_OS), ARM_FEATURE_CORE_LOW (ARM_EXT_V6M)), + ARM_EXT_OPT ("pan", ARM_FEATURE_CORE_HIGH (ARM_EXT2_PAN), + ARM_FEATURE (ARM_EXT_V8, ARM_EXT2_PAN, 0), + ARM_FEATURE_CORE_LOW (ARM_EXT_V8)), ARM_EXT_OPT ("sec", ARM_FEATURE_CORE_LOW (ARM_EXT_SEC), ARM_FEATURE_CORE_LOW (ARM_EXT_SEC), ARM_FEATURE_CORE_LOW (ARM_EXT_V6K | ARM_EXT_V7A)), diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi index d31ba02..85ff20d 100644 --- a/gas/doc/c-arm.texi +++ b/gas/doc/c-arm.texi @@ -179,6 +179,7 @@ architectures), @code{simd} (Advanced SIMD Extensions for v8-A architecture, implies @code{fp}), @code{virt} (Virtualization Extensions for v7-A architecture, implies @code{idiv}), +@code{pan} (Priviliged Access Never Extensions for v8-A architecture) and @code{xscale}. diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 2e45237..60d9126 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,20 +1,25 @@ 2015-06-02 Matthew Wahab - * rdma-directive.d: New. - * rdma.d: New. - * rdma.s: New. + * gas/arm/armv8-a+pan.d: New. + * gas/arm/armv8-a+pan.s: New. 2015-06-02 Matthew Wahab - * lor-directive.d: New. - * lor.d: New. - * lor.s: New + * gas/aarch64/rdma-directive.d: New. + * gas/aarch64/rdma.d: New. + * gas/aarch64/rdma.s: New. + +2015-06-02 Matthew Wahab + + * gas/aarch64/lor-directive.d: New. + * gas/aarch64/lor.d: New. + * gas/aarch64/lor.s: New 2015-06-01 Matthew Wahab - * pan-directive.d: New. - * pan.d: New. - * pan.s: New + * gas/aarch64/pan-directive.d: New. + * gas/aarch64/pan.d: New. + * gas/aarch64/pan.s: New 2015-06-01 Jiong Wang diff --git a/gas/testsuite/gas/arm/armv8-a+pan.d b/gas/testsuite/gas/arm/armv8-a+pan.d new file mode 100644 index 0000000..2005260 --- /dev/null +++ b/gas/testsuite/gas/arm/armv8-a+pan.d @@ -0,0 +1,11 @@ +#name: Valid v8-a+pan +#objdump: -dr --prefix-addresses --show-raw-insn + +.*: +file format .*arm.* + + +Disassembly of section .text: +0[0-9a-f]+ <.*> f1100000 setpan #0 +0[0-9a-f]+ <.*> f1100200 setpan #1 +0[0-9a-f]+ <.*> b610 setpan #0 +0[0-9a-f]+ <.*> b618 setpan #1 \ No newline at end of file diff --git a/gas/testsuite/gas/arm/armv8-a+pan.s b/gas/testsuite/gas/arm/armv8-a+pan.s new file mode 100644 index 0000000..f2ed60b --- /dev/null +++ b/gas/testsuite/gas/arm/armv8-a+pan.s @@ -0,0 +1,14 @@ + .syntax unified + .arch armv8-a + .arch_extension pan + +A1: + .arm + setpan #0 + setpan #1 + +T1: + .thumb + setpan #0 + setpan #1 + -- cgit v1.1