Skip to content

Commit b079ec7

Browse files
bors[bot]japaric
bors[bot]
and
japaric
committed
Merge #47
47: fix CI r=korken89 a=japaric llvm-objdump recently changed its output format; this commit fixes our objdump tests Co-authored-by: Jorge Aparicio <[email protected]>
2 parents 0457c2a + 2359967 commit b079ec7

File tree

9 files changed

+129
-129
lines changed

9 files changed

+129
-129
lines changed

‎ci/asm/app/release.objdump

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ app: file format ELF32-arm-little
33

44
Disassembly of section .text:
55
HardFault:
6-
40: b #-0x4 <HardFault>
6+
b #-0x4 <HardFault>
77

88
main:
9-
42: trap
9+
trap
1010

1111
Reset:
12-
44: bl #-0x6
13-
48: trap
12+
bl #-0x6
13+
trap
1414

1515
DefaultExceptionHandler:
16-
4a: b #-0x4 <DefaultExceptionHandler>
16+
b #-0x4 <DefaultExceptionHandler>
1717

1818
UsageFault:
19-
4b: <unknown>
19+
<unknown>
2020

2121
HardFaultTrampoline:
22-
4c: mrs r0, msp
23-
50: b #-0x14 <HardFault>
22+
mrs r0, msp
23+
b #-0x14 <HardFault>

‎ci/exceptions/app/app.objdump

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -3,111 +3,111 @@ app: file format ELF32-arm-little
33

44
Disassembly of section .text:
55
main:
6-
40: trap
7-
42: trap
6+
trap
7+
trap
88

99
Reset:
10-
44: movw r1, #0x0
11-
48: movw r0, #0x0
12-
4c: movt r1, #0x2000
13-
50: movt r0, #0x2000
14-
54: subs r1, r1, r0
15-
56: bl #0xd2
16-
5a: movw r1, #0x0
17-
5e: movw r0, #0x0
18-
62: movt r1, #0x2000
19-
66: movt r0, #0x2000
20-
6a: subs r2, r1, r0
21-
6c: movw r1, #0x0
22-
70: movt r1, #0x0
23-
74: bl #0x8
24-
78: bl #-0x3c
25-
7c: trap
10+
movw r1, #0x0
11+
movw r0, #0x0
12+
movt r1, #0x2000
13+
movt r0, #0x2000
14+
subs r1, r1, r0
15+
bl #0xd2
16+
movw r1, #0x0
17+
movw r0, #0x0
18+
movt r1, #0x2000
19+
movt r0, #0x2000
20+
subs r2, r1, r0
21+
movw r1, #0x0
22+
movt r1, #0x0
23+
bl #0x8
24+
bl #-0x3c
25+
trap
2626

2727
DefaultExceptionHandler:
28-
7e: b #-0x4 <DefaultExceptionHandler>
28+
b #-0x4 <DefaultExceptionHandler>
2929

3030
UsageFault:
31-
7f: sub sp, #0x19c
31+
sub sp, #0x19c
3232

