Differentiate "assembly code" and "asm block".

The latter now only means the entire block, while the former means the
assembly code specified within the block (thus excluding `label` blocks).

Author: nbdd0121

src/inline-assembly.md

@@ -356,7 +356,7 @@ assert_eq!(y, [3, 2, 0, 1]);
 
 r[asm.operand-type.supported-operands.label]
 * `label <block>`
-  - The address of the block is substituted into the asm template string. The assembly block may jump to the substituted address.
+  - The address of the block is substituted into the asm template string. The assembly code may jump to the substituted address.
   - After execution of the block, the `asm!` expression returns.
   - The type of the block must be unit or `!` (never).
   - The block starts a new safety context; despite the outer `unsafe` block needed for `asm!`, unsafe operations within the `label` block must be wrapped in an inner `unsafe` block.
@@ -749,7 +749,7 @@ Some registers cannot be used for input or output operands:
 
 | Architecture | Unsupported register | Reason |
 | ------------ | -------------------- | ------ |
-| All | `sp`, `r15` (s390x) | The stack pointer must be restored to its original value at the end of an asm code block. |
+| All | `sp`, `r15` (s390x) | The stack pointer must be restored to its original value at the end of an assembly code. |
 | All | `bp` (x86), `x29` (AArch64 and Arm64EC), `x8` (RISC-V), `$fp` (LoongArch), `r11` (s390x) | The frame pointer cannot be used as an input or output. |
 | ARM | `r7` or `r11` | On ARM the frame pointer can be either `r7` or `r11` depending on the target. The frame pointer cannot be used as an input or output. |
 | All | `si` (x86-32), `bx` (x86-64), `r6` (ARM), `x19` (AArch64 and Arm64EC), `x9` (RISC-V), `$s8` (LoongArch) | This is used internally by LLVM as a "base pointer" for functions with complex stack frames. |
@@ -873,7 +873,7 @@ r[asm.abi-clobbers]
 ## ABI clobbers
 
 r[asm.abi-clobbers.intro]
