diff options
Diffstat (limited to 'ld')
32 files changed, 244 insertions, 185 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 1497fc4..213aed0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,39 @@ 2021-01-05 Nick Alcock <nick.alcock@oracle.com> + * testsuite/ld-ctf/array.d: Adjust for dumper changes. + * testsuite/ld-ctf/conflicting-cycle-1.B-1.d: Likewise. + * testsuite/ld-ctf/conflicting-cycle-1.B-2.d: Likewise. + * testsuite/ld-ctf/conflicting-cycle-1.parent.d: Likewise. + * testsuite/ld-ctf/conflicting-cycle-2.A-1.d: Likewise. + * testsuite/ld-ctf/conflicting-cycle-2.A-2.d: Likewise. + * testsuite/ld-ctf/conflicting-cycle-2.parent.d: Likewise. + * testsuite/ld-ctf/conflicting-cycle-3.C-1.d: Likewise. + * testsuite/ld-ctf/conflicting-cycle-3.C-2.d: Likewise. + * testsuite/ld-ctf/conflicting-cycle-3.parent.d: Likewise. + * testsuite/ld-ctf/conflicting-enums.d: Likewise. + * testsuite/ld-ctf/conflicting-typedefs.d: Likewise. + * testsuite/ld-ctf/cross-tu-cyclic-conflicting.d: Likewise. + * testsuite/ld-ctf/cross-tu-cyclic-nonconflicting.d: Likewise. + * testsuite/ld-ctf/cross-tu-into-cycle.d: Likewise. + * testsuite/ld-ctf/cross-tu-noncyclic.d: Likewise. + * testsuite/ld-ctf/cycle-1.d: Likewise. + * testsuite/ld-ctf/cycle-2.A.d: Likewise. + * testsuite/ld-ctf/cycle-2.B.d: Likewise. + * testsuite/ld-ctf/cycle-2.C.d: Likewise. + * testsuite/ld-ctf/data-func-conflicted.d: Likewise. + * testsuite/ld-ctf/diag-cttname-null.d: Likewise. + * testsuite/ld-ctf/diag-cuname.d: Likewise. + * testsuite/ld-ctf/diag-parlabel.d: Likewise. + * testsuite/ld-ctf/diag-wrong-magic-number-mixed.d: Likewise. + * testsuite/ld-ctf/forward.d: Likewise. + * testsuite/ld-ctf/function.d: Likewise. + * testsuite/ld-ctf/slice.d: Likewise. + * testsuite/ld-ctf/super-sub-cycles.d: Likewise. + * testsuite/ld-ctf/enums.c: New test. + * testsuite/ld-ctf/enums.d: New test. + +2021-01-05 Nick Alcock <nick.alcock@oracle.com> + * testsuite/ld-ctf/conflicting-cycle-1.parent.d: Adjust for dumper changes. * testsuite/ld-ctf/cross-tu-cyclic-conflicting.d: Likewise. diff --git a/ld/testsuite/ld-ctf/array.d b/ld/testsuite/ld-ctf/array.d index 6c3915a..1637562 100644 --- a/ld/testsuite/ld-ctf/array.d +++ b/ld/testsuite/ld-ctf/array.d @@ -20,8 +20,8 @@ Contents of CTF section .ctf: Labels: Data objects: - digits -> 0x[0-9a-f]*: int \[10\] .* - digits_names -> 0x[0-9a-f]*: char \*\[10\] .* + digits -> 0x[0-9a-f]*: \(kind 4\) int \[10\] .* + digits_names -> 0x[0-9a-f]*: \(kind 4\) char \*\[10\] .* Function objects: @@ -29,7 +29,7 @@ Contents of CTF section .ctf: Types: #... - 0x[0-9a-f]*: .*\[10\] .* + 0x[0-9a-f]*: \(kind 4\) .*\[10\] \(size .* #... - 0x[0-9a-f]*: .*\[10\] .* + 0x[0-9a-f]*: \(kind 4\) .*\[10\] \(size .* #... diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-1.B-1.d b/ld/testsuite/ld-ctf/conflicting-cycle-1.B-1.d index 99b0564..27273c5 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-1.B-1.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-1.B-1.d @@ -30,12 +30,11 @@ CTF archive member: .*/B.c: Function objects: Variables: - b -> 0x80000001: struct B \(size 0x[0-9]*\) + b -> 0x80000001: \(kind 6\) struct B \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Types: - 0x8[0-9a-f]*: struct B .* - *\[0x0\] \(ID 0x8[0-9a-f]*\) \(kind 6\) struct B \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct C \* c \(.* + 0x8[0-9a-f]*: \(kind 6\) struct B .* + *\[0x0\] c: ID 0x[0-9a-f]*: \(kind 3\) struct C \* \(.* Strings: #... diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-1.B-2.d b/ld/testsuite/ld-ctf/conflicting-cycle-1.B-2.d index 32bc5c2..28a92f4 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-1.B-2.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-1.B-2.d @@ -30,13 +30,12 @@ CTF archive member: .*/B-2.c: Function objects: Variables: - b -> 0x80000001: struct B \(.* + b -> 0x80000001: \(kind 6\) struct B \(.* Types: - 0x8[0-9a-f]*: struct B \(.* - *\[0x0\] \(ID 0x8[0-9a-f]*\) \(kind 6\) struct B \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct C \* c \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 1\) int wombat:32 \(aligned at 0x[0-9a-f]*, format 0x1, offset:bits 0x0:0x[0-9a-f]*\) + 0x8[0-9a-f]*: \(kind 6\) struct B \(.* + *\[0x0\] c: ID 0x[0-9a-f]*: \(kind 3\) struct C \* \(.* + *\[0x[0-9a-f]*\] wombat: ID 0x[0-9a-f]*: \(kind 1\) int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Strings: #... diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-1.parent.d b/ld/testsuite/ld-ctf/conflicting-cycle-1.parent.d index 5da66fda..a9755e8 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-1.parent.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-1.parent.d @@ -29,8 +29,7 @@ Contents of CTF section .ctf: #... Types: #... - 0x[0-9a-f]*: struct B - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 9\) struct B + 0x[0-9a-f]*: \(kind 9\) struct B #... CTF archive member: .*: #... diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-2.A-1.d b/ld/testsuite/ld-ctf/conflicting-cycle-2.A-1.d index 5e5fade..33ed6e8 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-2.A-1.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-2.A-1.d @@ -29,12 +29,11 @@ CTF archive member: .*/A.c: Function objects: Variables: - a -> 0x80000001: struct A \(size 0x[0-9a-f]*\) + a -> 0x80000001: \(kind 6\) struct A \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Types: - 0x8[0-9a-f]*: struct A \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x8[0-9a-f]*\) \(kind 6\) struct A \(aligned at 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(aligned at 0x[0-9a-f]*\) + 0x8[0-9a-f]*: \(kind 6\) struct A \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x0\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-2.A-2.d b/ld/testsuite/ld-ctf/conflicting-cycle-2.A-2.d index ff6785cf..a98b66c 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-2.A-2.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-2.A-2.d @@ -29,13 +29,12 @@ CTF archive member: .*/A-2.c: Function objects: Variables: - a -> 0x80000001: struct A \(size 0x[0-9a-f]*\) + a -> 0x80000001: \(kind 6\) struct A \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Types: - 0x8[0-9a-f]*: struct A \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x8[0-9a-f]*\) \(kind 6\) struct A \(aligned at 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(aligned at 0x[0-9a-f]*\) - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 1\) int wombat:32 \(aligned at 0x[0-9a-f]*, format 0x1, offset:bits 0x0:0x[0-9a-f]*\) + 0x8[0-9a-f]*: \(kind 6\) struct A \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x0\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x[0-9a-f]*\] wombat: ID 0x[0-9a-f]*: \(kind 1\) int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-2.parent.d b/ld/testsuite/ld-ctf/conflicting-cycle-2.parent.d index d111ef7..87ec41d 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-2.parent.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-2.parent.d @@ -28,13 +28,12 @@ Contents of CTF section .ctf: Function objects: Variables: - cycle_1 -> 0x[0-9a-f]*: struct cycle_1 \* \(size 0x[0-9a-f]*\) -> 0x[0-9a-f]*: struct cycle_1 \(size 0x[0-9a-f]*\) + cycle_1 -> 0x[0-9a-f]*: \(kind 3\) struct cycle_1 \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> 0x[0-9a-f]*: \(kind 6\) struct cycle_1 \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Types: #... - 0x[0-9a-f]*: struct cycle_1 \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct cycle_1 \(aligned at 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* a \(aligned at 0x[0-9a-f]*\) - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(aligned at 0x[0-9a-f]*\) - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct cycle_1 \* next \(aligned at 0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 6\) struct cycle_1 \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x0\] a: ID 0x[0-9a-f]*: \(kind 3\) struct A \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x[0-9a-f]*\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x[0-9a-f]*\] next: ID 0x[0-9a-f]*: \(kind 3\) struct cycle_1 \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) #... diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-3.C-1.d b/ld/testsuite/ld-ctf/conflicting-cycle-3.C-1.d index df61153..ac750a7 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-3.C-1.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-3.C-1.d @@ -28,12 +28,11 @@ CTF archive member: .*/C.c: Function objects: Variables: - c -> 0x80000001: struct C \(size 0x[0-9a-f]*\) + c -> 0x80000001: \(kind 6\) struct C \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Types: - 0x8[0-9a-f]*: struct C \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x8[0-9a-f]*\) \(kind 6\) struct C \(aligned at 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* a \(aligned at 0x[0-9a-f]*\) + 0x80000001: \(kind 6\) struct C \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x0\] a: ID 0x[0-9a-f]*: \(kind 3\) struct A \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-3.C-2.d b/ld/testsuite/ld-ctf/conflicting-cycle-3.C-2.d index e1cfd0c..603432f 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-3.C-2.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-3.C-2.d @@ -28,13 +28,12 @@ CTF archive member: .*/C-2.c: Function objects: Variables: - c -> 0x80000001: struct C \(size 0x[0-9a-f]*\) + c -> 0x80000001: \(kind 6\) struct C \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Types: - 0x8[0-9a-f]*: struct C \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x8[0-9a-f]*\) \(kind 6\) struct C \(aligned at 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* a \(aligned at 0x[0-9a-f]*\) - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 1\) int wombat:[0-9]* \(aligned at 0x[0-9a-f]*, format 0x1, offset:bits 0x0:0x[0-9a-f]*\) + 0x80000001: \(kind 6\) struct C \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + \[0x0\] a: ID 0x[0-9a-f]*: \(kind 3\) struct A \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + \[0x[0-9a-f]*\] wombat: ID 0x[0-9a-f]*: \(kind 1\) int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/conflicting-cycle-3.parent.d b/ld/testsuite/ld-ctf/conflicting-cycle-3.parent.d index 11d2a04..24f0800 100644 --- a/ld/testsuite/ld-ctf/conflicting-cycle-3.parent.d +++ b/ld/testsuite/ld-ctf/conflicting-cycle-3.parent.d @@ -30,8 +30,7 @@ Contents of CTF section .ctf: Types: #... - 0x[0-9a-f]*: int \[0x0:0x[0-9a-f]*\] \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) int:[0-9]* \(aligned at 0x[0-9a-f]*, format 0x1, offset:bits 0x0:0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 1\) int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) #... Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/conflicting-enums.d b/ld/testsuite/ld-ctf/conflicting-enums.d index b93d812..f90aaef 100644 --- a/ld/testsuite/ld-ctf/conflicting-enums.d +++ b/ld/testsuite/ld-ctf/conflicting-enums.d @@ -20,16 +20,28 @@ Contents of CTF section .ctf: CTF archive member: .*enum.*\.c: #... Types: - 0x8[0-9a-f]*: enum day_of_the_week \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x8[0-9a-f]*\) \(kind 8\) enum day_of_the_week \(aligned at 0x[0-9a-f]*\) + 0x80000001: \(kind 8\) enum day_of_the_week \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + Sunday: 0 + Monday: 1 + Tuesday: 2 + Wednesday: 3 + Thursday: 4 + Friday: 5 + Saturday: 6 Strings: #... CTF archive member: .*enum.*\.c: #... Types: - 0x8[0-9a-f]*: enum day_of_the_week \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x8[0-9a-f]*\) \(kind 8\) enum day_of_the_week \(aligned at 0x[0-9a-f]*\) + 0x80000001: \(kind 8\) enum day_of_the_week \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + Monday: 0 + Tuesday: 1 + Wednesday: 2 + Thursday: 3 + Friday: 4 + Saturday: 5 + Sunday: 6 Strings: #... diff --git a/ld/testsuite/ld-ctf/conflicting-typedefs.d b/ld/testsuite/ld-ctf/conflicting-typedefs.d index 309e453..72082ba 100644 --- a/ld/testsuite/ld-ctf/conflicting-typedefs.d +++ b/ld/testsuite/ld-ctf/conflicting-typedefs.d @@ -14,20 +14,16 @@ Contents of CTF section .ctf: Version: 4 \(CTF_VERSION_3\) #... Types: - 0x1: .*int .* - .* - 0x[0-9]:.*int .* - .* - 0x[0-9]: word .* - *\[0x0\] \(ID 0x[0-9]\) \(kind 10\) word \(aligned at 0x[48]\) + 0x1: .*int .* + 0x[0-9]:.*int .* + 0x[0-9]: \(kind 10\) word .* -> 0x[0-9]: \(kind 1\) .*int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Strings: #... CTF archive member: .*typedef.*\.c: #... Types: - 0x80000001: word .* - *\[0x0\] \(ID 0x80000001\) \(kind 10\) word \(aligned at 0x[48]\) + 0x80000001: \(kind 10\) word .* -> 0x[0-9]: \(kind 1\) .*int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) Strings: #... diff --git a/ld/testsuite/ld-ctf/cross-tu-cyclic-conflicting.d b/ld/testsuite/ld-ctf/cross-tu-cyclic-conflicting.d index eff295e..eaf8e79 100644 --- a/ld/testsuite/ld-ctf/cross-tu-cyclic-conflicting.d +++ b/ld/testsuite/ld-ctf/cross-tu-cyclic-conflicting.d @@ -14,20 +14,15 @@ Contents of CTF section \.ctf: #... Types: #... - 0x[0-9a-f]*: long int \[0x0:0x[0-9a-f]*\] \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) long int:[0-9]* \(aligned at 0x[0-9a-f]*, format 0x1, offset:bits 0x0:0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 1\) long int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) #... - 0x[0-9a-f]*: struct B .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct B .* + 0x[0-9a-f]*: \(kind 6\) struct B .* #... - 0x[0-9a-f]*: int \[0x0:0x[0-9a-f]*\] \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) int:[0-9]* \(aligned at 0x[0-9a-f]*, format 0x1, offset:bits 0x0:0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 1\) int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) #... - 0x[0-9a-f]*: struct A - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 9\) struct A + 0x[0-9a-f]*: \(kind 9\) struct A #... - 0x[0-9a-f]*: struct C .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct C .* + 0x[0-9a-f]*: \(kind 6\) struct C .* #... Strings: @@ -36,10 +31,9 @@ Contents of CTF section \.ctf: CTF archive member: .*/ld/testsuite/ld-ctf/cross-tu-cyclic-1\.c: #... Types: - 0x80.*[0-9a-f]*: struct A .* - *\[0x0\] \(ID 0x80.*\) \(kind 6\) struct A .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) long int a:.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* foo .* + 0x80[0-9a-f]*: \(kind 6\) struct A .* + *\[0x0\] a: ID 0x[0-9a-f]*: \(kind 1\) long int .* + *\[0x[0-9a-f]*\] foo: ID 0x[0-9a-f]*\: \(kind 3\) struct B \* .* Strings: #... @@ -47,11 +41,10 @@ CTF archive member: .*/ld/testsuite/ld-ctf/cross-tu-cyclic-1\.c: CTF archive member: .*/ld/testsuite/ld-ctf/cross-tu-cyclic-2\.c: #... Types: - 0x80.*[0-9a-f]*: struct A .* - *\[0x0\] \(ID 0x80.*\) \(kind 6\) struct A .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) long int a:.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* foo .* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct C \* bar .* + 0x80[0-9a-f]*: \(kind 6\) struct A .* + *\[0x0\] a: ID 0x[0-9a-f]*: \(kind 1\) long int .* + *\[0x[0-9a-f]*\] foo: ID 0x[0-9a-f]*: \(kind 3\) struct B \* .* + *\[0x[0-9a-f]*\] bar: ID 0x[0-9a-f]*: \(kind 3\) struct C \* .* Strings: #... diff --git a/ld/testsuite/ld-ctf/cross-tu-cyclic-nonconflicting.d b/ld/testsuite/ld-ctf/cross-tu-cyclic-nonconflicting.d index 9b0d738..1a71484 100644 --- a/ld/testsuite/ld-ctf/cross-tu-cyclic-nonconflicting.d +++ b/ld/testsuite/ld-ctf/cross-tu-cyclic-nonconflicting.d @@ -29,22 +29,16 @@ Contents of CTF section .ctf: Types: #... - 0x[0-9a-f]*: struct A \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]\) \(kind 6\) struct A \(aligned at 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) long int a:[0-9]* \(aligned at 0x[0-9a-f]*, format 0x1, offset:bits 0x0:0x[0-9a-f]*\) - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* foo \(aligned at 0x[0-9a-f]*\) - 0x[0-9a-f]*: long int .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) long int:[0-9].* - 0x[0-9a-f]*: struct B \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct B \(aligned at 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) int foo:[0-9]* \(aligned at 0x[0-9a-f]*, format 0x1, offset:bits 0x0:0x[0-9a-f]*\) - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* bar \(aligned at 0x[0-9a-f]*\) - 0x[0-9a-f]*: struct B \* \(size 0x[0-9a-f]*\) -> 0x[0-9a-f]*: struct B \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* \(aligned at 0x[0-9a-f]*\) - 0x[0-9a-f]*: struct A \* \(size 0x[0-9a-f]*\) -> 0x[0-9a-f]*: struct A \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* \(aligned at 0x[0-9a-f]*\) - 0x[0-9a-f]*: int .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) int:.* + 0x[0-9a-f]*: \(kind 6\) struct A \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x0\] a: ID 0x[0-9a-f]*: \(kind 1\) long int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x[0-9a-f]*\] foo: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 1\) long int .* + 0x[0-9a-f]*: \(kind 6\) struct B \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x0\] foo: ID 0x[0-9a-f]*: \(kind 1\) int \(format 0x1\) \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x[0-9a-f]*\] bar: ID 0x[0-9a-f]*: \(kind 3\) struct A \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 3\) struct B \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> 0x[0-9a-f]*: \(kind 6\) struct B \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 3\) struct A \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> 0x[0-9a-f]*: \(kind 6\) struct A \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 1\) int .* Strings: #... diff --git a/ld/testsuite/ld-ctf/cross-tu-into-cycle.d b/ld/testsuite/ld-ctf/cross-tu-into-cycle.d index a21fedc..7f3aebc 100644 --- a/ld/testsuite/ld-ctf/cross-tu-into-cycle.d +++ b/ld/testsuite/ld-ctf/cross-tu-into-cycle.d @@ -27,20 +27,16 @@ Contents of CTF section .ctf: Function objects: Variables: - a -> .* - conflicty -> .* + a -> .* + conflicty -> .* Types: - 0x[0-9a-f]*: struct A .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct A .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* foo .* - 0x[0-9a-f]*: struct B .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct B .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* next .* - 0x[0-9a-f]*: struct B \* .* - *\[0x0\] .* - 0x[0-9a-f]*: struct A \* .* - *\[0x0\] .* + 0x[0-9a-f]*: \(kind 6\) struct A .* + *\[0x0\] foo: ID 0x[0-9a-f]*: \(kind 3\) struct B \* .* + 0x[0-9a-f]*: \(kind 6\) struct B .* + *\[0x0\] next: ID 0x[0-9a-f]*: \(kind 3\) struct B \* .* + 0x[0-9a-f]*: \(kind 3\) struct B \* .* + 0x[0-9a-f]*: \(kind 3\) struct A \* .* Strings: #... @@ -56,7 +52,7 @@ CTF archive member: .*/ld/testsuite/ld-ctf/cross-tu-cyclic-[34].c: Function objects: Variables: - conflicty -> .* + conflicty -> .* Types: diff --git a/ld/testsuite/ld-ctf/cross-tu-noncyclic.d b/ld/testsuite/ld-ctf/cross-tu-noncyclic.d index d96e5d2..e8fc7a4 100644 --- a/ld/testsuite/ld-ctf/cross-tu-noncyclic.d +++ b/ld/testsuite/ld-ctf/cross-tu-noncyclic.d @@ -29,18 +29,14 @@ Contents of CTF section .ctf: Types: #... - 0x[0-9a-f]*: struct A .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct A .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) long int a:[0-9]* .* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* foo .* + 0x[0-9a-f]*: \(kind 6\) struct A .* + *\[0x0\] a: ID 0x[0-9a-f]*: \(kind 1\) long int .* + *\[0x[0-9a-f]*\] foo: ID 0x[0-9a-f]*: \(kind 3\) struct B \* .* #... - 0x[0-9a-f]*: struct B .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct B .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) int foo:[0-9]* .* + 0x[0-9a-f]*: \(kind 6\) struct B .* + *\[0x0\] foo: ID 0x[0-9a-f]*: \(kind 1\) int .* #... - 0x[0-9a-f]*: struct B \* \(size 0x[0-9a-f]*\) -> 0x[0-9a-f]*: struct B .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* .* + 0x[0-9a-f]*: \(kind 3\) struct B \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> 0x[0-9a-f]*: \(kind 6\) struct B .* #... - 0x[0-9a-f]*: struct A \* \(size 0x[0-9a-f]*\) -> 0x[0-9a-f]*: struct A .* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* .* + 0x[0-9a-f]*: \(kind 3\) struct A \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> 0x[0-9a-f]*: \(kind 6\) struct A .* #... diff --git a/ld/testsuite/ld-ctf/cycle-1.d b/ld/testsuite/ld-ctf/cycle-1.d index 5787093..e64608e 100644 --- a/ld/testsuite/ld-ctf/cycle-1.d +++ b/ld/testsuite/ld-ctf/cycle-1.d @@ -28,9 +28,8 @@ Contents of CTF section .ctf: #... Types: #... - 0x[0-9a-f]*: struct cycle_1 \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct cycle_1 \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* a \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct cycle_1 \* next \(.* + 0x[0-9a-f]*: \(kind 6\) struct cycle_1 \(.* + *\[0x0\] a: ID 0x[0-9a-f]*: \(kind 3\) struct A \* \(.* + *\[0x[0-9a-f]*\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(.* + *\[0x[0-9a-f]*\] next: ID 0x[0-9a-f]*: \(kind 3\) struct cycle_1 \* \(.* #... diff --git a/ld/testsuite/ld-ctf/cycle-2.A.d b/ld/testsuite/ld-ctf/cycle-2.A.d index ddb5381..39d48c1 100644 --- a/ld/testsuite/ld-ctf/cycle-2.A.d +++ b/ld/testsuite/ld-ctf/cycle-2.A.d @@ -25,13 +25,12 @@ Contents of CTF section .ctf: Variables: #... - a -> 0x[0-9a-f]*: struct A \(.* + a -> 0x[0-9a-f]*: \(kind 6\) struct A \(.* #... Types: #... - 0x[0-9a-f]*: struct A \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct A \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(.* + 0x[0-9a-f]*: \(kind 6\) struct A \(.* + *\[0x0\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(.* #... Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/cycle-2.B.d b/ld/testsuite/ld-ctf/cycle-2.B.d index 1d1cdc5..4babd97 100644 --- a/ld/testsuite/ld-ctf/cycle-2.B.d +++ b/ld/testsuite/ld-ctf/cycle-2.B.d @@ -25,13 +25,12 @@ Contents of CTF section .ctf: Variables: #... - b -> 0x[0-9a-f]*: struct B \(.* + b -> 0x[0-9a-f]*: \(kind 6\) struct B \(.* #... Types: #... - 0x[0-9a-f]*: struct B \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct B \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct C \* c \(.* + 0x[0-9a-f]*: \(kind 6\) struct B \(.* + *\[0x0\] c: ID 0x[0-9a-f]*: \(kind 3\) struct C \* \(.* #... Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/cycle-2.C.d b/ld/testsuite/ld-ctf/cycle-2.C.d index 4d8f145..757483c 100644 --- a/ld/testsuite/ld-ctf/cycle-2.C.d +++ b/ld/testsuite/ld-ctf/cycle-2.C.d @@ -25,13 +25,12 @@ Contents of CTF section .ctf: Variables: #... - c -> 0x[0-9a-f]*: struct C \(.* + c -> 0x[0-9a-f]*: \(kind 6\) struct C \(.* #... Types: #... - 0x[0-9a-f]*: struct C \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct C \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* a \(.* + 0x[0-9a-f]*: \(kind 6\) struct C \(.* + *\[0x0\] a: ID 0x[0-9a-f]*: \(kind 3\) struct A \* \(.* #... Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/data-func-conflicted.d b/ld/testsuite/ld-ctf/data-func-conflicted.d index e51bb76..6b1e914 100644 --- a/ld/testsuite/ld-ctf/data-func-conflicted.d +++ b/ld/testsuite/ld-ctf/data-func-conflicted.d @@ -20,16 +20,16 @@ Contents of CTF section \.ctf: String section: .* #... Data objects: - bar -> 0x[0-9a-f]*: struct var_3 \(size 0x[0-9a-f]*\) - var_1 -> 0x[0-9a-f]*: foo_t \(size 0x[0-9a-f]*\) -> .* - var_666 -> 0x[0-9a-f]*: foo_t \* \(size 0x[0-9a-f]*\) -> .* + bar -> 0x[0-9a-f]*: \(kind 6\) struct var_3 \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + var_1 -> 0x[0-9a-f]*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* + var_666 -> 0x[0-9a-f]*: \(kind 3\) foo_t \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* Function objects: - func_[0-9]* -> 0x[0-9a-f]*: void \*\(\*\) \(const char \*restrict, int \(\*\)\(\*\) \(const char \*\)\) + func_[0-9]* -> 0x[0-9a-f]*: \(kind 5\) void \*\(\*\) \(const char \*restrict, int \(\*\)\(\*\) \(const char \*\)\) \(aligned at 0x[0-9a-f]*\) #... Types: #... - .*: struct var_3 .* + .*: \(kind 6\) struct var_3 .* #... CTF archive member: .*/data-func-1\.c: @@ -46,18 +46,19 @@ CTF archive member: .*/data-func-1\.c: Labels: Data objects: - var_[0-9]* -> 0x[0-9a-f]*: foo_t \(size 0x[0-9a-f]*\) -> .* - var_[0-9]* -> 0x[0-9a-f]*: foo_t \(size 0x[0-9a-f]*\) -> .* - var_[0-9]* -> 0x[0-9a-f]*: foo_t \(size 0x[0-9a-f]*\) -> .* - var_[0-9]* -> 0x[0-9a-f]*: foo_t \(size 0x[0-9a-f]*\) -> .* - var_[0-9]* -> 0x[0-9a-f]*: foo_t \(size 0x[0-9a-f]*\) -> .* - var_[0-9]* -> 0x[0-9a-f]*: foo_t \(size 0x[0-9a-f]*\) -> .* - var_[0-9]* -> 0x[0-9a-f]*: foo_t \(size 0x[0-9a-f]*\) -> .* + var_[0-9]* -> 0x80000001*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* + var_[0-9]* -> 0x80000001*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* + var_[0-9]* -> 0x80000001*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* + var_[0-9]* -> 0x80000001*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* + var_[0-9]* -> 0x80000001*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* + var_[0-9]* -> 0x80000001*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* + var_[0-9]* -> 0x80000001*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* + var_[0-9]* -> 0x80000001*: \(kind 10\) foo_t \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> .* #... Function objects: Variables: Types: - 0x80000001: foo_t .* -> .* int .* + 0x80000001: \(kind 10\) foo_t .* -> .* int .* #... diff --git a/ld/testsuite/ld-ctf/diag-cttname-null.d b/ld/testsuite/ld-ctf/diag-cttname-null.d index 86a7fd1..d1ca0b1 100644 --- a/ld/testsuite/ld-ctf/diag-cttname-null.d +++ b/ld/testsuite/ld-ctf/diag-cttname-null.d @@ -13,11 +13,10 @@ Contents of CTF section .ctf: Version: 4 \(CTF_VERSION_3\) #... Data objects: - a -> 0x[0-9a-f]*: struct \(size 0x[0-9a-f]*\) + a -> 0x[0-9a-f]*: \(kind 6\) struct \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) #... Types: #... - 0x[0-9a-f]*: struct \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(.* + 0x[0-9a-f]*: \(kind 6\) struct \(.* + *\[0x0\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(.* #... diff --git a/ld/testsuite/ld-ctf/diag-cuname.d b/ld/testsuite/ld-ctf/diag-cuname.d index 20624fd..e4d4926 100644 --- a/ld/testsuite/ld-ctf/diag-cuname.d +++ b/ld/testsuite/ld-ctf/diag-cuname.d @@ -21,7 +21,7 @@ Contents of CTF section .ctf: Labels: Data objects: - a -> 0x[0-9a-f]*: struct A \(size 0x[0-9a-f]*\) + a -> 0x[0-9a-f]*: \(kind 6\) struct A \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) #... Function objects: @@ -29,9 +29,8 @@ Contents of CTF section .ctf: Types: #... - 0x[0-9a-f]*: struct A \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct A \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(.* + 0x[0-9a-f]*: \(kind 6\) struct A \(.* + *\[0x0\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(.* #... Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/diag-parlabel.d b/ld/testsuite/ld-ctf/diag-parlabel.d index 5ad5870..bba161c 100644 --- a/ld/testsuite/ld-ctf/diag-parlabel.d +++ b/ld/testsuite/ld-ctf/diag-parlabel.d @@ -20,7 +20,7 @@ Contents of CTF section .ctf: Labels: Data objects: - a -> 0x[0-9a-f]*: struct A \(size 0x[0-9a-f]*\) + a -> 0x[0-9a-f]*: \(kind 6\) struct A \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) #... Function objects: @@ -28,9 +28,8 @@ Contents of CTF section .ctf: Types: #... - 0x[0-9a-f]*: struct A \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct A \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(.* + 0x[0-9a-f]*: \(kind 6\) struct A \(.* + *\[0x0\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(.* #... Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d b/ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d index 8fc1cc8..668fa15 100644 --- a/ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d +++ b/ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d @@ -29,9 +29,9 @@ Contents of CTF section .ctf: #... Types: #... - 0x[0-9a-f]*: struct B \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct B \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct C \* c \(.* + 0x[0-9a-f]*: struct B \(.* + *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct B \(.* + *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct C \* c \(.* #... Strings: 0x0: diff --git a/ld/testsuite/ld-ctf/enums.c b/ld/testsuite/ld-ctf/enums.c new file mode 100644 index 0000000..b7c5587 --- /dev/null +++ b/ld/testsuite/ld-ctf/enums.c @@ -0,0 +1,3 @@ +enum nine_els { NINE_ONE, NINE_TWO, NINE_THREE = 256, NINE_FOUR, NINE_FIVE, NINE_SIX, NINE_SEVEN, NINE_EIGHT, NINE_NINE } nine; +enum ten_els { TEN_ONE = 10, TEN_TWO, TEN_THREE = -256, TEN_FOUR, TEN_FIVE, TEN_SIX, TEN_SEVEN, TEN_EIGHT, TEN_NINE, TEN_TEN } ten; +enum eleven_els { ELEVEN_ONE = 10, ELEVEN_TWO, ELEVEN_THREE = -256, ELEVEN_FOUR, ELEVEN_FIVE, ELEVEN_SIX, ELEVEN_SEVEN, ELEVEN_EIGHT, ELEVEN_NINE, ELEVEN_TEN, ELEVEN_ELEVEN } eleven; diff --git a/ld/testsuite/ld-ctf/enums.d b/ld/testsuite/ld-ctf/enums.d new file mode 100644 index 0000000..f1cf70d --- /dev/null +++ b/ld/testsuite/ld-ctf/enums.d @@ -0,0 +1,54 @@ +#as: +#source: enums.c +#objdump: --ctf=.ctf +#ld: -shared +#name: Enumerated types + +.*: +file format .* + +Contents of CTF section .ctf: + + Header: + Magic number: 0xdff2 + Version: 4 \(CTF_VERSION_3\) +#... + Compilation unit name: .*enums.c +#... + Type section: .*\(0x114 bytes\) +#... + Types: + 0x1: \(kind 8\) enum nine_els \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + NINE_ONE: 0 + NINE_TWO: 1 + NINE_THREE: 256 + NINE_FOUR: 257 + NINE_FIVE: 258 + NINE_SIX: 259 + NINE_SEVEN: 260 + NINE_EIGHT: 261 + NINE_NINE: 262 + 0x2: \(kind 8\) enum ten_els \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + TEN_ONE: 10 + TEN_TWO: 11 + TEN_THREE: -256 + TEN_FOUR: -255 + TEN_FIVE: -254 + TEN_SIX: -253 + TEN_SEVEN: -252 + TEN_EIGHT: -251 + TEN_NINE: -250 + TEN_TEN: -249 + 0x3: \(kind 8\) enum eleven_els \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + ELEVEN_ONE: 10 + ELEVEN_TWO: 11 + ELEVEN_THREE: -256 + ELEVEN_FOUR: -255 + ELEVEN_FIVE: -254 + \.\.\. + ELEVEN_SEVEN: -252 + ELEVEN_EIGHT: -251 + ELEVEN_NINE: -250 + ELEVEN_TEN: -249 + ELEVEN_ELEVEN: -248 + +#... diff --git a/ld/testsuite/ld-ctf/forward.d b/ld/testsuite/ld-ctf/forward.d index 9ff0dd2..bb92961 100644 --- a/ld/testsuite/ld-ctf/forward.d +++ b/ld/testsuite/ld-ctf/forward.d @@ -16,8 +16,6 @@ Contents of CTF section .ctf: #... Types: - 0x[0-9a-f]: struct foo - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 9\) struct foo - 0x[0-9a-f]: struct foo \* \(size 0x[0-9a-f]*\) -> 0x[0-9a-f]: struct foo - *\[0x0\] \(ID 0x[0-9a-f]\) \(kind 3\) struct foo \* \(aligned at 0x[0-9a-f]*\) + 0x[0-9a-f]: \(kind 9\) struct foo + 0x[0-9a-f]: \(kind 3\) struct foo \* \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) -> 0x[0-9a-f]: \(kind 9\) struct foo #... diff --git a/ld/testsuite/ld-ctf/function.d b/ld/testsuite/ld-ctf/function.d index 9bf26a4..1584bdb 100644 --- a/ld/testsuite/ld-ctf/function.d +++ b/ld/testsuite/ld-ctf/function.d @@ -18,10 +18,9 @@ Contents of CTF section .ctf: String section: .* #... Function objects: - foo -> 0x[0-9a-f]*: int \(\*\) \(char, int, float, void \*, void \(\*\)\(\*\) \(int\)\) + foo -> 0x[0-9a-f]*: \(kind 5\) int \(\*\) \(char, int, float, void \*, void \(\*\)\(\*\) \(int\)\) \(aligned at 0x[0-9a-f]*\) #... Types: #... - 0x[0-9a-f]*: int \(\*\) \(char, int, float, void \*, void \(\*\)\(\*\) \(int\)\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 5\) int \(\*\) \(char, int[0-9]*, float, void \*, void \(\*\)\(\*\) \(int\)\) \(aligned at 0x[0-9a-f]*\) + 0x[0-9a-f]*: \(kind 5\) int \(\*\) \(char, int, float, void \*, void \(\*\)\(\*\) \(int\)\) \(aligned at 0x[0-9a-f]*\) #... diff --git a/ld/testsuite/ld-ctf/slice.d b/ld/testsuite/ld-ctf/slice.d index 3967a2d..d116782 100644 --- a/ld/testsuite/ld-ctf/slice.d +++ b/ld/testsuite/ld-ctf/slice.d @@ -19,14 +19,14 @@ Contents of CTF section .ctf: String section: .* #... Data objects: - slices -> 0x[0-9a-f]*: struct slices \(size 0x[0-9a-f]*\) + slices -> 0x[0-9a-f]*: \(kind 6\) struct slices \(size 0x[0-9a-f]*\) \(aligned at 0x1*\) #... Types: #... - 0x[0-9a-f]*: struct slices \(size 0x[0-9a-f]*\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct slices \(aligned at 0x1\) - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 1\) int one:1 \(aligned at 0x1, format 0x1, offset:bits 0x0:0x1\) - *\[0x1\] \(ID 0x[0-9a-f]*\) \(kind 1\) int two:2 \(aligned at 0x1, format 0x1, offset:bits 0x1:0x2\) - *\[0x3\] \(ID 0x[0-9a-f]*\) \(kind 1\) int six:6 \(aligned at 0x1, format 0x1, offset:bits 0x3:0x6\) - *\[0x9\] \(ID 0x[0-9a-f]*\) \(kind 1\) int ten:10 \(aligned at 0x2, format 0x1, offset:bits 0x9:0xa\) + 0x[0-9a-f]*: \(kind 6\) struct slices \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x0\] one: ID 0x[0-9a-f]*: \(kind 1\) int:1 \[slice 0x0:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) + *\[0x1\] two: ID 0x[0-9a-f]*: \(kind 1\) int:2 \[slice 0x1:0x2\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) + *\[0x3\] six: ID 0x[0-9a-f]*: \(kind 1\) int:6 \[slice 0x3:0x6\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) + *\[0x9\] ten: ID 0x[0-9a-f]*: \(kind 1\) int:10 \[slice 0x9:0xa\] \(format 0x1\) \(size 0x2\) \(aligned at 0x2\) + #... diff --git a/ld/testsuite/ld-ctf/super-sub-cycles.d b/ld/testsuite/ld-ctf/super-sub-cycles.d index 65a43a4..67fa358 100644 --- a/ld/testsuite/ld-ctf/super-sub-cycles.d +++ b/ld/testsuite/ld-ctf/super-sub-cycles.d @@ -18,18 +18,17 @@ Contents of CTF section .ctf: #... Types: #... - 0x[0-9a-f]*: struct A \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct A \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct B b \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct C c \(.* - *\[0x0\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct A \* a \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct D d \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct D d \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct B \* b \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct X x \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct Y y \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 6\) struct Z z \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct Y \* y \(.* - *\[0x[0-9a-f]*\] \(ID 0x[0-9a-f]*\) \(kind 3\) struct D \* d \(.* + 0x[0-9a-f]: \(kind 6\) struct A \(.* + \[0x0\] b: ID 0x[0-9a-f]*: \(kind 6\) struct B \(.* + \[0x0\] c: ID 0x[0-9a-f]*: \(kind 6\) struct C \(.* + \[0x0\] a: ID 0x[0-9a-f]*: \(kind 3\) struct A \* \(.* + \[0x[0-9a-f]*\] d: ID 0x[0-9a-f]*: \(kind 6\) struct D \(.* + \[0x[0-9a-f]*\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(.* + \[0x[0-9a-f]*\] d: ID 0x[0-9a-f]*: \(kind 6\) struct D \(.* + \[0x[0-9a-f]*\] b: ID 0x[0-9a-f]*: \(kind 3\) struct B \* \(.* + \[0x[0-9a-f]*\] x: ID 0x[0-9a-f]*: \(kind 6\) struct X \(.* + \[0x[0-9a-f]*\] y: ID 0x[0-9a-f]*: \(kind 6\) struct Y \(.* + \[0x[0-9a-f]*\] z: ID 0x[0-9a-f]*: \(kind 6\) struct Z \(.* + \[0x[0-9a-f]*\] y: ID 0x[0-9a-f]*: \(kind 3\) struct Y \* \(.* + \[0x[0-9a-f]*\] d: ID 0x[0-9a-f]*: \(kind 3\) struct D \* \(.* #... |