3333
__aeabi_memcpy:
34-
80: push {r4, r5, r7, lr}
35-
82: cbz r2, #0x56
36-
84: subs r3, r2, #0x1
37-
86: and r12, r2, #0x3
38-
8a: cmp r3, #0x3
39-
8c: bhs #0x8 <__aeabi_memcpy+0x18>
40-
8e: movs r2, #0x0
41-
90: cmp.w r12, #0x0
42-
94: bne #0x26 <__aeabi_memcpy+0x3e>
43-
96: b #0x42 <__aeabi_memcpy+0x5c>
44-
98: sub.w lr, r2, r12
45-
9c: movs r2, #0x0
46-
9e: ldrb r3, [r1, r2]
47-
a0: adds r4, r1, r2
48-
a2: strb r3, [r0, r2]
49-
a4: adds r3, r0, r2
50-
a6: adds r2, #0x4
51-
a8: ldrb r5, [r4, #0x1]
52-
aa: cmp lr, r2
53-
ac: strb r5, [r3, #0x1]
54-
ae: ldrb r5, [r4, #0x2]
55-
b0: strb r5, [r3, #0x2]
56-
b2: ldrb r4, [r4, #0x3]
57-
b4: strb r4, [r3, #0x3]
58-
b6: bne #-0x1c <__aeabi_memcpy+0x1e>
59-
b8: cmp.w r12, #0x0
60-
bc: beq #0x1c <__aeabi_memcpy+0x5c>
61-
be: ldrb r3, [r1, r2]
62-
c0: cmp.w r12, #0x1
63-
c4: strb r3, [r0, r2]
64-
c6: beq #0x12 <__aeabi_memcpy+0x5c>
65-
c8: adds r3, r2, #0x1
66-
ca: cmp.w r12, #0x2
67-
ce: ldrb r5, [r1, r3]
68-
d0: strb r5, [r0, r3]
69-
d2: it eq
70-
d4: popeq {r4, r5, r7, pc}
71-
d6: adds r2, #0x2
72-
d8: ldrb r1, [r1, r2]
73-
da: strb r1, [r0, r2]
74-
dc: pop {r4, r5, r7, pc}
34+
push {r4, r5, r7, lr}
35+
cbz r2, #0x56
36+
subs r3, r2, #0x1
37+
and r12, r2, #0x3
38+
cmp r3, #0x3
39+
bhs #0x8 <__aeabi_memcpy+0x18>
40+
movs r2, #0x0
41+
cmp.w r12, #0x0
42+
bne #0x26 <__aeabi_memcpy+0x3e>
43+
b #0x42 <__aeabi_memcpy+0x5c>
44+
sub.w lr, r2, r12
45+
movs r2, #0x0
46+
ldrb r3, [r1, r2]
47+
adds r4, r1, r2
48+
strb r3, [r0, r2]
49+
adds r3, r0, r2
50+
adds r2, #0x4
51+
ldrb r5, [r4, #0x1]
52+
cmp lr, r2
53+
strb r5, [r3, #0x1]
54+
ldrb r5, [r4, #0x2]
55+
strb r5, [r3, #0x2]
56+
ldrb r4, [r4, #0x3]
57+
strb r4, [r3, #0x3]
58+
bne #-0x1c <__aeabi_memcpy+0x1e>
59+
cmp.w r12, #0x0
60+
beq #0x1c <__aeabi_memcpy+0x5c>
61+
ldrb r3, [r1, r2]
62+
cmp.w r12, #0x1
63+
strb r3, [r0, r2]
64+
beq #0x12 <__aeabi_memcpy+0x5c>
65+
adds r3, r2, #0x1
66+
cmp.w r12, #0x2
67+
ldrb r5, [r1, r3]
68+
strb r5, [r0, r3]
69+
it eq
70+
popeq {r4, r5, r7, pc}
71+
adds r2, #0x2
72+
ldrb r1, [r1, r2]
73+
strb r1, [r0, r2]
74+
pop {r4, r5, r7, pc}
7575

7676
__aeabi_memset:
77-
de: cmp r1, #0x0
78-
e0: it eq
79-
e2: bxeq lr
80-
e4: push {r7, lr}
81-
e6: subs r3, r1, #0x1
82-
e8: and r12, r1, #0x3
83-
ec: cmp r3, #0x3
84-
ee: bhs #0x2 <__aeabi_memset+0x16>
85-
f0: movs r1, #0x0
86-
f2: b #0x14 <__aeabi_memset+0x2c>
87-
f4: sub.w lr, r1, r12
88-
f8: movs r1, #0x0
89-
fa: strb r2, [r0, r1]
90-
fc: adds r3, r0, r1
91-
fe: adds r1, #0x4
92-
100: cmp lr, r1
93-
102: strb r2, [r3, #0x3]
94-
104: strb r2, [r3, #0x2]
95-
106: strb r2, [r3, #0x1]
96-
108: bne #-0x12 <__aeabi_memset+0x1c>
97-
10a: cmp.w r12, #0x0
98-
10e: pop.w {r7, lr}
99-
112: itt ne
100-
114: strbne r2, [r0, r1]
101-
116: cmpne.w r12, #0x1
102-
11a: bne #0x0 <__aeabi_memset+0x40>
103-
11c: bx lr
104-
11e: add r0, r1
105-
120: cmp.w r12, #0x2
106-
124: strb r2, [r0, #0x1]
107-
126: it ne
108-
128: strbne r2, [r0, #0x2]
109-
12a: bx lr
77+
cmp r1, #0x0
78+
it eq
79+
bxeq lr
80+
push {r7, lr}
81+
subs r3, r1, #0x1
82+
and r12, r1, #0x3
83+
cmp r3, #0x3
84+
bhs #0x2 <__aeabi_memset+0x16>
85+
movs r1, #0x0
86+
b #0x14 <__aeabi_memset+0x2c>
87+
sub.w lr, r1, r12
88+
movs r1, #0x0
89+
strb r2, [r0, r1]
90+
adds r3, r0, r1
91+
adds r1, #0x4
92+
cmp lr, r1
93+
strb r2, [r3, #0x3]
94+
strb r2, [r3, #0x2]
95+
strb r2, [r3, #0x1]
96+
bne #-0x12 <__aeabi_memset+0x1c>
97+
cmp.w r12, #0x0
98+
pop.w {r7, lr}
99+
itt ne
100+
strbne r2, [r0, r1]
101+
cmpne.w r12, #0x1
102+
bne #0x0 <__aeabi_memset+0x40>
103+
bx lr
104+
add r0, r1
105+
cmp.w r12, #0x2
106+
strb r2, [r0, #0x1]
107+
it ne
108+
strbne r2, [r0, #0x2]
109+
bx lr
110110

111111
__aeabi_memclr:
112-
12c: movs r2, #0x0
113-
12e: b.w #-0x54 <__aeabi_memset>
112+
movs r2, #0x0
113+
b.w #-0x54 <__aeabi_memset>

‎ci/logging/app2/dev.objdump

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
00000001 g .log 00000001 Goodbye
2-
00000000 g .log 00000001 Hello, world!
1+
00000001 g O .log 00000001 Goodbye
2+
00000000 g O .log 00000001 Hello, world!

‎ci/logging/app3/dev.objdump

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
00000001 g .log 00000001 Goodbye
2-
00000000 g .log 00000001 Hello, world!
1+
00000001 g O .log 00000001 Goodbye
2+
00000000 g O .log 00000001 Hello, world!

‎ci/logging/app4/dev.objdump

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
00000000 g .log 00000001 Goodbye
2-
00000001 g .log 00000001 Hello, world!
1+
00000000 g O .log 00000001 Goodbye
2+
00000001 g O .log 00000001 Hello, world!
33
00000001 .log 00000000 __log_warning_start__

‎ci/main/app/app.objdump

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ app: file format ELF32-arm-little
33

44
Disassembly of section .text:
55
main:
6-
8: sub sp, #4
7-
a: movs r0, #42
8-
c: str r0, [sp]
9-
e: b #-2 <main+0x8>
10-
10: b #-4 <main+0x8>
6+
sub sp, #4
7+
movs r0, #42
8+
str r0, [sp]
9+
b #-2 <main+0x8>
10+
b #-4 <main+0x8>
1111

1212
Reset:
13-
12: bl #-14
14-
16: trap
13+
bl #-14
14+
trap

‎ci/memory-layout/app.text.objdump

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ app: file format ELF32-arm-little
33

44
Disassembly of section .text:
55
Reset:
6-
8: sub sp, #4
7-
a: movs r0, #42
8-
c: str r0, [sp]
9-
e: b #-2 <Reset+0x8>
10-
10: b #-4 <Reset+0x8>
6+
sub sp, #4
7+
movs r0, #42
8+
str r0, [sp]
9+
b #-2 <Reset+0x8>
10+
b #-4 <Reset+0x8>

‎ci/script.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ main() {
4242

4343
# check that the Reset symbol is there
4444
diff app.text.objdump \
45-
<(cargo objdump --bin app -- -d -no-show-raw-insn)
45+
<(cargo objdump --bin app -- -d -no-show-raw-insn -no-leading-addr)
4646

4747
# check that the reset vector is there and has the right address
4848
diff app.vector_table.objdump \
@@ -60,7 +60,7 @@ main() {
6060
# check that the disassembly matches
6161
pushd app
6262
diff app.objdump \
63-
<(cargo objdump --bin app -- -d -no-show-raw-insn)
63+
<(cargo objdump --bin app -- -d -no-show-raw-insn -no-leading-addr)
6464
# disabled because of rust-lang/rust#53964
6565
# edition_check
6666
popd
@@ -95,7 +95,7 @@ main() {
9595
# check that the disassembly matches
9696
pushd app
9797
diff app.objdump \
98-
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex)
98+
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex -no-leading-addr)
9999
diff app.vector_table.objdump \
100100
<(cargo objdump --bin app --release -- -s -j .vector_table)
101101
edition_check
@@ -116,7 +116,7 @@ main() {
116116
# check that the disassembly matches
117117
pushd app
118118
diff release.objdump \
119-
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex)
119+
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex -no-leading-addr)
120120
diff release.vector_table \
121121
<(cargo objdump --bin app --release -- -s -j .vector_table)
122122
edition_check
@@ -133,7 +133,7 @@ main() {
133133
# check that the disassembly matches
134134
pushd app2
135135
diff release.objdump \
136-
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex)
136+
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex -no-leading-addr)
137137
diff release.vector_table \
138138
<(cargo objdump --bin app --release -- -s -j .vector_table)
139139
edition_check

‎ci/singleton/app/dev.objdump

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
00000001 g .log 00000001 Goodbye
2-
00000000 g .log 00000001 Hello, world!
1+
00000001 g O .log 00000001 Goodbye
2+
00000000 g O .log 00000001 Hello, world!

0 commit comments

Comments
 (0)