From d2f48d0e46daca082bbe43dcfa1f780aafc9f6a4 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Mon, 18 Mar 2024 18:06:31 -0500 Subject: [PATCH 1/4] Note that not all MOP.RR.7 or MOP.R.28 encodings are used for Zicfiss --- src/cfi_backward.adoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cfi_backward.adoc b/src/cfi_backward.adoc index 097c671..20a12b7 100644 --- a/src/cfi_backward.adoc +++ b/src/cfi_backward.adoc @@ -98,10 +98,11 @@ The Zicfiss extension introduces the following instructions: * Perform an atomic swap from a shadow stack location (See <>) ** `SSAMOSWAP.W` and `SSAMOSWAP.D` -When a `MOP.RR.7` or `MOP.R.28` encoding is not utilized by the Zicfiss -extension, the instruction adheres to its Zimop-defined behavior, unless it is -employed by another extension. In such cases, the instruction follows the -behavior specified by that other extension. +Zicfiss does not use all encodings of `MOP.RR.7` or `MOP.R.28`. When a +`MOP.RR.7` or `MOP.R.28` encoding is not utilized by the Zicfiss extension, the +instruction adheres to its Zimop-defined behavior, unless it is employed by +another extension. In such cases, the instruction follows the behavior specified +by that other extension. If a shadow stack (SS) instruction raises an access-fault, page-fault, or guest-page-fault exception that is supposed to indicate the original instruction From d5d6dcb7f442e7484a290474f12df067d8adca93 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Mon, 18 Mar 2024 18:11:44 -0500 Subject: [PATCH 2/4] Note that not all MOP.RR.7 or MOP.R.28 encodings are used for Zicfiss --- src/cfi_backward.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cfi_backward.adoc b/src/cfi_backward.adoc index 20a12b7..0d56273 100644 --- a/src/cfi_backward.adoc +++ b/src/cfi_backward.adoc @@ -100,9 +100,9 @@ The Zicfiss extension introduces the following instructions: Zicfiss does not use all encodings of `MOP.RR.7` or `MOP.R.28`. When a `MOP.RR.7` or `MOP.R.28` encoding is not utilized by the Zicfiss extension, the -instruction adheres to its Zimop-defined behavior, unless it is employed by -another extension. In such cases, the instruction follows the behavior specified -by that other extension. +corresponding instruction adheres to its Zimop-defined behavior, unless it is +employed by another extension. In such cases, the instruction follows the +behavior specified by that other extension. If a shadow stack (SS) instruction raises an access-fault, page-fault, or guest-page-fault exception that is supposed to indicate the original instruction From b3ce5863c01c14dbbb56dbef36e3c16ec5dab1b3 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Mon, 18 Mar 2024 18:17:03 -0500 Subject: [PATCH 3/4] update wording --- src/cfi_backward.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cfi_backward.adoc b/src/cfi_backward.adoc index 0d56273..e16db38 100644 --- a/src/cfi_backward.adoc +++ b/src/cfi_backward.adoc @@ -100,9 +100,8 @@ The Zicfiss extension introduces the following instructions: Zicfiss does not use all encodings of `MOP.RR.7` or `MOP.R.28`. When a `MOP.RR.7` or `MOP.R.28` encoding is not utilized by the Zicfiss extension, the -corresponding instruction adheres to its Zimop-defined behavior, unless it is -employed by another extension. In such cases, the instruction follows the -behavior specified by that other extension. +corresponding instruction adheres to its Zimop-defined behavior, unless +redefined by another extension. If a shadow stack (SS) instruction raises an access-fault, page-fault, or guest-page-fault exception that is supposed to indicate the original instruction From 8f55ef50014481db6d1445255434218bf58783d4 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Tue, 19 Mar 2024 11:35:37 -0500 Subject: [PATCH 4/4] update text --- src/cfi_backward.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cfi_backward.adoc b/src/cfi_backward.adoc index e16db38..5449807 100644 --- a/src/cfi_backward.adoc +++ b/src/cfi_backward.adoc @@ -99,7 +99,7 @@ The Zicfiss extension introduces the following instructions: ** `SSAMOSWAP.W` and `SSAMOSWAP.D` Zicfiss does not use all encodings of `MOP.RR.7` or `MOP.R.28`. When a -`MOP.RR.7` or `MOP.R.28` encoding is not utilized by the Zicfiss extension, the +`MOP.RR.7` or `MOP.R.28` encoding is not used by the Zicfiss extension, the corresponding instruction adheres to its Zimop-defined behavior, unless redefined by another extension.