Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SL description to all store cap instructions #431

Merged
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
1 change: 1 addition & 0 deletions src/insns/atomic_exceptions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ If the authorizing capability does not grant <<lm_perm>>, and the tag of `cd` is
+
If the authorizing capability does not grant <<el_perm>>, and the tag of `cd` is 1, then an implicit <<ACPERM>> clearing <<el_perm>> and restricting <<section_cap_level>> to the level of the authorizing capability is performed to obtain the final permissions on `cd` (see <<LC>>).
+
The stored tag is also set to zero if the authorizing capability does not have <<sl_perm>> set but the stored data has a <<section_cap_level>> of 0 (see <<SC>>).
endif::[]
ifndef::cap_atomic[]
Requires <<r_perm>> and <<w_perm>> in the authorising capability.
Expand Down
15 changes: 13 additions & 2 deletions src/insns/store_16bit_cap_sprel.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,22 @@ include::xlen_variable_warning.adoc[]
Encoding::
include::wavedrom/c-sp-store-cap.adoc[]

include::store_cap_cap_description.adoc[]
{cheri_cap_mode_name} Description::
Store the CLEN+1 bit value in `cs2'` to memory. The capability in `cs1/csp`
authorizes the operation. The effective address of the memory access is
obtained by adding the address of `cs1/csp` to the sign-extended 12-bit offset.

NOTE: These mnemonics do not exist in {cheri_int_mode_name}.

:cap_store:
Tag of the written capability value::

The capability written to memory has the tag set to 0 if the tag of `cs2'` is 0 or if the authorizing capability (`cs1/csp`) does not grant <<c_perm>>.
+
The stored tag is also set to zero if the authorizing capability does not have <<sl_perm>> set but the stored data has a <<section_cap_level>> of 0 (_local_).

include::malformed_no_check.adoc[]

:has_cap_data:
include::store_exceptions.adoc[]

Prerequisites::
Expand Down
2 changes: 0 additions & 2 deletions src/insns/store_cap_cap_description.adoc

This file was deleted.

2 changes: 2 additions & 0 deletions src/insns/store_cond_cap_32bit.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ Store conditional instructions, authorised by the capability in <<ddc>>.

:store_cond:

include::store_tag_perms.adoc[]

include::malformed_no_check.adoc[]

include::store_exceptions.adoc[]
Expand Down
Loading