Skip to content

Commit 9efc972

Browse files
adamgreigadamgreig
committed
Regenerate known-good outputs with latest Rust nightly. Fixes #77.
1 parent 080915f commit 9efc972

File tree

12 files changed

+198
-108
lines changed

12 files changed

+198
-108
lines changed

‎ci/asm/app/release.objdump

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11

22
app: file format elf32-littlearm
33

4-
54
Disassembly of section .text:
65

76
<HardFault>:
8-
b #-0x4 <HardFault>
7+
b 0x40 <HardFault> @ imm = #-0x4
98

109
<main>:
11-
b #-0x4 <main>
10+
b 0x42 <main> @ imm = #-0x4
1211

1312
<Reset>:
1413
push {r7, lr}
1514
mov r7, sp
16-
bl #-0xa
15+
bl 0x42 <main> @ imm = #-0xa
1716
trap
1817

1918
<UsageFault>:
20-
b #-0x4 <UsageFault>
19+
b 0x4e <UsageFault> @ imm = #-0x4
2120

2221
<HardFaultTrampoline>:
2322
mrs r0, msp
24-
b #-0x18 <HardFault>
23+
b 0x40 <HardFault> @ imm = #-0x18

‎ci/asm/app/release.vector_table

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
app: file format elf32-littlearm
3-
43
Contents of section .vector_table:
54
0000 00000120 45000000 4f000000 51000000 ... E...O...Q...
65
0010 4f000000 4f000000 4f000000 00000000 O...O...O.......

‎ci/exceptions/app/app.objdump

Lines changed: 183 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
app: file format elf32-littlearm
33

4-
54
Disassembly of section .text:
65

76
<main>:
@@ -16,118 +15,216 @@ Disassembly of section .text:
1615
movt r1, #0x2000
1716
movt r0, #0x2000
1817
subs r1, r1, r0
19-
bl #0x34
18+
bl 0x92 <__aeabi_memclr> @ imm = #0x34
2019
movw r1, #0x0
2120
movw r0, #0x0
2221
movt r1, #0x2000
2322
movt r0, #0x2000
2423
subs r2, r1, r0
25-
movw r1, #0x16c
24+
movw r1, #0x280
2625
movt r1, #0x0
27-
bl #0x8
28-
bl #-0x40
26+
bl 0x84 <__aeabi_memcpy> @ imm = #0x8
27+
bl 0x40 <main> @ imm = #-0x40
2928
trap
3029

3130
<UsageFault>:
32-
b #-0x4 <UsageFault>
31+
b 0x82 <UsageFault> @ imm = #-0x4
3332

3433
<__aeabi_memcpy>:
35-
b.w #0x10 <memcpy>
34+
b.w 0x98 <memcpy> @ imm = #0x10
3635

3736
<__aeabi_memset>:
3837
mov r3, r1
3938
mov r1, r2
4039
mov r2, r3
41-
b.w #0x84 <memset>
40+
b.w 0x1e4 <memset> @ imm = #0x152
4241

4342
<__aeabi_memclr>:
4443
movs r2, #0x0
45-
b.w #-0x10 <__aeabi_memset>
44+
b.w 0x88 <__aeabi_memset> @ imm = #-0x10
4645

