PR 10288

        * arm-dis.c (enum opcode_sentinels): New:  Used to mark the
        boundary between variaant and generic coprocessor instuctions.
        (coprocessor): Use it.
        Fix architecture version of MCRR and MRRC instructions.
        (arm_opcdes): Fix patterns for STRB and STRH instructions.
        (print_insn_coprocessor): Check architecture and extension masks.
        Print a hexadecimal version of any decimal constant that is
        outside of the range of -16 to +32.
        (print_arm_address): Add a return value of the offset used in the
        adress, if it is worth printing a hexadecimal version of it.
        (print_insn_neon): Print a hexadecimal version of any decimal
        constant that is outside of the range of -16 to +32.
        (print_insn_arm): Likewise.
        (print_insn_thumb16): Likewise.
        (print_insn_thumb32): Likewise.

        PR 10297
        * arm-dis.c (UNDEFINED_INSTRUCTION): New macro for a description
        of an undefined instruction.
        (arm_opcodes): Use it.
        (thumb_opcod): Use it.
        (thumb32_opc): Use it.

        Update expected disassembly regrexps in GAS and LD testsuites.

15 files changed, 52 insertions, 34 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1ff0cdc..2e13629 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2009-06-29  Nick Clifton  <nickc@redhat.com>
+
+	PR 10288
+	* ld-arm/arm-app-abs32.d: Update expected disassembly.
+	* ld-arm/arm-app.d: Likewise.
+	* ld-arm/arm-lib-plt32.d: Likewise.
+	* ld-arm/arm-lib.d: Likewise.
+	* ld-arm/arm-pic-veneer.d: Likewise.
+	* ld-arm/armthumb-lib.d: Likewise.
+	* ld-arm/farcall-mixed-app-v5.d: Likewise.
+	* ld-arm/farcall-mixed-app.d: Likewise.
+	* ld-arm/farcall-mixed-lib.d: Likewise.
+	* ld-arm/group-relocs.d: Likewise.
+	* ld-arm/mixed-app-v5.d: Likewise.
+	* ld-arm/mixed-app.d: Likewise.
+	* ld-arm/mixed-lib.d: Likewise.
+	* ld-arm/thumb2-bl-undefweak.d: Likewise.
+
 2009-06-27  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/10337
diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d
index ce684d4..25c1754 100644
--- a/ld/testsuite/ld-arm/arm-app-abs32.d
+++ b/ld/testsuite/ld-arm/arm-app-abs32.d
@@ -14,7 +14,7 @@ Disassembly of section .plt:
     .*:	.* 	.*
     .*:	e28fc6.* 	add	ip, pc, #.*	; .*
     .*:	e28cca.* 	add	ip, ip, #.*	; .*
-    .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+    .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 Disassembly of section .text:
 
 .* <_start>:
diff --git a/ld/testsuite/ld-arm/arm-app.d b/ld/testsuite/ld-arm/arm-app.d
index 3ed76f0..dfb41413 100644
--- a/ld/testsuite/ld-arm/arm-app.d
+++ b/ld/testsuite/ld-arm/arm-app.d
@@ -14,7 +14,7 @@ Disassembly of section .plt:
  .*:	.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 Disassembly of section .text:
 
 .* <_start>:
diff --git a/ld/testsuite/ld-arm/arm-lib-plt32.d b/ld/testsuite/ld-arm/arm-lib-plt32.d
index d1b7944..55fdd58 100644
--- a/ld/testsuite/ld-arm/arm-lib-plt32.d
+++ b/ld/testsuite/ld-arm/arm-lib-plt32.d
@@ -14,7 +14,7 @@ Disassembly of section .plt:
  .*:	.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 Disassembly of section .text:
 
 .* <lib_func1>:
diff --git a/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d
index 9d25bbb..132f060 100644
--- a/ld/testsuite/ld-arm/arm-lib.d
+++ b/ld/testsuite/ld-arm/arm-lib.d
@@ -14,7 +14,7 @@ Disassembly of section .plt:
  .*:	.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 Disassembly of section .text:
 
 .* <lib_func1>:
