Skip to content

Commit

Permalink
Merge pull request #917 from riscv/tm_reg
Browse files Browse the repository at this point in the history
Refer to "trigger registers" as "Trigger Module Registers"
  • Loading branch information
timsifive authored Dec 4, 2023
2 parents 24d2ea0 + f6adeec commit 4f58366
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Sdtrig.tex
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ \section{Multiple State Change Instructions} \label{sec:multistate}
executing it again leaves the hart in a state closely resembling the state it
would have been in if the instruction had only been executed once.

\section{Trigger Registers}
\section{Trigger Module Registers}

These registers are CSRs, accessible using the RISC-V {\tt csr} opcodes and
optionally also using abstract debug commands.
Expand Down Expand Up @@ -373,7 +373,7 @@ \section{Trigger Registers}
This avoids the problem of a partially written trigger firing at a different
time than is expected.

Attempts to access an unimplemented Trigger Register raise an illegal instruction
exception.
Attempts to access an unimplemented Trigger Module Register raise an illegal
instruction exception.

\input{hwbp_registers.tex}
2 changes: 1 addition & 1 deletion introduction.tex
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ \subsubsection{Minor Changes from 0.13 to 1.0}
\item \FcsrDcsrStopcount only applies to hart-local counters. \PR{405}
\item \FdmDmstatusVersion may be invalid when \FdmDmcontrolDmactive=0. \PR{414}
\item Address triggers (\RcsrMcontrol) may fire on any accessed address. \PR{421}
\item All trigger registers (Section~\ref{csrTrigger}) are optional. \PR{431}
\item All Trigger Module registers (Section~\ref{csrTrigger}) are optional. \PR{431}
\item When extending IR, \RdtmBypass still is all ones. \PR{437}
\item \FcsrDcsrEbreaks and \FcsrDcsrEbreaku are WARL. \PR{458}
\item NMIs are disabled by \FcsrDcsrStepie. \PR{465}
Expand Down
6 changes: 3 additions & 3 deletions xml/hwbp_registers.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<registers name="Trigger Registers" prefix="CSR_" label="trigger">
The trigger registers, except \RcsrMscontext, \RcsrScontext, and \RcsrHcontext, are only accessible in machine
<registers name="Trigger Module Registers" prefix="CSR_" label="trigger">
The Trigger Module registers, except \RcsrMscontext, \RcsrScontext, and \RcsrHcontext, are only accessible in machine
and Debug Mode to prevent untrusted user code from causing entry into Debug
Mode without the OS's permission.

Expand All @@ -16,7 +16,7 @@

<register name="Trigger Select" short="tselect" address="0x7a0">
This register determines which trigger is accessible through the other
trigger registers. It is optional if no triggers are implemented. The
Trigger Module registers. It is optional if no triggers are implemented. The
set of accessible triggers must start at 0, and be contiguous.

This register is \warl.
Expand Down

0 comments on commit 4f58366

Please sign in to comment.