[binutils-gdb] AArch64/Arm: Update testcases fixing endiannes and linux targets
Tamar Christina
tnfchris@sourceware.org
Tue Mar 26 16:48:00 GMT 2019
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=05805feba20cb8cc39c7324e0b427f2bb7cdfe44
commit 05805feba20cb8cc39c7324e0b427f2bb7cdfe44
Author: Tamar Christina <tamar.christina@arm.com>
Date: Tue Mar 26 16:46:42 2019 +0000
AArch64/Arm: Update testcases fixing endiannes and linux targets
This fixes the testcases that are failing due to my recent patch.
It turns out that the start address across baremetal and linux builds
isn't entirely predictable without a linker script. Since the address
themselves are not the important thing I am ignoring them now.
Secondly I was encoding data using .word using non 0 values, however
because .word is subjected to endiannes these non-zero values under
big-endian happen to fall into the encoding space of instructions which
changes the disassembly. Using 0 fixes this problem and the purpose of
the test still holds, though objdump will dump ... for data only sections,
which is ok as the data/insn mixed sections will test the patch.
The ARM Attributes sections is not important and is ignored.
binutils/ChangeLog:
* testsuite/binutils-all/aarch64/in-order.d: Likewise.
* testsuite/binutils-all/aarch64/out-of-order-all.d: Likewise.
* testsuite/binutils-all/aarch64/out-of-order.d: Likewise.
* testsuite/binutils-all/aarch64/out-of-order.s: Likewise.
* testsuite/binutils-all/arm/in-order-all.d: Likewise.
* testsuite/binutils-all/arm/in-order.d: Likewise.
* testsuite/binutils-all/arm/out-of-order-all.d: Likewise.
* testsuite/binutils-all/arm/out-of-order.d: Likewise.
* testsuite/binutils-all/arm/out-of-order.s: Likewise.
Diff:
---
binutils/ChangeLog | 13 ++++++
.../testsuite/binutils-all/aarch64/in-order-all.d | 37 ++++++++---------
binutils/testsuite/binutils-all/aarch64/in-order.d | 24 +++++------
.../binutils-all/aarch64/out-of-order-all.d | 37 ++++++++---------
.../testsuite/binutils-all/aarch64/out-of-order.d | 24 +++++------
.../testsuite/binutils-all/aarch64/out-of-order.s | 8 ++--
binutils/testsuite/binutils-all/arm/in-order-all.d | 46 +++++++++++-----------
binutils/testsuite/binutils-all/arm/in-order.d | 24 +++++------
.../testsuite/binutils-all/arm/out-of-order-all.d | 46 +++++++++++-----------
binutils/testsuite/binutils-all/arm/out-of-order.d | 24 +++++------
binutils/testsuite/binutils-all/arm/out-of-order.s | 8 ++--
11 files changed, 145 insertions(+), 146 deletions(-)
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 683abb7..134e025 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,16 @@
+2019-03-26 Tamar Christina <tamar.christina@arm.com>
+
+ * testsuite/binutils-all/aarch64/in-order-all.d: Update.
+ * testsuite/binutils-all/aarch64/in-order.d: Likewise.
+ * testsuite/binutils-all/aarch64/out-of-order-all.d: Likewise.
+ * testsuite/binutils-all/aarch64/out-of-order.d: Likewise.
+ * testsuite/binutils-all/aarch64/out-of-order.s: Likewise.
+ * testsuite/binutils-all/arm/in-order-all.d: Likewise.
+ * testsuite/binutils-all/arm/in-order.d: Likewise.
+ * testsuite/binutils-all/arm/out-of-order-all.d: Likewise.
+ * testsuite/binutils-all/arm/out-of-order.d: Likewise.
+ * testsuite/binutils-all/arm/out-of-order.s: Likewise.
+
2019-03-26 Nick Clifton <nickc@redhat.com>
* MAINTAINERS: Take over Dave Brolley's maintainerships for FR30,
diff --git a/binutils/testsuite/binutils-all/aarch64/in-order-all.d b/binutils/testsuite/binutils-all/aarch64/in-order-all.d
index 32f501b..a484ca7 100644
--- a/binutils/testsuite/binutils-all/aarch64/in-order-all.d
+++ b/binutils/testsuite/binutils-all/aarch64/in-order-all.d
@@ -8,36 +8,31 @@
Disassembly of section \.func1:
-0000000000400000 <v1>:
- 400000: 8b010000 add x0, x0, x1
- 400004: 00000000 \.inst 0x00000000 ; undefined
+.+ <v1>:
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 00000000 \.inst 0x00000000 ; undefined
Disassembly of section \.func2:
-0000000000400008 <\.func2>:
- 400008: 8b010000 add x0, x0, x1
+.+ <\.func2>:
+[^:]+: 8b010000 add x0, x0, x1
Disassembly of section \.func3:
-000000000040000c <\.func3>:
- 40000c: 8b010000 add x0, x0, x1
- 400010: 8b010000 add x0, x0, x1
- 400014: 8b010000 add x0, x0, x1
- 400018: 8b010000 add x0, x0, x1
- 40001c: 8b010000 add x0, x0, x1
- 400020: 00000000 \.inst 0x00000000 ; undefined
+.+ <\.func3>:
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 00000000 \.inst 0x00000000 ; undefined
Disassembly of section \.rodata:
-0000000000400024 <\.rodata>:
- 400024: 00000004 \.inst 0x00000004 ; undefined
+.+ <\.rodata>:
+[^:]+: 00000000 \.inst 0x00000000 ; undefined
Disassembly of section .global:
-0000000000410028 <__data_start>:
- 410028: 00000001 \.inst 0x00000001 ; undefined
- 41002c: 00000000 \.inst 0x00000000 ; undefined
- 410030: 00000001 \.inst 0x00000001 ; undefined
- 410034: 00000000 \.inst 0x00000000 ; undefined
- 410038: 00000001 \.inst 0x00000001 ; undefined
- 41003c: 00000000 \.inst 0x00000000 ; undefined
+.+ <.+>:
+ ...
diff --git a/binutils/testsuite/binutils-all/aarch64/in-order.d b/binutils/testsuite/binutils-all/aarch64/in-order.d
index 090337f..1c0532e 100644
--- a/binutils/testsuite/binutils-all/aarch64/in-order.d
+++ b/binutils/testsuite/binutils-all/aarch64/in-order.d
@@ -8,21 +8,21 @@
Disassembly of section \.func1:
-0000000000400000 <v1>:
- 400000: 8b010000 add x0, x0, x1
- 400004: 00000000 \.word 0x00000000
+.+ <v1>:
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 00000000 \.word 0x00000000
Disassembly of section .func2:
-0000000000400008 <\.func2>:
- 400008: 8b010000 add x0, x0, x1
+.+ <\.func2>:
+[^:]+: 8b010000 add x0, x0, x1
Disassembly of section \.func3:
-000000000040000c <\.func3>:
- 40000c: 8b010000 add x0, x0, x1
- 400010: 8b010000 add x0, x0, x1
- 400014: 8b010000 add x0, x0, x1
- 400018: 8b010000 add x0, x0, x1
- 40001c: 8b010000 add x0, x0, x1
- 400020: 00000000 \.word 0x00000000
+.+ <\.func3>:
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 00000000 \.word 0x00000000
diff --git a/binutils/testsuite/binutils-all/aarch64/out-of-order-all.d b/binutils/testsuite/binutils-all/aarch64/out-of-order-all.d
index 3020def..d3aa79e 100644
--- a/binutils/testsuite/binutils-all/aarch64/out-of-order-all.d
+++ b/binutils/testsuite/binutils-all/aarch64/out-of-order-all.d
@@ -8,36 +8,31 @@
Disassembly of section \.global:
-00000000ffe00000 <\.global>:
- ffe00000: 00000001 \.inst 0x00000001 ; undefined
- ffe00004: 00000000 \.inst 0x00000000 ; undefined
- ffe00008: 00000001 \.inst 0x00000001 ; undefined
- ffe0000c: 00000000 \.inst 0x00000000 ; undefined
- ffe00010: 00000001 \.inst 0x00000001 ; undefined
- ffe00014: 00000000 \.inst 0x00000000 ; undefined
+.+ <\.global>:
+ ...
Disassembly of section \.func2:
-0000000004018280 <\.func2>:
- 4018280: 8b010000 add x0, x0, x1
+.+ <\.func2>:
+[^:]+: 8b010000 add x0, x0, x1
Disassembly of section \.func1:
-0000000004005000 <v1>:
- 4005000: 8b010000 add x0, x0, x1
- 4005004: 00000000 \.inst 0x00000000 ; undefined
+.+ <v1>:
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 00000000 \.inst 0x00000000 ; undefined
Disassembly of section \.func3:
-0000000004015000 <\.func3>:
- 4015000: 8b010000 add x0, x0, x1
- 4015004: 8b010000 add x0, x0, x1
- 4015008: 8b010000 add x0, x0, x1
- 401500c: 8b010000 add x0, x0, x1
- 4015010: 8b010000 add x0, x0, x1
- 4015014: 00000000 \.inst 0x00000000 ; undefined
+.+ <\.func3>:
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 00000000 \.inst 0x00000000 ; undefined
Disassembly of section \.rodata:
-0000000004015018 <\.rodata>:
- 4015018: 00000004 \.inst 0x00000004 ; undefined
+.+ <\.rodata>:
+[^:]+: 00000000 \.inst 0x00000000 ; undefined
diff --git a/binutils/testsuite/binutils-all/aarch64/out-of-order.d b/binutils/testsuite/binutils-all/aarch64/out-of-order.d
index 410f37f..a807b71 100644
--- a/binutils/testsuite/binutils-all/aarch64/out-of-order.d
+++ b/binutils/testsuite/binutils-all/aarch64/out-of-order.d
@@ -7,21 +7,21 @@
Disassembly of section \.func2:
-0000000004018280 <\.func2>:
- 4018280: 8b010000 add x0, x0, x1
+.+ <\.func2>:
+[^:]+: 8b010000 add x0, x0, x1
Disassembly of section \.func1:
-0000000004005000 <v1>:
- 4005000: 8b010000 add x0, x0, x1
- 4005004: 00000000 \.word 0x00000000
+.+ <v1>:
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 00000000 \.word 0x00000000
Disassembly of section \.func3:
-0000000004015000 <\.func3>:
- 4015000: 8b010000 add x0, x0, x1
- 4015004: 8b010000 add x0, x0, x1
- 4015008: 8b010000 add x0, x0, x1
- 401500c: 8b010000 add x0, x0, x1
- 4015010: 8b010000 add x0, x0, x1
- 4015014: 00000000 \.word 0x00000000
+.+ <\.func3>:
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 8b010000 add x0, x0, x1
+[^:]+: 00000000 \.word 0x00000000
diff --git a/binutils/testsuite/binutils-all/aarch64/out-of-order.s b/binutils/testsuite/binutils-all/aarch64/out-of-order.s
index 6c52e85..51e66d7 100644
--- a/binutils/testsuite/binutils-all/aarch64/out-of-order.s
+++ b/binutils/testsuite/binutils-all/aarch64/out-of-order.s
@@ -20,9 +20,9 @@ v1:
.data
.section .global,"aw",@progbits
- .xword 1
- .xword 1
- .xword 1
+ .xword 0
+ .xword 0
+ .xword 0
.section .rodata
- .word 4
+ .word 0
diff --git a/binutils/testsuite/binutils-all/arm/in-order-all.d b/binutils/testsuite/binutils-all/arm/in-order-all.d
index 3a098dd..5e51ca1 100644
--- a/binutils/testsuite/binutils-all/arm/in-order-all.d
+++ b/binutils/testsuite/binutils-all/arm/in-order-all.d
@@ -8,43 +8,41 @@
Disassembly of section \.func1:
-00400000 <v1>:
- 400000: e0800001 add r0, r0, r1
- 400004: 00000000 andeq r0, r0, r0
+.+ <v1>:
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: 00000000 andeq r0, r0, r0
Disassembly of section \.func2:
-00400008 <\.func2>:
- 400008: e0800001 add r0, r0, r1
+.+ <\.func2>:
+[^:]+: e0800001 add r0, r0, r1
Disassembly of section \.func3:
-0040000c <\.func3>:
- 40000c: e0800001 add r0, r0, r1
- 400010: e0800001 add r0, r0, r1
- 400014: e0800001 add r0, r0, r1
- 400018: e0800001 add r0, r0, r1
- 40001c: e0800001 add r0, r0, r1
- 400020: 00000000 andeq r0, r0, r0
+.+ <\.func3>:
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: 00000000 andeq r0, r0, r0
Disassembly of section \.rodata:
-00400024 <\.rodata>:
- 400024: 00000004 andeq r0, r0, r4
+.+ <\.rodata>:
+[^:]+: 00000000 andeq r0, r0, r0
Disassembly of section \.global:
-00410028 <__data_start>:
- 410028: 00000001 andeq r0, r0, r1
- 41002c: 00000001 andeq r0, r0, r1
- 410030: 00000001 andeq r0, r0, r1
+.+ <.+>:
+ ...
Disassembly of section \.ARM\.attributes:
-00000000 <\.ARM\.attributes>:
- 0: 00001141 andeq r1, r0, r1, asr #2
- 4: 61656100 cmnvs r5, r0, lsl #2
- 8: 01006962 tsteq r0, r2, ror #18
- c: 00000007 andeq r0, r0, r7
- 10: Address 0x0000000000000010 is out of bounds.
+.+ <\.ARM\.attributes>:
+[^:]+: .+
+[^:]+: .+
+[^:]+: .+
+[^:]+: .+
+[^:]+: .+
diff --git a/binutils/testsuite/binutils-all/arm/in-order.d b/binutils/testsuite/binutils-all/arm/in-order.d
index a0b63c2..a2c9b9e 100644
--- a/binutils/testsuite/binutils-all/arm/in-order.d
+++ b/binutils/testsuite/binutils-all/arm/in-order.d
@@ -8,21 +8,21 @@
Disassembly of section \.func1:
-00400000 <v1>:
- 400000: e0800001 add r0, r0, r1
- 400004: 00000000 \.word 0x00000000
+.+ <v1>:
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: 00000000 \.word 0x00000000
Disassembly of section \.func2:
-00400008 <\.func2>:
- 400008: e0800001 add r0, r0, r1
+.+ <\.func2>:
+[^:]+: e0800001 add r0, r0, r1
Disassembly of section \.func3:
-0040000c <\.func3>:
- 40000c: e0800001 add r0, r0, r1
- 400010: e0800001 add r0, r0, r1
- 400014: e0800001 add r0, r0, r1
- 400018: e0800001 add r0, r0, r1
- 40001c: e0800001 add r0, r0, r1
- 400020: 00000000 \.word 0x00000000
+.+ <\.func3>:
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: 00000000 \.word 0x00000000
diff --git a/binutils/testsuite/binutils-all/arm/out-of-order-all.d b/binutils/testsuite/binutils-all/arm/out-of-order-all.d
index 58c4057..c1df003 100644
--- a/binutils/testsuite/binutils-all/arm/out-of-order-all.d
+++ b/binutils/testsuite/binutils-all/arm/out-of-order-all.d
@@ -8,43 +8,41 @@
Disassembly of section \.global:
-ffe00000 <\.global>:
-ffe00000: 00000001 andeq r0, r0, r1
-ffe00004: 00000001 andeq r0, r0, r1
-ffe00008: 00000001 andeq r0, r0, r1
+.+ <\.global>:
+ ...
Disassembly of section \.func2:
-04018280 <\.func2>:
- 4018280: e0800001 add r0, r0, r1
+.+ <\.func2>:
+[^:]+: e0800001 add r0, r0, r1
Disassembly of section \.func1:
-04005000 <v1>:
- 4005000: e0800001 add r0, r0, r1
- 4005004: 00000000 andeq r0, r0, r0
+.+ <v1>:
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: 00000000 andeq r0, r0, r0
Disassembly of section \.func3:
-04015000 <\.func3>:
- 4015000: e0800001 add r0, r0, r1
- 4015004: e0800001 add r0, r0, r1
- 4015008: e0800001 add r0, r0, r1
- 401500c: e0800001 add r0, r0, r1
- 4015010: e0800001 add r0, r0, r1
- 4015014: 00000000 andeq r0, r0, r0
+.+ <\.func3>:
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: 00000000 andeq r0, r0, r0
Disassembly of section \.rodata:
-04015018 <\.rodata>:
- 4015018: 00000004 andeq r0, r0, r4
+.+ <\.rodata>:
+[^:]+: 00000000 andeq r0, r0, r0
Disassembly of section \.ARM\.attributes:
-00000000 <\.ARM\.attributes>:
- 0: 00001141 andeq r1, r0, r1, asr #2
- 4: 61656100 cmnvs r5, r0, lsl #2
- 8: 01006962 tsteq r0, r2, ror #18
- c: 00000007 andeq r0, r0, r7
- 10: Address 0x0000000000000010 is out of bounds.
+.+ <\.ARM\.attributes>:
+[^:]+: .+
+[^:]+: .+
+[^:]+: .+
+[^:]+: .+
+[^:]+: .+
diff --git a/binutils/testsuite/binutils-all/arm/out-of-order.d b/binutils/testsuite/binutils-all/arm/out-of-order.d
index 9351af7..f880cbc 100644
--- a/binutils/testsuite/binutils-all/arm/out-of-order.d
+++ b/binutils/testsuite/binutils-all/arm/out-of-order.d
@@ -7,21 +7,21 @@
Disassembly of section \.func2:
-04018280 <\.func2>:
- 4018280: e0800001 add r0, r0, r1
+.+ <\.func2>:
+[^:]+: e0800001 add r0, r0, r1
Disassembly of section \.func1:
-04005000 <v1>:
- 4005000: e0800001 add r0, r0, r1
- 4005004: 00000000 \.word 0x00000000
+.+ <v1>:
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: 00000000 \.word 0x00000000
Disassembly of section \.func3:
-04015000 <\.func3>:
- 4015000: e0800001 add r0, r0, r1
- 4015004: e0800001 add r0, r0, r1
- 4015008: e0800001 add r0, r0, r1
- 401500c: e0800001 add r0, r0, r1
- 4015010: e0800001 add r0, r0, r1
- 4015014: 00000000 \.word 0x00000000
+.+ <\.func3>:
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: e0800001 add r0, r0, r1
+[^:]+: 00000000 \.word 0x00000000
diff --git a/binutils/testsuite/binutils-all/arm/out-of-order.s b/binutils/testsuite/binutils-all/arm/out-of-order.s
index 4e43ddf..3994fe5 100644
--- a/binutils/testsuite/binutils-all/arm/out-of-order.s
+++ b/binutils/testsuite/binutils-all/arm/out-of-order.s
@@ -21,9 +21,9 @@ v1:
.data
.section .global,"aw",%progbits
- .word 1
- .word 1
- .word 1
+ .word 0
+ .word 0
+ .word 0
.section .rodata
- .word 4
+ .word 0
More information about the Binutils-cvs
mailing list