From 539d439185fe7b1c73e17d896632d1d964c10e48 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 10 Aug 2009 14:42:39 +0000 Subject: [PATCH] * config/tc-arm.c (do_t_add_sub_w): Fixed constraints. gas/testsuite/ * gas/arm/sp-pc-usage-t.d: New test case. * gas/arm/sp-pc-usage-t.s: New file. --- gas/ChangeLog | 5 + gas/config/tc-arm.c | 16 +++- gas/testsuite/ChangeLog | 6 ++ gas/testsuite/gas/arm/sp-pc-usage-t.d | 88 +++++++++++++++++ gas/testsuite/gas/arm/sp-pc-usage-t.s | 130 ++++++++++++++++++++++++++ 5 files changed, 242 insertions(+), 3 deletions(-) create mode 100644 gas/testsuite/gas/arm/sp-pc-usage-t.d create mode 100644 gas/testsuite/gas/arm/sp-pc-usage-t.s diff --git a/gas/ChangeLog b/gas/ChangeLog index 8bc0235b41f..0ad79fda556 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2009-08-10 Daniel Gutson + + PR gas/10479 + * config/tc-arm.c (do_t_add_sub_w): Fixed constraints. + 2009-08-07 Daniel Jacobowitz * config/tc-arm.c (marked_pr_dependency, mapstate): Delete global diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 20b7f2a2763..1a1957752ae 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -8826,9 +8826,12 @@ do_t_add_sub_w (void) Rd = inst.operands[0].reg; Rn = inst.operands[1].reg; - /* If Rn is REG_PC, this is ADR; if Rn is REG_SP, then this is the - SP-{plus,minute}-immediate form of the instruction. */ - reject_bad_reg (Rd); + /* If Rn is REG_PC, this is ADR; if Rn is REG_SP, then this + is the SP-{plus,minus}-immediate form of the instruction. */ + if (Rn == REG_SP) + constraint (Rd == REG_PC, BAD_PC); + else + reject_bad_reg (Rd); inst.instruction |= (Rn << 16) | (Rd << 8); inst.reloc.type = BFD_RELOC_ARM_T32_IMM12; @@ -10264,6 +10267,11 @@ do_t_mov_cmp (void) } inst.instruction = THUMB_OP16 (inst.instruction); + + /* PR 10443: Do not silently ignore shifted operands. */ + constraint (inst.operands[1].shifted, + _("shifts in CMP/MOV instructions are only supported in unified syntax")); + if (inst.operands[1].isreg) { if (Rn < 8 && Rm < 8) @@ -18416,7 +18424,9 @@ arm_handle_align (fragS * fragP) if (bytes > MAX_MEM_FOR_RS_ALIGN_CODE) bytes &= MAX_MEM_FOR_RS_ALIGN_CODE; +#ifdef OBJ_ELF gas_assert ((fragP->tc_frag_data.thumb_mode & MODE_RECORDED) != 0); +#endif if (fragP->tc_frag_data.thumb_mode & (~ MODE_RECORDED)) { diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 3d9f1e40615..9bffddfbd91 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2009-08-10 Daniel Gutson + + PR gas/10479 + * gas/arm/sp-pc-usage-t.d: New test case. + * gas/arm/sp-pc-usage-t.s: New file. + 2006-08-09 Bernd Schmidt From Mike Frysinger diff --git a/gas/testsuite/gas/arm/sp-pc-usage-t.d b/gas/testsuite/gas/arm/sp-pc-usage-t.d new file mode 100644 index 00000000000..8b21aebbbf4 --- /dev/null +++ b/gas/testsuite/gas/arm/sp-pc-usage-t.d @@ -0,0 +1,88 @@ +# name: SP and PC registers special uses test. +# objdump: -d --prefix-addresses --show-raw-insn + +.*: +file format .*arm.* + +Disassembly of section .text: +00000000 4685 mov sp, r0 +00000002 4668 mov r0, sp +00000004 b000 add sp, #0 +00000006 f20d 0d00 addw sp, sp, #0 +0000000a b080 sub sp, #0 +0000000c f2ad 0d00 subw sp, sp, #0 +00000010 4485 add sp, r0 +00000012 eb0d 0d40 add.w sp, sp, r0, lsl #1 +00000016 ebad 0d00 sub.w sp, sp, r0 +0000001a ebad 0d40 sub.w sp, sp, r0, lsl #1 +0000001e 9800 ldr r0, \[sp, #0\] +00000020 4800 ldr r0, \[pc, #0\] ; \(00000024 \) +00000022 f8d0 f000 ldr.w pc, \[r0\] +00000026 f8d0 d000 ldr.w sp, \[r0\] +0000002a f8df f000 ldr.w pc, \[pc\] ; 0000002c +0000002e f8dd d000 ldr.w sp, \[sp\] +00000032 f8dd f000 ldr.w pc, \[sp\] +00000036 f8df d000 ldr.w sp, \[pc\] ; 00000038 +0000003a f850 d00f ldr.w sp, \[r0, pc\] +0000003e 9000 str r0, \[sp, #0\] +00000040 f8cf 0000 str.w r0, \[pc\] ; 00000044 +00000044 f8c0 f000 str.w pc, \[r0\] +00000048 f8c0 d000 str.w sp, \[r0\] +0000004c f8cf f000 str.w pc, \[pc\] ; 00000050 +00000050 f8cd d000 str.w sp, \[sp\] +00000054 f8cd f000 str.w pc, \[sp\] +00000058 f8cf d000 str.w sp, \[pc\] ; 0000005c +0000005c f840 d00f str.w sp, \[r0, pc\] +00000060 4468 add r0, sp +00000062 eb1d 0000 adds.w r0, sp, r0 +00000066 eb0d 0040 add.w r0, sp, r0, lsl #1 +0000006a eb1d 0040 adds.w r0, sp, r0, lsl #1 +0000006e f11d 0f00 cmn.w sp, #0 +00000072 eb1d 0f00 cmn.w sp, r0 +00000076 eb1d 0f40 cmn.w sp, r0, lsl #1 +0000007a f1bd 0f00 cmp.w sp, #0 +0000007e 4585 cmp sp, r0 +00000080 ebbd 0f40 cmp.w sp, r0, lsl #1 +00000084 b080 sub sp, #0 +00000086 f1bd 0d00 subs.w sp, sp, #0 +0000008a f1ad 0000 sub.w r0, sp, #0 +0000008e f1bd 0000 subs.w r0, sp, #0 +00000092 b001 add sp, #4 +00000094 a801 add r0, sp, #4 +00000096 f11d 0d04 adds.w sp, sp, #4 +0000009a f11d 0004 adds.w r0, sp, #4 +0000009e f20d 0004 addw r0, sp, #4 +000000a2 b001 add sp, #4 +000000a4 f11d 0d04 adds.w sp, sp, #4 +000000a8 f20d 0d04 addw sp, sp, #4 +000000ac 4485 add sp, r0 +000000ae 4468 add r0, sp +000000b0 eb0d 0040 add.w r0, sp, r0, lsl #1 +000000b4 eb1d 0d00 adds.w sp, sp, r0 +000000b8 eb1d 0000 adds.w r0, sp, r0 +000000bc eb1d 0040 adds.w r0, sp, r0, lsl #1 +000000c0 4485 add sp, r0 +000000c2 eb0d 0d40 add.w sp, sp, r0, lsl #1 +000000c6 eb1d 0d00 adds.w sp, sp, r0 +000000ca eb1d 0d40 adds.w sp, sp, r0, lsl #1 +000000ce 44ed add sp, sp +000000d0 f1ad 0000 sub.w r0, sp, #0 +000000d4 f1bd 0000 subs.w r0, sp, #0 +000000d8 f2ad 0000 subw r0, sp, #0 +000000dc b080 sub sp, #0 +000000de f1bd 0d00 subs.w sp, sp, #0 +000000e2 f2ad 0d00 subw sp, sp, #0 +000000e6 b080 sub sp, #0 +000000e8 f1bd 0d00 subs.w sp, sp, #0 +000000ec ebad 0040 sub.w r0, sp, r0, lsl #1 +000000f0 ebbd 0040 subs.w r0, sp, r0, lsl #1 +000000f4 ebad 0d40 sub.w sp, sp, r0, lsl #1 +000000f8 ebbd 0d40 subs.w sp, sp, r0, lsl #1 +000000fc a001 add r0, pc, #4 ; \(adr r0, 00000104 \) +000000fe f2af 0004 subw r0, pc, #4 +00000102 f20f 0004 addw r0, pc, #4 +00000106 f2af 0004 subw r0, pc, #4 +0000010a f20f 0004 addw r0, pc, #4 +0000010e f2af 0004 subw r0, pc, #4 +00000112 bf00[ ]+nop +00000114 bf00[ ]+nop +00000116 bf00[ ]+nop diff --git a/gas/testsuite/gas/arm/sp-pc-usage-t.s b/gas/testsuite/gas/arm/sp-pc-usage-t.s new file mode 100644 index 00000000000..cf38594233e --- /dev/null +++ b/gas/testsuite/gas/arm/sp-pc-usage-t.s @@ -0,0 +1,130 @@ +.arch armv7-r +.syntax unified +.text +.thumb + .global foo +foo: +@ Section A6.1.3 "Use of 0b1101 as a register specifier". + +@ R13 as the source or destination register of a mov instruction. +@ only register to register transfers without shifts are supported, +@ with no flag setting + +mov sp,r0 +mov r0,sp + +@ Using the following instructions to adjust r13 up or down by a +@ multiple of 4: + +add sp,sp,#0 +addw sp,sp,#0 +sub sp,sp,#0 +subw sp,sp,#0 +add sp,sp,r0 +add sp,sp,r0,lsl #1 +sub sp,sp,r0 +sub sp,sp,r0,lsl #1 + +@ R13 as a base register of any load/store instruction. + +ldr r0, [sp] +ldr r0, [pc] +ldr pc, [r0] +ldr sp, [r0] +ldr pc, [pc] +ldr sp, [sp] +ldr pc, [sp] +ldr sp, [pc] +ldr sp, [r0, +pc] + +str r0, [sp] +str r0, [pc] +str pc, [r0] +str sp, [r0] +str pc, [pc] +str sp, [sp] +str pc, [sp] +str sp, [pc] +str sp, [r0, +pc] + +@ R13 as the first operand in any add{s}, cmn, cmp, or sub{s} instruction. + +add r0, sp, r0 +adds r0, sp, r0 +add r0, sp, r0, lsl #1 +adds r0, sp, r0, lsl #1 + +cmn sp, #0 +cmn sp, r0 +cmn sp, r0, lsl #1 +cmp sp, #0 +cmp sp, r0 +cmp sp, r0, lsl #1 + +sub sp, #0 +subs sp, #0 +sub r0, sp, #0 +subs r0, sp, #0 + +@ ADD (sp plus immediate). + +add sp, #4 +add r0, sp, #4 +adds sp, #4 +adds r0, sp, #4 +addw r0, sp, #4 + +add sp, sp, #4 +adds sp, sp, #4 +addw sp, sp, #4 + +@ ADD (sp plus register). + +add sp, r0 +add r0, sp, r0 +add r0, sp, r0, lsl #1 +adds sp, r0 +adds r0, sp, r0 +adds r0, sp, r0, lsl #1 + +add sp, sp, r0 +add sp, sp, r0, lsl #1 +adds sp, sp, r0 +adds sp, sp, r0, lsl #1 + +add sp, sp, sp + +@ SUB (sp minus immediate). + +sub r0, sp , #0 +subs r0, sp , #0 +subw r0, sp , #0 + +sub sp, sp , #0 +subs sp, sp , #0 +subw sp, sp , #0 + +@ SUB (sp minus register). + +sub sp, #0 +subs sp, #0 +sub r0, sp, r0, lsl #1 +subs r0, sp, r0, lsl #1 + +sub sp, sp, r0, lsl #1 +subs sp, sp, r0, lsl #1 + +@ PC-related insns (equivalent to adr). + +add r0, pc, #4 +sub r0, pc, #4 +adds r0, pc, #4 +subs r0, pc, #4 +addw r0, pc, #4 +subw r0, pc, #4 + +@ nops to pad the section out to an alignment boundary. + +nop +nop +nop -- 2.30.2