gas/testsuite/

	* gas/arm/dis-data.d: Update test name.  Do not expect
	.word output.
	* gas/arm/dis-data2.d, gas/arm/dis-data2.s,
	gas/arm/dis-data3.d, gas/arm/dis-data3.s: New tests.

	opcodes/
	* opcodes/arm-dis.c (struct arm_private_data): New.
	(print_insn_coprocessor, print_insn_arm): Update to use struct
	arm_private_data.
	(is_mapping_symbol, get_map_sym_type): New functions.
	(get_sym_code_type): Check the symbol's section.  Do not check
	mapping symbols.
	(print_insn): Default to disassembling ARM mode code.  Check
	for mapping symbols separately from other symbols.  Use
	struct arm_private_data.

5 files changed, 41 insertions, 4 deletions

diff --git a/gas/testsuite/gas/arm/dis-data.d b/gas/testsuite/gas/arm/dis-data.d
index 9715453787..40ca7709b6 100644
--- a/gas/testsuite/gas/arm/dis-data.d
+++ b/gas/testsuite/gas/arm/dis-data.d
@@ -1,10 +1,10 @@
-# name: Data disassembler test
+# name: Data disassembler test (no symbols)
 # skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
 # objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*arm.*
 
 Disassembly of section \.text:
-0x00000000 20010000 	.word	0x20010000
-0x00000004 000000f9 	.word	0x000000f9
-0x00000008 00004cd5 	.word	0x00004cd5
+0x00000000 20010000 	andcs	r0, r1, r0
+0x00000004 000000f9 	strdeq	r0, \[r0\], -r9
+0x00000008 00004cd5 	ldrdeq	r4, \[r0\], -r5
diff --git a/gas/testsuite/gas/arm/dis-data2.d b/gas/testsuite/gas/arm/dis-data2.d
new file mode 100644
index 0000000000..ef7bb81d42
--- /dev/null
+++ b/gas/testsuite/gas/arm/dis-data2.d
@@ -0,0 +1,10 @@
+# name: Data disassembler test (function symbol)
+# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# objdump: -dr --prefix-addresses --show-raw-insn
+
+.*: +file format .*arm.*
+
+Disassembly of section \.text:
+00000000 <main> 20010000 	andcs	r0, r1, r0
+00000004 <main\+0x4> 000000f9 	strdeq	r0, \[r0\], -r9
+00000008 <main\+0x8> 00004cd5 	ldrdeq	r4, \[r0\], -r5
diff --git a/gas/testsuite/gas/arm/dis-data2.s b/gas/testsuite/gas/arm/dis-data2.s
new file mode 100644
index 0000000000..30eaa678a0
--- /dev/null
+++ b/gas/testsuite/gas/arm/dis-data2.s
@@ -0,0 +1,8 @@
+.syntax unified
+.type main, %function
+.globl main
+main:
+.word	0x20010000
+.word	0x000000f9
+.word	0x00004cd5
+
diff --git a/gas/testsuite/gas/arm/dis-data3.d b/gas/testsuite/gas/arm/dis-data3.d
new file mode 100644
index 0000000000..e33159b840
--- /dev/null
+++ b/gas/testsuite/gas/arm/dis-data3.d
@@ -0,0 +1,11 @@
+# name: Data disassembler test (with mapping symbol)
+# skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# objdump: -dr --prefix-addresses --show-raw-insn
+
+.*: +file format .*arm.*
+
+Disassembly of section \.text:
+00000000 <main> 20010000 	.word	0x20010000
+00000004 <main\+0x4> 000000f9 	.word	0x000000f9
+00000008 <main\+0x8> 00004cd5 	.word	0x00004cd5
+0000000c <main\+0xc> e1a00000 	nop			; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/dis-data3.s b/gas/testsuite/gas/arm/dis-data3.s
new file mode 100644
index 0000000000..73da9b411c
--- /dev/null
+++ b/gas/testsuite/gas/arm/dis-data3.s
@@ -0,0 +1,8 @@
+.syntax unified
+.type main, %function
+.globl main
+main:
+.word	0x20010000
+.word	0x000000f9
+.word	0x00004cd5
+nop