aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/machine.tex8
-rw-r--r--src/riscv-privileged.tex2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/machine.tex b/src/machine.tex
index 024daca..9189a81 100644
--- a/src/machine.tex
+++ b/src/machine.tex
@@ -1729,8 +1729,8 @@ addresses. Implementations may convert some invalid address patterns into
other invalid addresses prior to writing them to {\tt mepc}.
When a trap is taken into M-mode, {\tt mepc} is written with the virtual
-address of the instruction that encountered the exception. Otherwise,
-{\tt mepc} is never written by the implementation, though it may be
+address of the instruction that encountered the exception or was interrupted.
+Otherwise, {\tt mepc} is never written by the implementation, though it may be
explicitly written by software.
\begin{figure}[h!]
@@ -1860,9 +1860,9 @@ When a hardware breakpoint is triggered, or an instruction-fetch, load, or
store address-misaligned, access, or page-fault exception occurs, {\tt
mtval} is written with the faulting virtual address. On an illegal
instruction trap, {\tt mtval} may be written with the first XLEN or ILEN
-bits of the faulting instruction as described below. For other exceptions,
+bits of the faulting instruction as described below. For other traps,
{\tt mtval} is set to zero, but a future standard may redefine {\tt
- mtval}'s setting for other exceptions.
+ mtval}'s setting for other traps.
\begin{commentary}
The {\tt mtval} register replaces the {\tt mbadaddr} register in
diff --git a/src/riscv-privileged.tex b/src/riscv-privileged.tex
index d890dd6..85c5af0 100644
--- a/src/riscv-privileged.tex
+++ b/src/riscv-privileged.tex
@@ -39,7 +39,7 @@ Christopher Celio, Chuanhua Chang, David Chisnall, Anthony Coulter, Palmer Dabbe
Dalrymple, Dennis Ferguson, Mike Frysinger, John Hauser, David Horner, Olof
Johansson, Yunsup Lee, Andrew Lutomirski, Jonathan Neusch{\"a}fer, Rishiyur
Nikhil, Stefan O'Rear, Albert Ou, John Ousterhout, David Patterson, Dmitri
-Pavlov, Colin Schmidt, Wesley Terpstra, Matt Thomas, Tommy Thorn, Ray
+Pavlov, Kade Phillips, Colin Schmidt, Wesley Terpstra, Matt Thomas, Tommy Thorn, Ray
VanDeWalker, Megan Wachs, Steve Wallach, Andrew Waterman, Clifford Wolf,
and Reinoud Zandijk.