From 87b8eed7fb7040a67d3f7317258795bdd258612b Mon Sep 17 00:00:00 2001 From: Yufeng Zhang Date: Wed, 20 Nov 2013 11:22:40 +0000 Subject: [PATCH] gas/testsuite/ * gas/aarch64/msr.s: Add tests. * gas/aarch64/msr.d: Update. include/opcode * aarch64.h (aarch64_pstatefields): Change element type to aarch64_sys_reg. opcodes/ * aarch64-opc.c (aarch64_pstatefields): Update. --- gas/testsuite/ChangeLog | 5 +++++ gas/testsuite/gas/aarch64/msr.d | 2 ++ gas/testsuite/gas/aarch64/msr.s | 5 ++++- include/opcode/ChangeLog | 5 +++++ include/opcode/aarch64.h | 2 +- opcodes/ChangeLog | 4 ++++ opcodes/aarch64-opc.c | 10 +++++----- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 4d8e7dee3c3..be531577a26 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-11-20 Yufeng Zhang + + * gas/aarch64/msr.s: Add tests. + * gas/aarch64/msr.d: Update. + 2013-11-19 Catherine Moore * gas/mips/fix-pmc-rm7000-1.d: New. diff --git a/gas/testsuite/gas/aarch64/msr.d b/gas/testsuite/gas/aarch64/msr.d index c6c32200a41..750cae119ab 100644 --- a/gas/testsuite/gas/aarch64/msr.d +++ b/gas/testsuite/gas/aarch64/msr.d @@ -13,3 +13,5 @@ Disassembly of section \.text: 14: d5034fff msr daifclr, #0xf 18: d51b4220 msr daif, x0 1c: d53b4220 mrs x0, daif + 20: d50040bf msr spsel, #0x0 + 24: d50041bf msr spsel, #0x1 diff --git a/gas/testsuite/gas/aarch64/msr.s b/gas/testsuite/gas/aarch64/msr.s index 9f67d987713..01018c289d1 100644 --- a/gas/testsuite/gas/aarch64/msr.s +++ b/gas/testsuite/gas/aarch64/msr.s @@ -1,5 +1,5 @@ /* - Copyright 2011, 2012 Free Software Foundation, Inc. + Copyright 2011-2013 Free Software Foundation, Inc. Contributed by ARM Ltd. This file is part of GAS. @@ -31,3 +31,6 @@ func: msr daif, x0 mrs x0, daif + + msr spsel, #0 + msr spsel, #1 diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index f4d1b0665ab..216736daede 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,8 @@ +2013-11-20 Yufeng Zhang + + * aarch64.h (aarch64_pstatefields): Change element type to + aarch64_sys_reg. + 2013-11-18 Renlin Li * arm.h (ARM_AEXT_V7VE): New define. diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h index 4a3a312b683..053294e3358 100644 --- a/include/opcode/aarch64.h +++ b/include/opcode/aarch64.h @@ -611,7 +611,6 @@ struct aarch64_name_value_pair }; extern const struct aarch64_name_value_pair aarch64_operand_modifiers []; -extern const struct aarch64_name_value_pair aarch64_pstatefields []; extern const struct aarch64_name_value_pair aarch64_barrier_options [16]; extern const struct aarch64_name_value_pair aarch64_prfops [32]; @@ -623,6 +622,7 @@ typedef struct } aarch64_sys_reg; extern const aarch64_sys_reg aarch64_sys_regs []; +extern const aarch64_sys_reg aarch64_pstatefields []; extern bfd_boolean aarch64_sys_reg_deprecated_p (const aarch64_sys_reg *); typedef struct diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 8ed5de9c2b6..8557c6d0cf9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2013-11-20 Yufeng Zhang + + * aarch64-opc.c (aarch64_pstatefields): Update. + 2013-11-19 Catherine Moore * micromips-opc.c (LM): Define. diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c index af1472a5824..43133279df6 100644 --- a/opcodes/aarch64-opc.c +++ b/opcodes/aarch64-opc.c @@ -3019,12 +3019,12 @@ aarch64_sys_reg_deprecated_p (const aarch64_sys_reg *reg) return (reg->flags & F_DEPRECATED) != 0; } -const struct aarch64_name_value_pair aarch64_pstatefields [] = +const aarch64_sys_reg aarch64_pstatefields [] = { - { "spsel", 0x05 }, - { "daifset", 0x1e }, - { "daifclr", 0x1f }, - { 0, CPENC(0,0,0,0,0) }, + { "spsel", 0x05, 0 }, + { "daifset", 0x1e, 0 }, + { "daifclr", 0x1f, 0 }, + { 0, CPENC(0,0,0,0,0), 0 }, }; const aarch64_sys_ins_reg aarch64_sys_regs_ic[] = -- 2.30.2