-The `clobber_abi` keyword can be used to apply a default set of clobbers to an `asm!` block.
+The `clobber_abi` keyword can be used to apply a default set of clobbers to the assembly code.
 This will automatically insert the necessary clobber constraints as needed for calling a function with a particular calling convention: if the calling convention does not fully preserve the value of a register across a call then `lateout("...") _` is implicitly added to the operands list (where the `...` is replaced by the register's name).
 
 ```rust
@@ -966,12 +966,12 @@ r[asm.options]
 ## Options
 
 r[asm.options.supported-options]
-Flags are used to further influence the behavior of the inline assembly block.
+Flags are used to further influence the behavior of the inline assembly code.
 Currently the following options are defined:
 
 r[asm.options.supported-options.pure]
-- `pure`: The `asm!` block has no side effects, must eventually return, and its outputs depend only on its direct inputs (i.e. the values themselves, not what they point to) or values read from memory (unless the `nomem` options is also set).
-  This allows the compiler to execute the `asm!` block fewer times than specified in the program (e.g. by hoisting it out of a loop) or even eliminate it entirely if the outputs are not used.
+- `pure`: The assembly code has no side effects, must eventually return, and its outputs depend only on its direct inputs (i.e. the values themselves, not what they point to) or values read from memory (unless the `nomem` options is also set).
+  This allows the compiler to execute the assembly code fewer times than specified in the program (e.g. by hoisting it out of a loop) or even eliminate it entirely if the outputs are not used.
   The `pure` option must be combined with either the `nomem` or `readonly` options, otherwise a compile-time error is emitted.
 
 ```rust
@@ -998,9 +998,9 @@ assert_eq!(z, 0);
 ```
 
 r[asm.options.supported-options.nomem]
-- `nomem`: The `asm!` block does not read from or write to any memory accessible outside of the `asm!` block.
-  This allows the compiler to cache the values of modified global variables in registers across the `asm!` block since it knows that they are not read or written to by the `asm!`.
-  The compiler also assumes that this `asm!` block does not perform any kind of synchronization with other threads, e.g. via fences.
+- `nomem`: The assembly code does not read from or write to any memory accessible outside of the assembly code.
+  This allows the compiler to cache the values of modified global variables in registers across the assembly code since it knows that they are not read or written to by the `asm!`.
+  The compiler also assumes that the assembly code does not perform any kind of synchronization with other threads, e.g. via fences.
 
 <!-- no_run: This test has unpredictable or undefined behavior at runtime -->
 ```rust,no_run
@@ -1044,9 +1044,9 @@ assert_eq!(z, 1);
 ```
 
 r[asm.options.supported-options.readonly]
-- `readonly`: The `asm!` block does not write to any memory accessible outside of the `asm!` block.
-  This allows the compiler to cache the values of unmodified global variables in registers across the `asm!` block since it knows that they are not written to by the `asm!`.
-  The compiler also assumes that this `asm!` block does not perform any kind of synchronization with other threads, e.g. via fences.
+- `readonly`: The assembly code does not write to any memory accessible outside of the assembly code.
+  This allows the compiler to cache the values of unmodified global variables in registers across the assembly code since it knows that they are not written to by the `asm!`.
+  The compiler also assumes that this assembly code does not perform any kind of synchronization with other threads, e.g. via fences.
 
 <!-- no_run: This test has undefined behaviour at runtime -->
 ```rust,no_run
@@ -1090,14 +1090,14 @@ assert_eq!(z, 1);
 ```
 
 r[asm.options.supported-options.preserves_flags]
-- `preserves_flags`: The `asm!` block does not modify the flags register (defined in the rules below).
-  This allows the compiler to avoid recomputing the condition flags after the `asm!` block.
+- `preserves_flags`: The assembly code does not modify the flags register (defined in the rules below).
+  This allows the compiler to avoid recomputing the condition flags after the assembly code.
 
 r[asm.options.supported-options.noreturn]
-- `noreturn`: The `asm!` block never returns, and its return type is defined as `!` (never).
+- `noreturn`: The assembly code never returns, and its return type is defined as `!` (never).
   Behavior is undefined if execution falls through past the end of the asm code.
   A `noreturn` asm block behaves just like a function which doesn't return; notably, local variables in scope are not dropped before it is invoked.
-- When any `label` blocks are present, `noreturn` means the execution of the `asm!` block never falls through; the asm block may only exit by jumping to one of the specified blocks.
+- When any `label` blocks are present, `noreturn` means the execution of the assembly code never falls through; the assembly code may only exit by jumping to one of the specified blocks.
   The entire `asm!` block will have unit type in this case, unless all `label` blocks diverge, in which case the return type is `!`.
 
 <!-- no_run: This test aborts at runtime -->
@@ -1120,7 +1120,7 @@ unsafe { core::arch::asm!("", options(noreturn)); }
 ```
 
 r[asm.options.supported-options.nostack]
-- `nostack`: The `asm!` block does not push data to the stack, or write to the stack red-zone (if supported by the target).
+- `nostack`: The assembly code does not push data to the stack, or write to the stack red-zone (if supported by the target).
   If this option is *not* used then the stack pointer is guaranteed to be suitably aligned (according to the target ABI) for a function call.
 
 <!-- no_run: Test has undefined behavior at runtime -->
@@ -1217,27 +1217,27 @@ r[asm.rules.intro]
 To avoid undefined behavior, these rules must be followed when using function-scope inline assembly (`asm!`):
 
 r[asm.rules.reg-not-input]
-- Any registers not specified as inputs will contain an undefined value on entry to the asm block.
+- Any registers not specified as inputs will contain an undefined value on entry to the assembly code.
   - An "undefined value" in the context of inline assembly means that the register can (non-deterministically) have any one of the possible values allowed by the architecture.
     Notably it is not the same as an LLVM `undef` which can have a different value every time you read it (since such a concept does not exist in assembly code).
 
 r[asm.rules.reg-not-output]
-- Any registers not specified as outputs must have the same value upon exiting the asm block as they had on entry, otherwise behavior is undefined.
+- Any registers not specified as outputs must have the same value upon exiting the assembly code as they had on entry, otherwise behavior is undefined.
   - This only applies to registers which can be specified as an input or output.
     Other registers follow target-specific rules.
   - Note that a `lateout` may be allocated to the same register as an `in`, in which case this rule does not apply.
     Code should not rely on this however since it depends on the results of register allocation.
 
 r[asm.rules.unwind]
-- Behavior is undefined if execution unwinds out of an asm block.
+- Behavior is undefined if execution unwinds out of the assembly code.
   - This also applies if the assembly code calls a function which then unwinds.
 
 r[asm.rules.mem-same-as-ffi]
 - The set of memory locations that assembly code is allowed to read and write are the same as those allowed for an FFI function.
   - Refer to the unsafe code guidelines for the exact rules.
   - If the `readonly` option is set, then only memory reads are allowed.
   - If the `nomem` option is set then no reads or writes to memory are allowed.
-  - These rules do not apply to memory which is private to the asm code, such as stack space allocated within the asm block.
+  - These rules do not apply to memory which is private to the asm code, such as stack space allocated within the assembly code.
 
 r[asm.rules.black-box]
 - The compiler cannot assume that the instructions in the asm are the ones that will actually end up executed.
@@ -1247,22 +1247,22 @@ r[asm.rules.black-box]
 
 r[asm.rules.stack-below-sp]
 - Unless the `nostack` option is set, asm code is allowed to use stack space below the stack pointer.
-  - On entry to the asm block the stack pointer is guaranteed to be suitably aligned (according to the target ABI) for a function call.
+  - On entry to the assembly code the stack pointer is guaranteed to be suitably aligned (according to the target ABI) for a function call.
   - You are responsible for making sure you don't overflow the stack (e.g. use stack probing to ensure you hit a guard page).
   - You should adjust the stack pointer when allocating stack memory as required by the target ABI.
-  - The stack pointer must be restored to its original value before leaving the asm block.
+  - The stack pointer must be restored to its original value before leaving the assembly code.
 
 r[asm.rules.noreturn]
-- If the `noreturn` option is set then behavior is undefined if execution falls through to the end of the asm block.
+- If the `noreturn` option is set then behavior is undefined if execution falls through to the end of the assembly code.
 
 r[asm.rules.pure]
 - If the `pure` option is set then behavior is undefined if the `asm!` has side-effects other than its direct outputs.
   Behavior is also undefined if two executions of the `asm!` code with the same inputs result in different outputs.
   - When used with the `nomem` option, "inputs" are just the direct inputs of the `asm!`.
-  - When used with the `readonly` option, "inputs" comprise the direct inputs of the `asm!` and any memory that the `asm!` block is allowed to read.
+  - When used with the `readonly` option, "inputs" comprise the direct inputs of the `asm!` and any memory that the assembly code is allowed to read.
 
 r[asm.rules.preserved-registers]
-- These flags registers must be restored upon exiting the asm block if the `preserves_flags` option is set:
+- These flags registers must be restored upon exiting the assembly code if the `preserves_flags` option is set:
   - x86
     - Status flags in `EFLAGS` (CF, PF, AF, ZF, SF, OF).
     - Floating-point status word (all).
@@ -1286,12 +1286,12 @@ r[asm.rules.preserved-registers]
     - The condition code register `cc`.
 
 r[asm.rules.x86-df]
-- On x86, the direction flag (DF in `EFLAGS`) is clear on entry to an asm block and must be clear on exit.
-  - Behavior is undefined if the direction flag is set on exiting an asm block.
+- On x86, the direction flag (DF in `EFLAGS`) is clear on entry to the assembly code and must be clear on exit.
+  - Behavior is undefined if the direction flag is set on exiting the assembly code.
 
 r[asm.rules.x86-x87]
 - On x86, the x87 floating-point register stack must remain unchanged unless all of the `st([0-7])` registers have been marked as clobbered with `out("st(0)") _, out("st(1)") _, ...`.
-  - If all x87 registers are clobbered then the x87 register stack is guaranteed to be empty upon entering an `asm` block. Assembly code must ensure that the x87 register stack is also empty when exiting the asm block.
+  - If all x87 registers are clobbered then the x87 register stack is guaranteed to be empty upon entering the assembly code. Assembly code must ensure that the x87 register stack is also empty when exiting the asssembly code.
 
 ```rust
 # #[cfg(target_arch = "x86_64")]
@@ -1330,8 +1330,8 @@ r[asm.rules.arm64ec]
 - On arm64ec, [call checkers with appropriate thunks](https://learn.microsoft.com/en-us/windows/arm/arm64ec-abi#authoring-arm64ec-in-assembly) are mandatory when calling functions.
 
 r[asm.rules.only-on-exit]
-- The requirement of restoring the stack pointer and non-output registers to their original value only applies when exiting an `asm!` block.
-  - This means that `asm!` blocks that never return (even if not marked `noreturn`) don't need to preserve these registers.
+- The requirement of restoring the stack pointer and non-output registers to their original value only applies when exiting the assembly code.
+  - This means that assembly code that never return (even if not marked `noreturn`) don't need to preserve these registers.
   - When returning to a different `asm!` block than you entered (e.g. for context switching), these registers must contain the value they had upon entering the `asm!` block that you are *exiting*.
     - You cannot exit an `asm!` block that has not been entered.
       Neither can you exit an `asm!` block that has already been exited (without first entering it again).
@@ -1387,7 +1387,7 @@ Inline assembly supports a subset of the directives supported by both GNU AS and
 The result of using other directives is assembler-specific (and may cause an error, or may be accepted as-is).
 
 r[asm.directives.stateful]
-If inline assembly includes any "stateful" directive that modifies how subsequent assembly is processed, the block must undo the effects of any such directives before the inline assembly ends.
+If inline assembly includes any "stateful" directive that modifies how subsequent assembly is processed, the assembly code must undo the effects of any such directives before the inline assembly ends.
 
 r[asm.directives.supported-directives]
 The following directives are guaranteed to be supported by the assembler:
@@ -1514,7 +1514,7 @@ On x86 targets, both 32-bit and 64-bit, the following additional directives are
 - `.code32`
 - `.code64`
 
-Use of `.code16`, `.code32`, and `.code64` directives are only supported if the state is reset to the default before exiting the assembly block.
+Use of `.code16`, `.code32`, and `.code64` directives are only supported if the state is reset to the default before exiting the assembly code.
 32-bit x86 uses `.code32` by default, and x86_64 uses `.code64` by default.
 
 r[asm.target-specific-directives.arm-32-bit]