From 2a292ba34a42bab80be2b24545bd5035de388f91 Mon Sep 17 00:00:00 2001 From: Tsukasa OI Date: Mon, 21 Nov 2022 12:12:59 +0000 Subject: [PATCH] Fix typos This commit fixes some typos. - `ssppop` to `sspop` (as in other instances) - `menvcfgCFI` to `menvcfg.CFI` (add a dot) - Makes accessibility to `ssp` CSR consistent Note that this commit assumes that `ssp` CSR is URW. Signed-off-by: Tsukasa OI --- cfi_backward.adoc | 2 +- cfi_csrs.adoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfi_backward.adoc b/cfi_backward.adoc index 34fecc9..ba1605e 100644 --- a/cfi_backward.adoc +++ b/cfi_backward.adoc @@ -29,7 +29,7 @@ using the `mop.r` and `mop.rr` instructions defined by the Zimops extension. | `(mop.r)` |`31` | `20` |`19` | `15`|`14` | `12` |`11` | `7`|`6` | `0` | mnemonic 2+^|`1.00..0111..` 2+^|`rs1` 2+^|`func3` 2+^|`rd` 2+^|`opcode` |`sspush` 2+^|`100000011100` 2+^|`src` 2+^|`100` 2+^|`0` 2+^|`1110011` -|`ssppop` 2+^|`100000011100` 2+^|`0` 2+^|`100` 2+^|`dst` 2+^|`1110011` +|`sspop` 2+^|`100000011100` 2+^|`0` 2+^|`100` 2+^|`dst` 2+^|`1110011` |`ssprr` 2+^|`100000011101` 2+^|`0` 2+^|`100` 2+^|`dst` 2+^|`1110011` | 2+^|`12` 2+^|`5` 2+^|`3` 2+^|`5` 2+^|`7` |=== diff --git a/cfi_csrs.adoc b/cfi_csrs.adoc index af1720d..72221ea 100644 --- a/cfi_csrs.adoc +++ b/cfi_csrs.adoc @@ -8,7 +8,7 @@ This chapter specifies the CSR state of the Zisslpcfi extension. The `CFI` (bit 60) bit controls if Zisslpcfi extension is available for use in modes less privileged than M. -When `menvcfgCFI` bit is 0, then at privilege modes less privileged than M: +When `menvcfg.CFI` bit is 0, then at privilege modes less privileged than M: * Attempts to access `ssp` CSR and `lplr` CSR raise an illegal instruction exception. @@ -102,7 +102,7 @@ instruction exception. === Shadow stack pointer (`ssp`) -The `ssp` CSR is an unprivileged read-only (URW) CSR that reads and writes `XLEN` +The `ssp` CSR is an unprivileged read-write (URW) CSR that reads and writes `XLEN` low order bits of the shadow stack pointer (`ssp`). There is no high CSR defined as the `ssp` is always as wide as the `XLEN` of the current privilege level.