File tree Expand file tree Collapse file tree 5 files changed +6
-7
lines changed Expand file tree Collapse file tree 5 files changed +6
-7
lines changed Original file line number Diff line number Diff line change 1
1
[workspace ]
2
+ resolver = " 3"
2
3
members = [" xtask" , " fast-trap" , " test-app" ]
3
4
default-members = [" xtask" ]
Original file line number Diff line number Diff line change 2
2
name = " fast-trap"
3
3
description = " Provide a framework for bare-metal trap handling, aiming at ensuring performance while reusing code."
4
4
version = " 0.0.1"
5
- edition = " 2021 "
5
+ edition = " 2024 "
6
6
authors = [" YdrMaster <ydrml@hotmail.com>" ]
7
7
repository = " https://github.com/YdrMaster/fast-trap.git"
8
8
documentation = " https://docs.rs/fast-trap"
Original file line number Diff line number Diff line change @@ -111,14 +111,13 @@ impl FlowContext {
111
111
#[ naked]
112
112
pub unsafe extern "C" fn reuse_stack_for_trap ( ) {
113
113
const LAYOUT : Layout = Layout :: new :: < TrapHandler > ( ) ;
114
- core:: arch:: asm !(
114
+ core:: arch:: naked_asm !(
115
115
" addi sp, sp, {size}
116
116
andi sp, sp, {mask}
117
117
ret
118
118
" ,
119
119
size = const -( LAYOUT . size( ) as isize ) ,
120
120
mask = const !( LAYOUT . align( ) as isize - 1 ) ,
121
- options( noreturn)
122
121
)
123
122
}
124
123
@@ -127,7 +126,7 @@ pub unsafe extern "C" fn reuse_stack_for_trap() {
127
126
/// See [proto](crate::hal::doc::trap_entry).
128
127
#[ naked]
129
128
pub unsafe extern "C" fn trap_entry ( ) {
130
- core:: arch:: asm !(
129
+ core:: arch:: naked_asm !(
131
130
".align 2" ,
132
131
// 换栈
133
132
exchange!( ) ,
@@ -242,6 +241,5 @@ pub unsafe extern "C" fn trap_entry() {
242
241
load!( a1[ 9 ] => a1) ,
243
242
exchange!( ) ,
244
243
r#return!( ) ,
245
- options( noreturn) ,
246
244
)
247
245
}
Original file line number Diff line number Diff line change 1
1
[package ]
2
2
name = " test-app"
3
3
version = " 0.0.0"
4
- edition = " 2021 "
4
+ edition = " 2024 "
5
5
authors = [" YdrMaster <ydrml@hotmail.com>" ]
6
6
publish = false
7
7
Original file line number Diff line number Diff line change 1
1
[package ]
2
2
name = " xtask"
3
3
version = " 0.1.0"
4
- edition = " 2021 "
4
+ edition = " 2024 "
5
5
authors = [" YdrMaster <ydrml@hotmail.com>" ]
6
6
publish = false
7
7
You can’t perform that action at this time.
0 commit comments