4746
<memcpy>:
4847
push {r4, r5, r6, r7, lr}
4948
add r7, sp, #0xc
50-
str r8, [sp, #-4]!
51-
cbz r2, #0x10
52-
subs r3, r2, #0x1
53-
and r12, r2, #0x3
54-
cmp r3, #0x3
55-
bhs #0xc <memcpy+0x22>
49+
push.w {r8, r9, r10}
50+
cmp r2, #0xf
51+
bls 0x16c <memcpy+0xd4> @ imm = #0xc6
52+
rsbs r3, r0, #0
53+
ands r4, r3, #0x3
54+
add.w r12, r0, r4
55+
beq 0xde <memcpy+0x46> @ imm = #0x2c
56+
mov r3, r0
57+
mov r6, r1
58+
ldrb r5, [r6]
59+
strb r5, [r3], #1
60+
cmp r3, r12
61+
itttt lo
62+
ldrblo r5, [r6, #0x1]
63+
strblo r5, [r3], #1
64+
cmplo r3, r12
65+
ldrblo r5, [r6, #0x2]
66+
itt lo
67+
strblo r5, [r3], #1
68+
cmplo r3, r12
69+
bhs 0xde <memcpy+0x46> @ imm = #0xa
70+
ldrb r5, [r6, #0x3]
71+
adds r6, #0x4
72+
strb r5, [r3], #1
73+
cmp r3, r12
74+
blo 0xb4 <memcpy+0x1c> @ imm = #-0x2c
75+
sub.w lr, r2, r4
76+
add.w r9, r1, r4
77+
bic r8, lr, #0x3
78+
add.w r3, r12, r8
79+
lsls.w r2, r9, #0x1e
80+
beq 0x174 <memcpy+0xdc> @ imm = #0x7e
81+
cmp.w r8, #0x1
82+
blt 0x1a6 <memcpy+0x10e> @ imm = #0xaa
83+
movs r2, #0x18
84+
and.w r10, r2, r9, lsl #3
5685
movs r2, #0x0
57-
cmp.w r12, #0x0
58-
bne #0x3e <memcpy+0x5c>
59-
ldr r8, [sp], #4
60-
pop {r4, r5, r6, r7, pc}
61-
bic r2, r2, #0x3
62-
add.w lr, r0, #0x1
63-
rsbs r4, r2, #0
64-
add.w r8, r1, #0x1
65-
mvn r2, #0x3
66-
add.w r6, r8, r2
67-
add.w r5, lr, r2
68-
adds r2, #0x4
69-
ldrb r3, [r6, #0x3]
70-
strb r3, [r5, #0x3]
71-
ldrb r3, [r6, #0x4]
72-
strb r3, [r5, #0x4]
73-
ldrb r3, [r6, #0x5]
74-
strb r3, [r5, #0x5]
75-
ldrb r3, [r6, #0x6]
76-
strb r3, [r5, #0x6]
77-
adds r3, r4, r2
78-
adds r3, #0x4
79-
bne #-0x22 <memcpy+0x34>
80-
adds r2, #0x4
81-
cmp.w r12, #0x0
82-
beq #-0x42 <memcpy+0x1c>
83-
ldrb r3, [r1, r2]
84-
cmp.w r12, #0x1
85-
strb r3, [r0, r2]
86-
beq #-0x4c <memcpy+0x1c>
87-
adds r3, r2, #0x1
88-
cmp.w r12, #0x2
89-
ldrb r6, [r1, r3]
90-
strb r6, [r0, r3]
91-
beq #-0x58 <memcpy+0x1c>
92-
adds r2, #0x2
93-
ldrb r1, [r1, r2]
94-
strb r1, [r0, r2]
95-
ldr r8, [sp], #4
86+
sub.w r2, r2, r9, lsl #3
87+
and r5, r2, #0x18
88+
bic r2, r9, #0x3
89+
add.w r6, r2, #0x8
90+
ldr r2, [r2]
91+
lsr.w r1, r2, r10
92+
ldr r2, [r6, #-4]
93+
lsl.w r4, r2, r5
94+
orrs r1, r4
95+
str r1, [r12], #4
96+
cmp r12, r3
97+
bhs 0x1a6 <memcpy+0x10e> @ imm = #0x7a
98+
lsr.w r1, r2, r10
99+
ldr r2, [r6]
100+
lsl.w r4, r2, r5
101+
orrs r1, r4
102+
str r1, [r12], #4
103+
cmp r12, r3
104+
itttt lo
105+
lsrlo.w r1, r2, r10
106+
ldrlo r2, [r6, #0x4]
107+
lsllo.w r4, r2, r5
108+
orrlo r1, r4
109+
itt lo
110+
strlo r1, [r12], #4
111+
cmplo r12, r3
112+
bhs 0x1a6 <memcpy+0x10e> @ imm = #0x50
113+
lsr.w r1, r2, r10
114+
ldr r2, [r6, #0x8]
115+
adds r6, #0x10
116+
lsl.w r4, r2, r5
117+
orrs r1, r4
118+
str r1, [r12], #4
119+
cmp r12, r3
120+
blo 0x114 <memcpy+0x7c> @ imm = #-0x58
121+
b 0x1a6 <memcpy+0x10e> @ imm = #0x38
122+
mov r3, r0
123+
cmp r2, #0x1
124+
bge 0x1b2 <memcpy+0x11a> @ imm = #0x3e
125+
b 0x1de <memcpy+0x146> @ imm = #0x68
126+
cmp.w r8, #0x1
127+
blt 0x1a6 <memcpy+0x10e> @ imm = #0x2a
128+
mov r4, r9
129+
ldr r1, [r4]
130+
str r1, [r12], #4
131+
cmp r12, r3
132+
itttt lo
133+
ldrlo r1, [r4, #0x4]
134+
strlo r1, [r12], #4
135+
cmplo r12, r3
136+
ldrlo r1, [r4, #0x8]
137+
itt lo
138+
strlo r1, [r12], #4
139+
cmplo r12, r3
140+
bhs 0x1a6 <memcpy+0x10e> @ imm = #0xa
141+
ldr r1, [r4, #0xc]
142+
adds r4, #0x10
143+
str r1, [r12], #4
144+
cmp r12, r3
145+
blo 0x17c <memcpy+0xe4> @ imm = #-0x2c
146+
add.w r1, r9, r8
147+
and r2, lr, #0x3
148+
cmp r2, #0x1
149+
blt 0x1de <memcpy+0x146> @ imm = #0x2a
150+
add r2, r3
151+
ldrb r6, [r1]
152+
strb r6, [r3], #1
153+
cmp r3, r2
154+
itttt lo
155+
ldrblo r6, [r1, #0x1]
156+
strblo r6, [r3], #1
157+
cmplo r3, r2
158+
ldrblo r6, [r1, #0x2]
159+
itt lo
160+
strblo r6, [r3], #1
161+
cmplo r3, r2
162+
bhs 0x1de <memcpy+0x146> @ imm = #0xa
163+
ldrb r6, [r1, #0x3]
164+
adds r1, #0x4
165+
strb r6, [r3], #1
166+
cmp r3, r2
167+
blo 0x1b4 <memcpy+0x11c> @ imm = #-0x2c
168+
pop.w {r8, r9, r10}
96169
pop {r4, r5, r6, r7, pc}
97170

98171
<memset>:
99172
push {r4, r6, r7, lr}
100173
add r7, sp, #0x8
101-
cbz r2, #0x3e
102-
subs r3, r2, #0x1
103-
and r12, r2, #0x3
104-
cmp r3, #0x3
105-
bhs #0x2 <memset+0x14>
106-
movs r2, #0x0
107-
b #0x22 <memset+0x38>
108-
bic r2, r2, #0x3
109-
add.w lr, r0, #0x1
110-
rsbs r3, r2, #0
111-
mvn r2, #0x3
112-
add.w r4, lr, r2
113-
adds r2, #0x4
114-
strb r1, [r4, #0x6]
115-
strb r1, [r4, #0x5]
116-
strb r1, [r4, #0x4]
117-
strb r1, [r4, #0x3]
118-
adds r4, r3, r2
119-
adds r4, #0x4
120-
bne #-0x16 <memset+0x22>
121-
adds r2, #0x4
122-
cmp.w r12, #0x0
123-
itt ne
124-
strbne r1, [r0, r2]
125-
cmpne.w r12, #0x1
126-
bne #0x0 <memset+0x48>
127-
pop {r4, r6, r7, pc}
128-
add r2, r0
129-
cmp.w r12, #0x2
130-
strb r1, [r2, #0x1]
131-
it ne
132-
strbne r1, [r2, #0x2]
174+
cmp r2, #0xf
175+
bls 0x258 <memset+0x74> @ imm = #0x6a
176+
rsbs r3, r0, #0
177+
ands lr, r3, #0x3
178+
add.w r12, r0, lr
179+
beq 0x218 <memset+0x34> @ imm = #0x1e
180+
mov r3, r0
181+
strb r1, [r3], #1
182+
cmp r3, r12
183+
itttt lo
184+
strblo r1, [r3], #1
185+
cmplo r3, r12
186+
strblo r1, [r3], #1
187+
cmplo r3, r12
188+
bhs 0x218 <memset+0x34> @ imm = #0x6
189+
strb r1, [r3], #1
190+
cmp r3, r12
191+
blo 0x1fa <memset+0x16> @ imm = #-0x20
192+
sub.w lr, r2, lr
193+
bic r2, lr, #0x3
194+
add.w r3, r12, r2
195+
cmp r2, #0x1
196+
blt 0x24e <memset+0x6a> @ imm = #0x24
197+
uxtb r2, r1
198+
mov.w r4, #0x1010101
199+
muls r2, r4, r2
200+
str r2, [r12], #4
201+
cmp r12, r3
202+
itttt lo
203+
strlo r2, [r12], #4
204+
cmplo r12, r3
205+
strlo r2, [r12], #4
206+
cmplo r12, r3
207+
bhs 0x24e <memset+0x6a> @ imm = #0x6
208+
str r2, [r12], #4
209+
cmp r12, r3
210+
blo 0x230 <memset+0x4c> @ imm = #-0x20
211+
and r2, lr, #0x3
212+
cmp r2, #0x1
213+
bge 0x25e <memset+0x7a> @ imm = #0x6
214+
b 0x27e <memset+0x9a> @ imm = #0x24
215+
mov r3, r0
216+
cmp r2, #0x1
217+
blt 0x27e <memset+0x9a> @ imm = #0x1e
218+
add r2, r3
219+
strb r1, [r3], #1
220+
cmp r3, r2
221+
itttt lo
222+
strblo r1, [r3], #1
223+
cmplo r3, r2
224+
strblo r1, [r3], #1
225+
cmplo r3, r2
226+
bhs 0x27e <memset+0x9a> @ imm = #0x6
227+
strb r1, [r3], #1
228+
cmp r3, r2
229+
blo 0x260 <memset+0x7c> @ imm = #-0x20
133230
pop {r4, r6, r7, pc}

‎ci/exceptions/app/app.vector_table.objdump

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
app: file format elf32-littlearm
3-
43
Contents of section .vector_table:
54
0000 00000120 45000000 83000000 83000000 ... E...........
65
0010 83000000 83000000 83000000 00000000 ................

‎ci/logging/app2/dev.objdump

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

‎ci/logging/app3/dev.objdump

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

‎ci/logging/app4/dev.objdump

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

‎ci/main/app/app.objdump

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11

22
app: file format elf32-littlearm
33

4-
54
Disassembly of section .text:
65

76
<main>:
87
sub sp, #4
98
movs r0, #42
109
str r0, [sp]
11-
b #-2 <main+0x8>
12-
b #-4 <main+0x8>
10+
b 0x10 <main+0x8> @ imm = #-2
11+
b 0x10 <main+0x8> @ imm = #-4
1312

1413
<Reset>:
1514
push {r7, lr}
1615
mov r7, sp
17-
bl #-18
16+
bl 0x8 <main> @ imm = #-18
1817
trap

‎ci/main/app4/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#![feature(asm)]
21
#![no_main]
32
#![no_std]
43

5-
use core::ptr;
4+
use core::{ptr, arch::asm};
65

76
use rt::entry;
87

0 commit comments

Comments
 (0)