Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Each extension/instruction/CSR has its own file.
| v
| +---------------------------------+
| | {s} Implementation-specific |
| | Archiecture Spec |
| | Architecture Spec |
| | (gen/resolved_arch/NAME/*.yaml) |
| +---------------------------------+
| |
Expand Down
4 changes: 2 additions & 2 deletions arch/certificate_class/MC.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ naming_scheme: |
* Left & right square braces denote optional.
* \<model> is a 3 digit integer. It is changed only when mandatory extensions are added to a CRD.
** The one's digit is incremented when a small mandatory extension is added (e.g., Zicond)
** The ten's digit is incremented when a medium mandatory extension is addded (e.g., PMP)
** The hundreds's digit is incremented when a large mandatory extension is addded (e.g., V or H)
** The ten's digit is incremented when a medium mandatory extension is added (e.g., PMP)
** The hundreds's digit is incremented when a large mandatory extension is added (e.g., V or H)
* \<version> is a semantic version (see semver.org) formatted as <major>[.<minor>.[patch]]. If \<version> is omitted, the reference applies equally to all versions.
** A <major> release indicates support for a new optional extension.
** A <minor> release indicates one or more of the following changes to the certification tests associated with the CRD.
Expand Down
8 changes: 4 additions & 4 deletions arch/csr/H/hcounteren.layout
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fields:
the `cycle` CSR (an alias of `mcycle`) is accessible to VS-mode.

When `hcounteren.CY` is clear and `mcounteren.CY` is set, then any access to `cycle` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -62,7 +62,7 @@ fields:
the `time` CSR (an alias of `mtime`) is accessible to VS-mode.

When `hcounteren.TM` is clear and `mcounteren.TM` is set, then any access to `time` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -100,7 +100,7 @@ fields:
the `instret` CSR (an alias of `minstret`) is accessible to VS-mode.

When `hcounteren.IR` is clear and `mcounteren.IR` is set, then any access to `instret` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -138,7 +138,7 @@ fields:
the `hpmcounter<%= hpm_num %>` CSR (an alias of `mhpmcounter<%= hpm_num %>`) is accessible to VS-mode.

When `hcounteren.HPM<%= hpm_num %>` is clear and `mcounteren.HPM<%= hpm_num %>` is set, then any access to `hpmcounter<%= hpm_num %>` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down
64 changes: 32 additions & 32 deletions arch/csr/H/hcounteren.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fields:
the `cycle` CSR (an alias of `mcycle`) is accessible to VS-mode.

When `hcounteren.CY` is clear and `mcounteren.CY` is set, then any access to `cycle` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -63,7 +63,7 @@ fields:
the `time` CSR (an alias of `mtime`) is accessible to VS-mode.

When `hcounteren.TM` is clear and `mcounteren.TM` is set, then any access to `time` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -101,7 +101,7 @@ fields:
the `instret` CSR (an alias of `minstret`) is accessible to VS-mode.

When `hcounteren.IR` is clear and `mcounteren.IR` is set, then any access to `instret` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -138,7 +138,7 @@ fields:
the `hpmcounter3` CSR (an alias of `mhpmcounter3`) is accessible to VS-mode.

When `hcounteren.HPM3` is clear and `mcounteren.HPM3` is set, then any access to `hpmcounter3` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -175,7 +175,7 @@ fields:
the `hpmcounter4` CSR (an alias of `mhpmcounter4`) is accessible to VS-mode.

When `hcounteren.HPM4` is clear and `mcounteren.HPM4` is set, then any access to `hpmcounter4` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -212,7 +212,7 @@ fields:
the `hpmcounter5` CSR (an alias of `mhpmcounter5`) is accessible to VS-mode.

When `hcounteren.HPM5` is clear and `mcounteren.HPM5` is set, then any access to `hpmcounter5` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -249,7 +249,7 @@ fields:
the `hpmcounter6` CSR (an alias of `mhpmcounter6`) is accessible to VS-mode.

When `hcounteren.HPM6` is clear and `mcounteren.HPM6` is set, then any access to `hpmcounter6` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -286,7 +286,7 @@ fields:
the `hpmcounter7` CSR (an alias of `mhpmcounter7`) is accessible to VS-mode.

When `hcounteren.HPM7` is clear and `mcounteren.HPM7` is set, then any access to `hpmcounter7` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -323,7 +323,7 @@ fields:
the `hpmcounter8` CSR (an alias of `mhpmcounter8`) is accessible to VS-mode.

When `hcounteren.HPM8` is clear and `mcounteren.HPM8` is set, then any access to `hpmcounter8` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -360,7 +360,7 @@ fields:
the `hpmcounter9` CSR (an alias of `mhpmcounter9`) is accessible to VS-mode.

When `hcounteren.HPM9` is clear and `mcounteren.HPM9` is set, then any access to `hpmcounter9` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -397,7 +397,7 @@ fields:
the `hpmcounter10` CSR (an alias of `mhpmcounter10`) is accessible to VS-mode.

When `hcounteren.HPM10` is clear and `mcounteren.HPM10` is set, then any access to `hpmcounter10` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -434,7 +434,7 @@ fields:
the `hpmcounter11` CSR (an alias of `mhpmcounter11`) is accessible to VS-mode.

When `hcounteren.HPM11` is clear and `mcounteren.HPM11` is set, then any access to `hpmcounter11` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -471,7 +471,7 @@ fields:
the `hpmcounter12` CSR (an alias of `mhpmcounter12`) is accessible to VS-mode.

When `hcounteren.HPM12` is clear and `mcounteren.HPM12` is set, then any access to `hpmcounter12` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -508,7 +508,7 @@ fields:
the `hpmcounter13` CSR (an alias of `mhpmcounter13`) is accessible to VS-mode.

When `hcounteren.HPM13` is clear and `mcounteren.HPM13` is set, then any access to `hpmcounter13` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -545,7 +545,7 @@ fields:
the `hpmcounter14` CSR (an alias of `mhpmcounter14`) is accessible to VS-mode.

When `hcounteren.HPM14` is clear and `mcounteren.HPM14` is set, then any access to `hpmcounter14` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -582,7 +582,7 @@ fields:
the `hpmcounter15` CSR (an alias of `mhpmcounter15`) is accessible to VS-mode.

When `hcounteren.HPM15` is clear and `mcounteren.HPM15` is set, then any access to `hpmcounter15` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -619,7 +619,7 @@ fields:
the `hpmcounter16` CSR (an alias of `mhpmcounter16`) is accessible to VS-mode.

When `hcounteren.HPM16` is clear and `mcounteren.HPM16` is set, then any access to `hpmcounter16` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -656,7 +656,7 @@ fields:
the `hpmcounter17` CSR (an alias of `mhpmcounter17`) is accessible to VS-mode.

When `hcounteren.HPM17` is clear and `mcounteren.HPM17` is set, then any access to `hpmcounter17` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -693,7 +693,7 @@ fields:
the `hpmcounter18` CSR (an alias of `mhpmcounter18`) is accessible to VS-mode.

When `hcounteren.HPM18` is clear and `mcounteren.HPM18` is set, then any access to `hpmcounter18` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -730,7 +730,7 @@ fields:
the `hpmcounter19` CSR (an alias of `mhpmcounter19`) is accessible to VS-mode.

When `hcounteren.HPM19` is clear and `mcounteren.HPM19` is set, then any access to `hpmcounter19` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -767,7 +767,7 @@ fields:
the `hpmcounter20` CSR (an alias of `mhpmcounter20`) is accessible to VS-mode.

When `hcounteren.HPM20` is clear and `mcounteren.HPM20` is set, then any access to `hpmcounter20` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -804,7 +804,7 @@ fields:
the `hpmcounter21` CSR (an alias of `mhpmcounter21`) is accessible to VS-mode.

When `hcounteren.HPM21` is clear and `mcounteren.HPM21` is set, then any access to `hpmcounter21` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -841,7 +841,7 @@ fields:
the `hpmcounter22` CSR (an alias of `mhpmcounter22`) is accessible to VS-mode.

When `hcounteren.HPM22` is clear and `mcounteren.HPM22` is set, then any access to `hpmcounter22` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -878,7 +878,7 @@ fields:
the `hpmcounter23` CSR (an alias of `mhpmcounter23`) is accessible to VS-mode.

When `hcounteren.HPM23` is clear and `mcounteren.HPM23` is set, then any access to `hpmcounter23` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -915,7 +915,7 @@ fields:
the `hpmcounter24` CSR (an alias of `mhpmcounter24`) is accessible to VS-mode.

When `hcounteren.HPM24` is clear and `mcounteren.HPM24` is set, then any access to `hpmcounter24` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -952,7 +952,7 @@ fields:
the `hpmcounter25` CSR (an alias of `mhpmcounter25`) is accessible to VS-mode.

When `hcounteren.HPM25` is clear and `mcounteren.HPM25` is set, then any access to `hpmcounter25` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -989,7 +989,7 @@ fields:
the `hpmcounter26` CSR (an alias of `mhpmcounter26`) is accessible to VS-mode.

When `hcounteren.HPM26` is clear and `mcounteren.HPM26` is set, then any access to `hpmcounter26` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -1026,7 +1026,7 @@ fields:
the `hpmcounter27` CSR (an alias of `mhpmcounter27`) is accessible to VS-mode.

When `hcounteren.HPM27` is clear and `mcounteren.HPM27` is set, then any access to `hpmcounter27` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -1063,7 +1063,7 @@ fields:
the `hpmcounter28` CSR (an alias of `mhpmcounter28`) is accessible to VS-mode.

When `hcounteren.HPM28` is clear and `mcounteren.HPM28` is set, then any access to `hpmcounter28` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -1100,7 +1100,7 @@ fields:
the `hpmcounter29` CSR (an alias of `mhpmcounter29`) is accessible to VS-mode.

When `hcounteren.HPM29` is clear and `mcounteren.HPM29` is set, then any access to `hpmcounter29` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -1137,7 +1137,7 @@ fields:
the `hpmcounter30` CSR (an alias of `mhpmcounter30`) is accessible to VS-mode.

When `hcounteren.HPM30` is clear and `mcounteren.HPM30` is set, then any access to `hpmcounter30` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down Expand Up @@ -1174,7 +1174,7 @@ fields:
the `hpmcounter31` CSR (an alias of `mhpmcounter31`) is accessible to VS-mode.

When `hcounteren.HPM31` is clear and `mcounteren.HPM31` is set, then any access to `hpmcounter31` in
VU-mode or VS-mode causes a VirtualInstruction execption.
VU-mode or VS-mode causes a VirtualInstruction exception.

Summary:

Expand Down
18 changes: 9 additions & 9 deletions arch/csr/I/mcounteren.layout
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ fields:
<%%- end -%>

<%%- if ext?(:S) -%>
When `scounteren.CY` is also set, `cycle` is futher accessible to U-mode.
When `scounteren.CY` is also set, `cycle` is further accessible to U-mode.
<%%- end -%>

<%%- if ext?(:H) -%>
When `hcounteren.CY` is also set, `cycle` is futher accessible to VS-mode.
When `hcounteren.CY` is also set, `cycle` is further accessible to VS-mode.

When `hcounteren.CY` && `scounteren.CY` are both set, `cycle` is futher accessible to VU-mode.
When `hcounteren.CY` && `scounteren.CY` are both set, `cycle` is further accessible to VU-mode.
<%%- end -%>
type(): |
if (MCOUNTENABLE_EN[0]) {
Expand Down Expand Up @@ -131,13 +131,13 @@ fields:
<%%- end -%>

<%%- if ext?(:S) -%>
When `scounteren.IR` is also set, `instret` is futher accessible to U-mode.
When `scounteren.IR` is also set, `instret` is further accessible to U-mode.
<%%- end -%>

<%%- if ext?(:H) -%>
When `hcounteren.IR` is also set, `instret` is futher accessible to VS-mode.
When `hcounteren.IR` is also set, `instret` is further accessible to VS-mode.

When `hcounteren.IR` && `scounteren.IR` are both set, `instret` is futher accessible to VU-mode.
When `hcounteren.IR` && `scounteren.IR` are both set, `instret` is further accessible to VU-mode.
<%%- end -%>
type(): |
if (MCOUNTENABLE_EN[2]) {
Expand All @@ -163,13 +163,13 @@ fields:
<%%- end -%>

<%%- if ext?(:S) -%>
When `scounteren.HPM<%= hpm_num %>` is also set, `hpmcounter<%= hpm_num %>` is futher accessible to U-mode.
When `scounteren.HPM<%= hpm_num %>` is also set, `hpmcounter<%= hpm_num %>` is further accessible to U-mode.
<%%- end -%>

<%%- if ext?(:H) -%>
When `hcounteren.HPM<%= hpm_num %>` is also set, `hpmcounter<%= hpm_num %>` is futher accessible to VS-mode.
When `hcounteren.HPM<%= hpm_num %>` is also set, `hpmcounter<%= hpm_num %>` is further accessible to VS-mode.

When `hcounteren.HPM<%= hpm_num %>` && `scounteren.HPM<%= hpm_num %>` are both set, `hpmcounter<%= hpm_num %>` is futher accessible to VU-mode.
When `hcounteren.HPM<%= hpm_num %>` && `scounteren.HPM<%= hpm_num %>` are both set, `hpmcounter<%= hpm_num %>` is further accessible to VU-mode.
<%%- end -%>
type(): |
if (MCOUNTENABLE_EN[<%= hpm_num %>]) {
Expand Down
Loading
Loading