Skip to content

Commit e731f4e

Browse files
authored
Merge pull request riscv#2131 from davidharrishmc/main
Fixed hyphenation of illegal-instruction exception and virtual-instruction exception
2 parents d9364d4 + d7ad5dc commit e731f4e

File tree

8 files changed

+19
-20
lines changed

8 files changed

+19
-20
lines changed

src/cmo.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,8 +639,8 @@ higher privileged level software may program the CSRs so that `CBO.INVAL`
639639
either traps or performs a flush operation in a lower privileged level._
640640
====
641641

642-
A `CBO.CLEAN` or `CBO.FLUSH` instruction executes or raises an illegal
643-
instruction or virtual-instruction exception based on the state of the
642+
A `CBO.CLEAN` or `CBO.FLUSH` instruction executes or raises an illegal-instruction
643+
or virtual-instruction exception based on the state of the
644644
`x{csrname}.CBCFE` bits:
645645

646646
[source,sail,subs="attributes+"]

src/indirect-csr.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ value that is not implemented, is UNSPECIFIED.
9999
[%unbreakable]
100100
[NOTE]
101101
====
102-
It is expected that implementations will typically raise an illegal
103-
instruction exception for such accesses, so that, for example, they can
102+
It is expected that implementations will typically raise an illegal-instruction
103+
exception for such accesses, so that, for example, they can
104104
be identified as software bugs. Platform specs, profile specs, and/or
105105
the Privileged ISA spec may place more restrictions on behavior for such
106106
accesses.

src/priv-cfi.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ of the faulting instruction to discern whether the fault was caused by a
232232
non-shadow-stack instruction writing to an SS page (a fatal condition) or by a
233233
shadow stack instruction to a non-resident page (a recoverable condition). The
234234
performance-critical nature of operating system page fault handlers necessitates
235-
triggering an access-fault instead of a page fault, allowing for a
235+
triggering an access fault instead of a page fault, allowing for a
236236
straightforward distinction between fatal conditions and recoverable faults.
237237
238238
Operating systems must ensure that no writable, non-shadow-stack alias virtual

src/priv-preface.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,8 @@ status fields in `mstatus`.
474474
* The SEIP and UEIP bits in the `mip` CSR have been redefined to support
475475
software injection of external interrupts.
476476
* The `mbadaddr` register has been subsumed by a more general `mtval`
477-
register that can now capture bad instruction bits on an illegal
478-
instruction fault to speed instruction emulation.
477+
register that can now capture bad instruction bits on an illegal-instruction
478+
fault to speed instruction emulation.
479479
* The machine-mode base-and-bounds translation and protection schemes
480480
have been removed from the specification as part of moving the virtual
481481
memory configuration to `sptbr` (now `satp`). Some of the motivation for

src/smcdeleg.adoc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,9 @@ by extensions Smcsrind/Sscsrind, a virtual-instruction exception is
104104
raised for attempts from VS-mode or VU-mode to directly access `vsiselect`
105105
or `vsireg*`, or attempts from VU-mode to access `siselect` or `sireg*`. Furthermore, while `vsiselect` holds a value in the range 0x40-0x5F:
106106

107-
* An attempt to access any `vsireg*` from M or S mode raises an illegal
108-
instruction exception.
109-
* An attempt from VS-mode to access any `sireg*` (really `vsireg*`) raises an illegal-instruction exception if `menvcfg`.CDE = 0, or a virtual
110-
instruction exception if `menvcfg`.CDE = 1.
107+
* An attempt to access any `vsireg*` from M or S mode raises an illegal-instruction exception.
108+
* An attempt from VS-mode to access any `sireg*` (really `vsireg*`) raises an illegal-instruction exception if `menvcfg`.CDE = 0, or a
109+
virtual-instruction exception if `menvcfg`.CDE = 1.
111110

112111
=== Supervisor Counter Inhibit (`scountinhibit`) Register
113112

@@ -117,8 +116,8 @@ Smcdeleg/Ssccfg defines a new `scountinhibit` register, a masked alias of
117116
delegated to S-mode, the associated bits in `scountinhibit` are read-only
118117
zero.
119118

120-
When `menvcfg`.CDE=0, attempts to access `scountinhibit` raise an illegal
121-
instruction exception. When Supervisor Counter Delegation
119+
When `menvcfg`.CDE=0, attempts to access `scountinhibit` raise an illegal-instruction
120+
exception. When Supervisor Counter Delegation
122121
is enabled, attempts to access `scountinhibit` from VS-mode or VU-mode
123122
raise a virtual-instruction exception.
124123

src/smstateen.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ less-privileged levels, but not at its own level. This is analogous to how the
8484
existing `counteren` CSRs control access to performance counter registers. Just
8585
as with the `counteren` CSRs, when a `stateen` CSR prevents access to state by
8686
less-privileged levels, an attempt in one of those privilege modes to execute
87-
an instruction that would read or write the protected state raises an illegal
88-
instruction exception, or, if executing in VS or VU mode and the circumstances
87+
an instruction that would read or write the protected state raises an illegal-instruction
88+
exception, or, if executing in VS or VU mode and the circumstances
8989
for a virtual-instruction exception apply, raises a virtual-instruction
9090
exception instead of an illegal-instruction exception.
9191

src/v-st-ext.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,8 @@ The `vstart` CSR is writable by unprivileged code, but non-zero
539539
`vstart` values may cause vector instructions to run substantially
540540
slower on some implementations, so `vstart` should not be used by
541541
application programmers. A few vector instructions cannot be
542-
executed with a non-zero `vstart` value and will raise an illegal
543-
instruction exception as defined below.
542+
executed with a non-zero `vstart` value and will raise an
543+
illegal-instruction exception as defined below.
544544

545545
NOTE: Making `vstart` visible to unprivileged code supports user-level
546546
threading libraries.
@@ -3874,8 +3874,8 @@ copied to the destination (e.g., by explicitly setting `vl`=1 and
38743874
performing a register-register copy).
38753875

38763876
Traps on vector reduction instructions are always reported with a
3877-
`vstart` of 0. Vector reduction operations raise an illegal
3878-
instruction exception if `vstart` is non-zero.
3877+
`vstart` of 0. Vector reduction operations raise an
3878+
illegal-instruction exception if `vstart` is non-zero.
38793879

38803880
The assembler syntax for a reduction operation is `vredop.vs`, where
38813881
the `.vs` suffix denotes the first operand is a vector register group

src/zawrs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ and among implementations. In typical implementations this duration should be
9494
roughly in the range of 10 to 100 times an on-chip cache miss latency or a
9595
cacheless access to main memory.
9696
97-
`WRS.NTO`, unlike `WFI`, is not specified to cause an illegal instruction
97+
`WRS.NTO`, unlike `WFI`, is not specified to cause an illegal-instruction
9898
exception if executed in U-mode when the governing `TW` bit is 0. `WFI` is
9999
typically not expected to be used in U-mode and on many systems may promptly
100100
cause an illegal-instruction exception if used at U-mode. Unlike `WFI`,

0 commit comments

Comments
 (0)