Skip to content

Commit 00d16c3

Browse files
bors[bot]hug-devadamgreigstianeklundTiwalun
authored
Merge #248
248: v0.6.3 backports r=adamgreig a=jonas-schievink Doesn't include *everything* we could, but I ran out of steam. The important stuff should be there. Next steps: - changelog - bump version and release Co-authored-by: Hugues de Valon <[email protected]> Co-authored-by: Adam Greig <[email protected]> Co-authored-by: Stian Eklund <[email protected]> Co-authored-by: Dominik Boehi <[email protected]> Co-authored-by: Jonas Schievink <[email protected]> Co-authored-by: Vadim Kaushan <[email protected]> Co-authored-by: Vincent Esche <[email protected]>
2 parents b889e49 + b5a5e57 commit 00d16c3

33 files changed

+708
-53
lines changed

‎.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: rust
22

33
matrix:
4+
allow_failures:
5+
- rust: nightly
46
include:
57
- env: TARGET=x86_64-unknown-linux-gnu
68
rust: stable
@@ -87,6 +89,7 @@ branches:
8789
- master
8890
- staging
8991
- trying
92+
- v0.6.x
9093

9194
notifications:
9295
email:

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ fn main() {
572572
- Functions to get the vector table
573573
- Wrappers over miscellaneous instructions like `bkpt`
574574

575-
[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.6.1...HEAD
575+
[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.6.2...HEAD
576576
[v0.6.2]: https://github.com/rust-embedded/cortex-m/compare/v0.6.1...v0.6.2
577577
[v0.6.1]: https://github.com/rust-embedded/cortex-m/compare/v0.6.0...v0.6.1
578578
[v0.6.0]: https://github.com/rust-embedded/cortex-m/compare/v0.5.8...v0.6.0

‎Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ keywords = ["arm", "cortex-m", "register", "peripheral"]
1010
license = "MIT OR Apache-2.0"
1111
name = "cortex-m"
1212
readme = "README.md"
13-
repository = "https://github.com/japaric/cortex-m"
13+
repository = "https://github.com/rust-embedded/cortex-m"
1414
version = "0.6.2"
1515
edition = "2018"
1616
links = "cortex-m" # prevent multiple versions of this crate to be linked together
@@ -19,6 +19,7 @@ links = "cortex-m" # prevent multiple versions of this crate to be linked toget
1919
aligned = "0.3.1"
2020
bare-metal = { version = "0.2.0", features = ["const-fn"] }
2121
volatile-register = "0.2.0"
22+
bitfield = "0.13.2"
2223

2324
[features]
2425
const-fn = []

‎asm-cm7-r0p1.s

+8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
.cfi_sections .debug_frame
2+
13
.section .text.__basepri_max_cm7_r0p1
24
.global __basepri_max_cm7_r0p1
35
.syntax unified
46
.thumb_func
7+
.cfi_startproc
58
__basepri_max_cm7_r0p1:
69
mrs r1, PRIMASK
710
cpsid i
@@ -11,11 +14,14 @@ __basepri_max_cm7_r0p1:
1114
bxne lr
1215
cpsie i
1316
bx lr
17+
.cfi_endproc
18+
.size __basepri_max_cm7_r0p1, . - __basepri_max_cm7_r0p1
1419

1520
.section .text.__basepri_w_cm7_r0p1
1621
.global __basepri_w_cm7_r0p1
1722
.syntax unified
1823
.thumb_func
24+
.cfi_startproc
1925
__basepri_w_cm7_r0p1:
2026
mrs r1, PRIMASK
2127
cpsid i
@@ -25,3 +31,5 @@ __basepri_w_cm7_r0p1:
2531
bxne lr
2632
cpsie i
2733
bx lr
34+
.cfi_endproc
35+
.size __basepri_w_cm7_r0p1, . - __basepri_w_cm7_r0p1

‎asm-v7.s

+14
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,41 @@
1+
.cfi_sections .debug_frame
2+
13
.section .text.__basepri_max
24
.global __basepri_max
35
.thumb_func
6+
.cfi_startproc
47
__basepri_max:
58
msr BASEPRI_MAX, r0
69
bx lr
10+
.cfi_endproc
11+
.size __basepri_max, . - __basepri_max
712

813
.section .text.__basepri_r
914
.global __basepri_r
1015
.thumb_func
16+
.cfi_startproc
1117
__basepri_r:
1218
mrs r0, BASEPRI
1319
bx lr
20+
.cfi_endproc
21+
.size __basepri_r, . - __basepri_r
1422

1523
.section .text.__basepri_w
1624
.global __basepri_w
1725
.thumb_func
26+
.cfi_startproc
1827
__basepri_w:
1928
msr BASEPRI, r0
2029
bx lr
30+
.cfi_endproc
31+
.size __basepri_w, . - __basepri_w
2132

2233
.section .text.__faultmask
2334
.global __faultmask
2435
.thumb_func
36+
.cfi_startproc
2537
__faultmask:
2638
mrs r0, FAULTMASK
2739
bx lr
40+
.cfi_endproc
41+
.size __faultmask, . - __faultmask

‎asm-v8-main.s

+15
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,43 @@
1+
2+
.cfi_sections .debug_frame
3+
14
.section .text.__msplim_r
25
.global __msplim_r
36
.thumb_func
7+
.cfi_startproc
48
__msplim_r:
59
mrs r0, MSPLIM
610
bx lr
11+
.cfi_endproc
12+
.size __msplim_r, . - __msplim_r
713

814
.section .text.__msplim_w
915
.global __msplim_w
1016
.thumb_func
17+
.cfi_startproc
1118
__msplim_w:
1219
msr MSPLIM, r0
1320
bx lr
21+
.cfi_endproc
22+
.size __msplim_w, . - __msplim_w
1423

1524
.section .text.__psplim_r
1625
.global __psplim_r
1726
.thumb_func
27+
.cfi_startproc
1828
__psplim_r:
1929
mrs r0, PSPLIM
2030
bx lr
31+
.cfi_endproc
32+
.size __psplim_r, . - __psplim_r
2133

2234
.section .text.__psplim_w
2335
.global __psplim_w
2436
.thumb_func
37+
.cfi_startproc
2538
__psplim_w:
2639
msr PSPLIM, r0
2740
bx lr
41+
.cfi_endproc
42+
.size __psplim_w, . - __psplim_w
2843

‎asm-v8.s

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
.cfi_sections .debug_frame
2+
3+
.section .text.__tt
4+
.global __tt
5+
.thumb_func
6+
.cfi_startproc
7+
__tt:
8+
tt r0, r0
9+
bx lr
10+
.cfi_endproc
11+
.size __tt, . - __tt
12+
13+
.section .text.__ttt
14+
.global __ttt
15+
.thumb_func
16+
.cfi_startproc
17+
__ttt:
18+
ttt r0, r0
19+
bx lr
20+
.cfi_endproc
21+
.size __ttt, . - __ttt
22+
23+
.section .text.__tta
24+
.global __tta
25+
.thumb_func
26+
.cfi_startproc
27+
__tta:
28+
tta r0, r0
29+
bx lr
30+
.cfi_endproc
31+
.size __tta, . - __tta
32+
33+
34+
.section .text.__ttat
35+
.global __ttat
36+
.thumb_func
37+
.cfi_startproc
38+
__ttat:
39+
ttat r0, r0
40+
bx lr
41+
.cfi_endproc
42+
.size __ttat, . - __ttat

‎asm.s

+63
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,192 @@
1+
.cfi_sections .debug_frame
2+
13
.section .text.__bkpt
24
.global __bkpt
35
.thumb_func
6+
.cfi_startproc
47
__bkpt:
58
bkpt
69
bx lr
10+
.cfi_endproc
11+
.size __bkpt, . - __bkpt
712

813
.section .text.__control_r
914
.global __control_r
1015
.thumb_func
16+
.cfi_startproc
1117
__control_r:
1218
mrs r0, CONTROL
1319
bx lr
20+
.cfi_endproc
21+
.size __control_r, . - __control_r
1422

1523
.section .text.__control_w
1624
.global __control_w
1725
.thumb_func
26+
.cfi_startproc
1827
__control_w:
1928
msr CONTROL, r0
2029
bx lr
30+
.cfi_endproc
31+
.size __control_w, . - __control_w
2132

2233

2334
.section .text.__cpsid
2435
.global __cpsid
2536
.thumb_func
37+
.cfi_startproc
2638
__cpsid:
2739
cpsid i
2840
bx lr
41+
.cfi_endproc
42+
.size __cpsid, . - __cpsid
2943

3044
.section .text.__cpsie
3145
.global __cpsie
3246
.thumb_func
47+
.cfi_startproc
3348
__cpsie:
3449
cpsie i
3550
bx lr
51+
.cfi_endproc
52+
.size __cpsie, . - __cpsie
3653

3754
.section .text.__delay
3855
.global __delay
3956
.syntax unified
4057
.thumb_func
58+
.cfi_startproc
4159
__delay:
4260
1:
4361
nop
4462
subs r0, #1
4563
bne 1b // Branch to 1 instead of __delay does not generate R_ARM_THM_JUMP8 relocation, which breaks linking on the thumbv6m-none-eabi target
4664
bx lr
65+
.cfi_endproc
66+
.size __delay, . - __delay
4767

4868
.section .text.__dmb
4969
.global __dmb
5070
.thumb_func
71+
.cfi_startproc
5172
__dmb:
5273
dmb 0xF
5374
bx lr
75+
.cfi_endproc
76+
.size __dmb, . - __dmb
5477

5578
.section .text.__dsb
5679
.global __dsb
5780
.thumb_func
81+
.cfi_startproc
5882
__dsb:
5983
dsb 0xF
6084
bx lr
85+
.cfi_endproc
86+
.size __dsb, . - __dsb
6187

6288
.section .text.__isb
6389
.global __isb
6490
.thumb_func
91+
.cfi_startproc
6592
__isb:
6693
isb 0xF
6794
bx lr
95+
.cfi_endproc
96+
.size __isb, . - __isb
6897

6998
.section .text.__msp_r
7099
.global __msp_r
71100
.thumb_func
101+
.cfi_startproc
72102
__msp_r:
73103
mrs r0, MSP
74104
bx lr
105+
.cfi_endproc
106+
.size __msp_r, . - __msp_r
75107

76108
.section .text.__msp_w
77109
.global __msp_w
78110
.thumb_func
79111
__msp_w:
80112
msr MSP, r0
81113
bx lr
114+
.size __msp_w, . - __msp_w
82115

83116
.section .text.__nop
84117
.global __nop
85118
.thumb_func
119+
.cfi_startproc
86120
__nop:
87121
bx lr
122+
.cfi_endproc
123+
.size __nop, . - __nop
88124

89125
.section .text.__primask
90126
.global __primask
91127
.thumb_func
128+
.cfi_startproc
92129
__primask:
93130
mrs r0, PRIMASK
94131
bx lr
132+
.cfi_endproc
133+
.size __primask, . - __primask
95134

96135
.section .text.__psp_r
97136
.global __psp_r
98137
.thumb_func
138+
.cfi_startproc
99139
__psp_r:
100140
mrs r0, PSP
101141
bx lr
142+
.cfi_endproc
143+
.size __psp_r, . - __psp_r
102144

103145
.section .text.__psp_w
104146
.global __psp_w
105147
.thumb_func
106148
__psp_w:
107149
msr PSP, r0
108150
bx lr
151+
.size __psp_w, . - __psp_w
109152

110153
.section .text.__sev
111154
.global __sev
112155
.thumb_func
156+
.cfi_startproc
113157
__sev:
114158
sev
115159
bx lr
160+
.cfi_endproc
161+
.size __sev, . - __sev
162+
163+
164+
.section .text.__udf
165+
.global __udf
166+
.thumb_func
167+
.cfi_startproc
168+
__udf:
169+
udf
170+
.cfi_endproc
171+
.size __udf, . - __udf
116172

117173
.section .text.__wfe
118174
.global __wfe
119175
.thumb_func
176+
.cfi_startproc
120177
__wfe:
121178
wfe
122179
bx lr
180+
.cfi_endproc
181+
.size __wfe, . - __wfe
182+
123183

124184
.section .text.__wfi
125185
.global __wfi
126186
.thumb_func
187+
.cfi_startproc
127188
__wfi:
128189
wfi
129190
bx lr
191+
.cfi_endproc
192+
.size __wfi, . - __wfi

0 commit comments

Comments
 (0)