Skip to content

Commit a6bb33f

Browse files
committed
Extended text to reflect that access is not allowed to CHERI instructions
1 parent 01df1dc commit a6bb33f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/riscv-hybrid-integration.adoc

+7-5
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ it is not possible to disable CHERI checks completely.
324324
endif::[]
325325

326326
{cheri_default_ext_name} includes functions to disable explicit access to CHERI
327-
registers. The following occurs when executing code in a privilege mode that
327+
registers and instructions. The following occurs when executing code in a privilege mode that
328328
has CHERI register access disabled:
329329

330330
* The CHERI instructions in xref:section_cap_instructions[xrefstyle=short] and
@@ -462,8 +462,9 @@ xref:menvcfgmodereg[xrefstyle=short].
462462
include::img/menvcfgmodereg.edn[]
463463

464464
The CHERI Register Enable (CRE) bit controls whether less privileged levels can
465-
perform explicit accesses to CHERI registers. When <<menvcfg>>.CRE=1 and <<mseccfg>>.CRE=1,
466-
CHERI registers can be read and written by less privileged levels. When <<menvcfg>>.CRE=0,
465+
perform explicit accesses to CHERI registers and execute CHERI instructions.
466+
When <<menvcfg>>.CRE=1 and <<mseccfg>>.CRE=1, CHERI registers can be read and
467+
written by less privileged levels. When <<menvcfg>>.CRE=0,
467468
CHERI registers are disabled in less privileged levels as described in
468469
xref:section_cheri_disable[xrefstyle=short].
469470

@@ -495,8 +496,9 @@ xref:senvcfgreg[xrefstyle=short].
495496
include::img/senvcfgreg.edn[]
496497

497498
The CHERI Register Enable (CRE) bit controls whether U-mode can perform
498-
explicit accesses to CHERI registers. When <<senvcfg>>.CRE=1 and <<menvcfg>>.CRE=1 and
499-
<<mseccfg>>.CRE=1 CHERI registers can be read and written by U-mode. When <<senvcfg>>.CRE=0,
499+
explicit accesses to CHERI registers and execute CHERI instructions. When
500+
<<senvcfg>>.CRE=1 and <<menvcfg>>.CRE=1 and <<mseccfg>>.CRE=1 CHERI registers
501+
can be read and written by U-mode. When <<senvcfg>>.CRE=0,
500502
CHERI registers are disabled in U-mode as described in
501503
xref:section_cheri_disable[xrefstyle=short].
502504

0 commit comments

Comments
 (0)