Skip to content

Commit

Permalink
Rename insn access fault to fetch fault (riscv#380)
Browse files Browse the repository at this point in the history
Fixes riscv#374

---------

Co-authored-by: Tariq Kurd <[email protected]>
  • Loading branch information
andresag01 and tariqkurd-repo committed Oct 9, 2024
1 parent d805215 commit b9d6f6e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/debug-integration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ for details.
As a result, the value of <<pcc>> is UNSPECIFIED in debug mode according
to this specification. The <<pcc>> metadata has no architectural effect in debug
mode. Therefore <<asr_perm>> is implicitly granted for access to all CSRs and
no PCC faults are possible.
no CHERI instruction fetch faults are possible.

<<dpcc>> (and consequently <<dpc>>) are updated with the
capability in <<pcc>> whose address field is set to the address of the next
Expand Down
2 changes: 1 addition & 1 deletion src/insns/mret_sret.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ result into <<pcc>>. SRET unseals <<sepcc>> and writes the result into <<pcc>>.
Exceptions::
CHERI fault exceptions occur when <<pcc>> does not grant <<asr_perm>> because
<<MRET>> and <<SRET>> require access to privileged CSRs. When that exception
occurs, _CHERI instruction access fault_ is reported in the TYPE field and the
occurs, _CHERI instruction fetch fault_ is reported in the TYPE field and the
Permission violation code is reported in the CAUSE field of <<mtval>> or
<<stval>>.

Expand Down
2 changes: 1 addition & 1 deletion src/insns/zcmt_cmjalt.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ include::zcm_common.adoc[]
Requires <<jvtc>> to be tagged, not sealed, have <<x_perm>> and for the full XLEN-wide access to be in <<jvtc>> bounds.

{cheri_cap_mode_name} Exceptions::
When these instructions cause CHERI exceptions, _CHERI instruction access fault_
When these instructions cause CHERI exceptions, _CHERI instruction fetch fault_
is reported in the TYPE field and the following codes may be
reported in the CAUSE field of <<mtval>> or <<stval>>:

Expand Down
2 changes: 1 addition & 1 deletion src/insns/zcmt_cmjt.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ include::zcm_common.adoc[]
Requires <<jvtc>> to be tagged, not sealed, have <<x_perm>> and for the full XLEN-wide access to be in <<jvtc>> bounds.

{cheri_cap_mode_name} Exceptions::
When these instructions cause CHERI exceptions, _CHERI instruction access fault_
When these instructions cause CHERI exceptions, _CHERI instruction fetch fault_
is reported in the TYPE field and the following codes may be
reported in the CAUSE field of <<mtval>> or <<stval>>:

Expand Down
2 changes: 1 addition & 1 deletion src/riscv-integration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ xref:mtval-cheri-causes[xrefstyle=short] respectively.
[#mtval-cheri-type,width=65%,float="center",align="center",options=header,cols="30%,70%"]
|==============================================================================
| CHERI Type Code | Description
| {cheri_excep_type_pcc} | CHERI instruction access fault
| {cheri_excep_type_pcc} | CHERI instruction fetch fault
| {cheri_excep_type_data} | CHERI data fault due to load, store or AMO
| {cheri_excep_type_jump} | CHERI jump or branch fault
| 3-15 | Reserved
Expand Down

0 comments on commit b9d6f6e

Please sign in to comment.