Skip to content

Commit dd31ea3

Browse files
committed
doc: assembler → assembly
1 parent fbec623 commit dd31ea3

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resolver = "2"
3232
# crates depend on `riscv` 0.5.x, which uses the old form of `asm!` with the
3333
# LLVM syntax, which isn't supported by the current compiler anymore. Therefore,
3434
# we have to patch `riscv` 0.5.x with the version that uses the form of inline
35-
# assembler supported by the current compiler.
35+
# assembly supported by the current compiler.
3636
git = "https://github.com/r3-os/rust-riscv.git"
3737
package = "riscv"
3838
branch = "refresh/0.5"

src/r3_kernel/src/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ pub struct TaskCb<
233233
/// Get a reference to `PortTaskState` in the task control block.
234234
///
235235
/// This is guaranteed to be placed at the beginning of the struct so that
236-
/// assembler code can refer to this easily.
236+
/// assembly code can refer to this easily.
237237
pub port_task_state: PortTaskState,
238238

239239
/// The static properties of the task.

src/r3_port_riscv/src/threading/imp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const REG_ALIGN: usize = if F_SIZE > X_SIZE { F_SIZE } else { X_SIZE };
3232
/// The size of FLS.F
3333
const FLSF_SIZE: usize = 20 * F_SIZE + REG_ALIGN;
3434

35-
/// The assembler fragments used by `pp_asm!`. Because of a mysterious macro
35+
/// The assembly code fragments used by `pp_asm!`. Because of a mysterious macro
3636
/// hygienics behavior, they have to referred to by absolute paths.
3737
///
3838
/// They are marked as `pub` to be used by `r3_port_riscv_test_driver`.

src/r3_port_riscv/src/threading/imp/csr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
//! automatically by a macro. They don't "infect" anything because this type's
5151
//! genericity "collapses" in the `use_port!` macro expansion.
5252
//!
53-
//! (2) The previous solution doesn't work for large inline assembler blocks
53+
//! (2) The previous solution doesn't work for large inline assembly blocks
5454
//! containing numerous references to CSRs. This brings us to the second
5555
//! solution:
5656
//! *Import constants as `sym` operands*. Interestingly, the `#[export_name]`
@@ -262,7 +262,7 @@ define_set! {
262262
/* `csrexpr!` is also exposed as `const`s here */
263263
}
264264

265-
/// Create an assembler expression that evaluates to a CSR number or value.
265+
/// Create an assembly expression that evaluates to a CSR number or value.
266266
/// Assumes the presence of an operand `PRIV = sym Traits::Priv::value`.
267267
macro csrexpr {
268268
// CSRs

src/r3_port_riscv/src/threading/imp/instemu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub(super) unsafe extern "C" fn handle_exception(_fl_state: *mut usize, _mcause:
2727
// TODO: catch double fault
2828
// FIXME: We can't put CFI directives yet because the compiler wraps the
2929
// function with `.cfi_startproc` and `.cfi_endproc` conditionally,
30-
// but we can't write assembler code that generate custom CFI
30+
// but we can't write assembly code that generate custom CFI
3131
// directives conditionally in the same way as the compiler does.
3232
// Possibly related: <https://github.com/rust-lang/rust/issues/75897>
3333
unsafe {

src/r3_portkit/src/sym.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ pub const DEFAULT_FN_ALIGN: usize = if cfg!(target_arch = "aarch64") {
117117
/// storage, so the bit must be cleared before use.
118118
///
119119
/// The [`SymStaticExt`] trait's methods automatically take care of such
120-
/// situations. When referencing it from assembler code, **you must append `_`
120+
/// situations. When referencing it from assembly code, **you must append `_`
121121
/// to the symbol name** (see the following example).
122122
///
123123
/// # Examples

0 commit comments

Comments
 (0)