From aaf37804a85f7f1ed147e99e6efb2ffd29916d2a Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue <91900059+ved-rivos@users.noreply.github.com> Date: Thu, 16 May 2024 15:40:06 -0500 Subject: Slightly clean up *envcfg bit spec (#1417) --- src/hypervisor.adoc | 11 +++-------- src/machine.adoc | 12 +++--------- 2 files changed, 6 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/hypervisor.adoc b/src/hypervisor.adoc index 74e9604..56761a7 100644 --- a/src/hypervisor.adoc +++ b/src/hypervisor.adoc @@ -640,16 +640,11 @@ When ADUE=0, the implementation behaves as though Svade were implemented for VS-stage address translation. If Svadu is not implemented, ADUE is read-only zero. -The definition of the STCE field will be furnished by the forthcoming -Sstc extension. Its allocation within `henvcfg` may change prior to the +The definition of the STCE field is furnished by the Sstc extension. -The definition of the CBZE field will be furnished by the forthcoming -Zicboz extension. Its allocation within `henvcfg` may change prior to -the ratification of that extension. +The definition of the CBZE field is furnished by the Zicboz extension. -The definitions of the CBCFE and CBIE fields will be furnished by the -forthcoming Zicbom extension. Their allocations within `henvcfg` may -change prior to the ratification of that extension. +The definitions of the CBCFE and CBIE fields are furnished by the Zicbom extension. The definition of the PMM field will be furnished by the forthcoming Ssnpm extension. Its allocation within `henvcfg` may change prior to the diff --git a/src/machine.adoc b/src/machine.adoc index 31a5aee..c3f304a 100644 --- a/src/machine.adoc +++ b/src/machine.adoc @@ -2176,17 +2176,11 @@ A/D bits need be set, hence Svade is implemented when ADUE=0. If the Smcdeleg extension is implemented, the CDE (Counter Delegation Enable) bit controls whether Zicntr and Zihpm counters can be delegated to S-mode. When CDE=1, the Smcdeleg extension is enabled, see <>. When CDE=0, the Smcdeleg and Ssccfg extensions appear to be not implemented. If Smcdeleg is not implemented, CDE is read-only zero. -The definition of the STCE field will be furnished by the forthcoming -Sstc extension. Its allocation within `menvcfg` may change prior to the -ratification of that extension. +The definition of the STCE field is furnished by the Sstc extension. -The definition of the CBZE field will be furnished by the forthcoming -Zicboz extension. Its allocation within `menvcfg` may change prior to -the ratification of that extension. +The definition of the CBZE field is furnished by the Zicboz extension. -The definitions of the CBCFE and CBIE fields will be furnished by the -forthcoming Zicbom extension. Their allocations within `menvcfg` may -change prior to the ratification of that extension. +The definitions of the CBCFE and CBIE fields are furnished by the Zicbom extension. The definition of the PMM field will be furnished by the forthcoming Smnpm extension. Its allocation within `menvcfg` may change prior to the -- cgit v1.1