Skip to content

fix: asm! macro is not allowed in naked functions #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 26, 2025
Merged

fix: asm! macro is not allowed in naked functions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe35bfe
fix: replace #[naked] with #[unsafe(naked)] for stable Rust
Kingcxp May 16, 2025
116dc4b
chore: update CHANGELOG
Kingcxp May 16, 2025
ea7dc7d
fix: remove unnecessary `unsafe` block
guttatus May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,10 @@ This release includes basical aclint functionalities.

### Fixed

## [v0.1.1]

### Fixed

- replace `#[naked]` with `#[unsafe(naked)]` for stable Rust

[v0.1.0]: https://github.com/rustsbi/aclint/releases/tag/v0.1.0
181 changes: 83 additions & 98 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
//!
//! RISC-V ACLINT is defined in <https://github.com/riscv/riscv-aclint>.
#![no_std]
#![feature(naked_functions)]
#![deny(warnings)]

use core::{arch::naked_asm, cell::UnsafeCell};
Expand Down Expand Up @@ -85,122 +84,108 @@ impl SifiveClint {
}

impl SifiveClint {
#[naked]
#[unsafe(naked)]
pub extern "C" fn read_mtime_naked(&self) -> u64 {
unsafe {
naked_asm!(
" addi sp, sp, -8
sd a1, (sp)

li a1, {offset}
add a0, a0, a1

ld a1, (sp)
addi sp, sp, 8

ld a0, (a0)
ret
",
offset = const Self::MTIME_OFFSET,
)
}
naked_asm!(
" addi sp, sp, -8
sd a1, (sp)

li a1, {offset}
add a0, a0, a1

ld a1, (sp)
addi sp, sp, 8

ld a0, (a0)
ret
",
offset = const Self::MTIME_OFFSET,
)
}

#[naked]
#[unsafe(naked)]
pub extern "C" fn write_mtime_naked(&self, val: u64) -> u64 {
unsafe {
naked_asm!(
" addi sp, sp, -8
sd a1, (sp)

li a1, {offset}
add a0, a0, a1

ld a1, (sp)
addi sp, sp, 8

sd a1, (a0)
ret
",
offset = const Self::MTIME_OFFSET,
)
}
naked_asm!(
" addi sp, sp, -8
sd a1, (sp)

li a1, {offset}
add a0, a0, a1

ld a1, (sp)
addi sp, sp, 8

sd a1, (a0)
ret
",
offset = const Self::MTIME_OFFSET,
)
}

#[naked]
#[unsafe(naked)]
pub extern "C" fn read_mtimecmp_naked(&self, hart_idx: usize) -> u64 {
unsafe {
naked_asm!(
" slli a1, a1, 3
add a0, a0, a1

li a1, {offset}
add a0, a0, a1

ld a0, (a0)
ret
",
offset = const Self::MTIMER_OFFSET,
)
}
naked_asm!(
" slli a1, a1, 3
add a0, a0, a1

li a1, {offset}
add a0, a0, a1

ld a0, (a0)
ret
",
offset = const Self::MTIMER_OFFSET,
)
}

#[naked]
#[unsafe(naked)]
pub extern "C" fn write_mtimecmp_naked(&self, hart_idx: usize, val: u64) {
unsafe {
naked_asm!(
" slli a1, a1, 3
add a0, a0, a1

li a1, {offset}
add a0, a0, a1

sd a2, (a0)
ret
",
offset = const Self::MTIMER_OFFSET,
)
}
naked_asm!(
" slli a1, a1, 3
add a0, a0, a1

li a1, {offset}
add a0, a0, a1

sd a2, (a0)
ret
",
offset = const Self::MTIMER_OFFSET,
)
}

#[naked]
#[unsafe(naked)]
pub extern "C" fn read_msip_naked(&self, hart_idx: usize) -> bool {
unsafe {
naked_asm!(
" slli a1, a1, 2
add a0, a0, a1
lw a0, (a0)
ret
",
)
}
naked_asm!(
" slli a1, a1, 2
add a0, a0, a1
lw a0, (a0)
ret
",
)
}

#[naked]
#[unsafe(naked)]
pub extern "C" fn set_msip_naked(&self, hart_idx: usize) {
unsafe {
naked_asm!(
" slli a1, a1, 2
add a0, a0, a1
addi a1, zero, 1
sw a1, (a0)
ret
",
)
}
naked_asm!(
" slli a1, a1, 2
add a0, a0, a1
addi a1, zero, 1
sw a1, (a0)
ret
",
)
}

#[naked]
#[unsafe(naked)]
pub extern "C" fn clear_msip_naked(&self, hart_idx: usize) {
unsafe {
naked_asm!(
" slli a1, a1, 2
add a0, a0, a1
sw zero, (a0)
ret
",
)
}
naked_asm!(
" slli a1, a1, 2
add a0, a0, a1
sw zero, (a0)
ret
",
)
}
}

Expand Down