diff --git a/ld/testsuite/ld-arm/arm-pic-veneer.d b/ld/testsuite/ld-arm/arm-pic-veneer.d
index d3a8cf6..edcdb83 100644
--- a/ld/testsuite/ld-arm/arm-pic-veneer.d
+++ b/ld/testsuite/ld-arm/arm-pic-veneer.d
@@ -4,7 +4,7 @@
 Disassembly of section .text:
 
 00008000 <_start>:
-    8000:	ea000000 	b	8008 <__foo_from_arm>
+    8000:	ea...... 	b	800. <.*>
 
 00008004 <foo>:
     8004:	46c0      	nop			\(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d
index cc922f1..497cb34 100644
--- a/ld/testsuite/ld-arm/armthumb-lib.d
+++ b/ld/testsuite/ld-arm/armthumb-lib.d
@@ -14,7 +14,7 @@ Disassembly of section .plt:
  .*:	.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 Disassembly of section .text:
 
 .* <lib_func1>:
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
index d34a686..035d1f8 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
@@ -14,10 +14,10 @@ Disassembly of section .plt:
  .*:	.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app.d b/ld/testsuite/ld-arm/farcall-mixed-app.d
index fac7037..695c49a 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app.d
@@ -16,10 +16,10 @@ Disassembly of section .plt:
  .*:	46c0      	nop			\(mov r8, r8\)
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib.d b/ld/testsuite/ld-arm/farcall-mixed-lib.d
index 18e7ef0..2cf164e 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-lib.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib.d
@@ -13,16 +13,16 @@ Disassembly of section .plt:
  .*:	.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-arm/group-relocs.d b/ld/testsuite/ld-arm/group-relocs.d
index d1fdc7d..2f072f9 100644
--- a/ld/testsuite/ld-arm/group-relocs.d
+++ b/ld/testsuite/ld-arm/group-relocs.d
@@ -17,40 +17,40 @@ Disassembly of section .text:
     8028:	e2800cee 	add	r0, r0, #60928	; 0xee00
     802c:	e28000f0 	add	r0, r0, #240	; 0xf0
     8030:	e2800c6e 	add	r0, r0, #28160	; 0x6e00
-    8034:	e59010c0 	ldr	r1, \[r0, #192\]
+    8034:	e59010c0 	ldr	r1, \[r0, #192\].*
     8038:	e28008ff 	add	r0, r0, #16711680	; 0xff0000
     803c:	e2800c6e 	add	r0, r0, #28160	; 0x6e00
-    8040:	e59010b8 	ldr	r1, \[r0, #184\]
+    8040:	e59010b8 	ldr	r1, \[r0, #184\].*
     8044:	e5901000 	ldr	r1, \[r0\]
     8048:	e2800cee 	add	r0, r0, #60928	; 0xee00
-    804c:	e59010f0 	ldr	r1, \[r0, #240\]
+    804c:	e59010f0 	ldr	r1, \[r0, #240\].*
     8050:	e28008ff 	add	r0, r0, #16711680	; 0xff0000
     8054:	e2800cee 	add	r0, r0, #60928	; 0xee00
-    8058:	e59010f0 	ldr	r1, \[r0, #240\]
-    805c:	e1c026d0 	ldrd	r2, \[r0, #96\]
+    8058:	e59010f0 	ldr	r1, \[r0, #240\].*
+    805c:	e1c026d0 	ldrd	r2, \[r0, #96\].*
     8060:	e2800c6e 	add	r0, r0, #28160	; 0x6e00
-    8064:	e1c029d0 	ldrd	r2, \[r0, #144\]
+    8064:	e1c029d0 	ldrd	r2, \[r0, #144\].*
     8068:	e28008ff 	add	r0, r0, #16711680	; 0xff0000
     806c:	e2800c6e 	add	r0, r0, #28160	; 0x6e00
-    8070:	e1c028d8 	ldrd	r2, \[r0, #136\]
+    8070:	e1c028d8 	ldrd	r2, \[r0, #136\].*
     8074:	e1c020d0 	ldrd	r2, \[r0\]
     8078:	e2800cee 	add	r0, r0, #60928	; 0xee00
-    807c:	e1c02fd0 	ldrd	r2, \[r0, #240\]
+    807c:	e1c02fd0 	ldrd	r2, \[r0, #240\].*
     8080:	e28008ff 	add	r0, r0, #16711680	; 0xff0000
     8084:	e2800cee 	add	r0, r0, #60928	; 0xee00
-    8088:	e1c02fd0 	ldrd	r2, \[r0, #240\]
-    808c:	ed90000c 	ldc	0, cr0, \[r0, #48\]
+    8088:	e1c02fd0 	ldrd	r2, \[r0, #240\].*
+    808c:	ed90000c 	ldc	0, cr0, \[r0, #48\].*
     8090:	e2800c6e 	add	r0, r0, #28160	; 0x6e00
-    8094:	ed900018 	ldc	0, cr0, \[r0, #96\]
+    8094:	ed900018 	ldc	0, cr0, \[r0, #96\].*
     8098:	e28008ff 	add	r0, r0, #16711680	; 0xff0000
     809c:	e2800c6e 	add	r0, r0, #28160	; 0x6e00
-    80a0:	ed900016 	ldc	0, cr0, \[r0, #88\]
+    80a0:	ed900016 	ldc	0, cr0, \[r0, #88\].*
     80a4:	ed900000 	ldc	0, cr0, \[r0\]
     80a8:	e2800cee 	add	r0, r0, #60928	; 0xee00
-    80ac:	ed90003c 	ldc	0, cr0, \[r0, #240\]
+    80ac:	ed90003c 	ldc	0, cr0, \[r0, #240\].*
     80b0:	e28008ff 	add	r0, r0, #16711680	; 0xff0000
     80b4:	e2800cee 	add	r0, r0, #60928	; 0xee00
-    80b8:	ed90003c 	ldc	0, cr0, \[r0, #240\]
+    80b8:	ed90003c 	ldc	0, cr0, \[r0, #240\].*
 
 000080bc <one_group_needed_alu_pc>:
     80bc:	e3a00000 	mov	r0, #0	; 0x0
diff --git a/ld/testsuite/ld-arm/mixed-app-v5.d b/ld/testsuite/ld-arm/mixed-app-v5.d
index 88317d2..426708b 100644
--- a/ld/testsuite/ld-arm/mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/mixed-app-v5.d
@@ -14,10 +14,10 @@ Disassembly of section .plt:
  .*:	.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 Disassembly of section .text:
 
 .* <_start>:
diff --git a/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d
index a3679dd..9d18b0a 100644
--- a/ld/testsuite/ld-arm/mixed-app.d
+++ b/ld/testsuite/ld-arm/mixed-app.d
@@ -16,10 +16,10 @@ Disassembly of section .plt:
  .*:	46c0      	nop			\(mov r8, r8\)
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 Disassembly of section .text:
 
 .* <_start>:
diff --git a/ld/testsuite/ld-arm/mixed-lib.d b/ld/testsuite/ld-arm/mixed-lib.d
index ce488a6..2fc40a6 100644
--- a/ld/testsuite/ld-arm/mixed-lib.d
+++ b/ld/testsuite/ld-arm/mixed-lib.d
@@ -14,7 +14,7 @@ Disassembly of section .plt:
  .*:	.*
  .*:	e28fc6.* 	add	ip, pc, #.*	; 0x.*
  .*:	e28cca.* 	add	ip, ip, #.*	; 0x.*
- .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!
+ .*:	e5bcf.* 	ldr	pc, \[ip, #.*\]!.*
 Disassembly of section .text:
 
 .* <lib_func1>:
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
index d06f1ab..32f7cc1 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
@@ -6,4 +6,4 @@
 Disassembly of section .text:
 
 .* <foo>:
- .*:	.... .... 	blx	... <foo-0x.*>
+ .*:	.... .... 	bl.	... <foo-0x.*>