From 5c8eade67eb251359272441f1b1e6f8cbeecc0b8 Mon Sep 17 00:00:00 2001 From: Kersten Richter Date: Tue, 1 Oct 2024 21:28:46 -0500 Subject: [PATCH 01/13] Update naming.adoc Signed-off-by: Kersten Richter --- src/naming.adoc | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/naming.adoc b/src/naming.adoc index 09c728b1a..63e55ae68 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -76,11 +76,13 @@ of the P extension. === Additional Standard Unprivileged Extension Names -Standard unprivileged extensions can also be named using a single "Z" followed by -an alphabetical name and an optional version number. For example, +Standard unprivileged extensions can also be named using a single "Z" followed by an +alphanumeric name, the name must end with an alphabetical, an optional +version number, and the second letter from the bottom cannot be a numeric if the +last letter is ``p''. For example, "Zifencei" names the instruction-fetch fence extension described in <>; "Zifencei2" and -"Zifencei2p0" name version 2.0 of same. +"Zifencei2p0" name version 2.0 are the same. The first letter following the "Z" conventionally indicates the most closely related alphabetical extension category, IMAFDQLCBKJTPVH. For the @@ -99,10 +101,14 @@ separated from other multi-letter extensions by an underscore, e.g., Standard extensions that extend the supervisor-level virtual-memory architecture are prefixed with the letters "Sv", followed by an alphabetical name and an optional version number, or by a numeric name with no version number. -Other standard extensions that extend -the supervisor-level architecture are prefixed with the letters "Ss", -followed by an alphabetical name and an optional version number. Such -extensions are defined in Volume II. +Other standard extensions that extend the supervisor-level architecture are +prefixed with the letters "Ss", followed by an alphabetical name and an +optional version number. Such extensions are defined in Volume II. In +general, they are named by using ``S'' as a prefix, followed by an +alphanumeric name. The name must end with an alphabetical, an optional +version number, and the second letter from the bottom cannot be a numeric +if the last letter is ``p''. Supervisor-level extensions must be separated +from other multi-letter extensions by an underscore. Standard supervisor-level extensions should be listed after standard unprivileged extensions. If multiple supervisor-level extensions are @@ -132,10 +138,11 @@ listed, they should be ordered alphabetically. === Non-Standard Extension Names -Non-standard extensions are named using a single "X" followed by an -alphabetical name and an optional version number. For example, -"Xhwacha" names the Hwacha vector-fetch ISA extension; "Xhwacha2" -and "Xhwacha2p0" name version 2.0 of same. +Non-standard extensions are named by using a single "X" followed by the alphanumeric +name. The name must end with an alphabetic character and an optional version number. The +second letter from the bottom cannot be a numeric if the last letter is +``p''. For example, "Xhwacha" names the Hwacha vector-fetch ISA +extension; "Xhwacha2" and "Xhwacha2p0" name version 2.0 of same. Non-standard extensions must be listed after all standard extensions, and, like other multi-letter extensions, must be separated from other multi-letter From 336fb748d232ef92b772a0c008976bc23d4c72fb Mon Sep 17 00:00:00 2001 From: Kersten Richter Date: Wed, 2 Oct 2024 11:29:28 -0500 Subject: [PATCH 02/13] Update naming.adoc Signed-off-by: Kersten Richter --- src/naming.adoc | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/naming.adoc b/src/naming.adoc index 63e55ae68..99c90cf9e 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -76,13 +76,11 @@ of the P extension. === Additional Standard Unprivileged Extension Names -Standard unprivileged extensions can also be named using a single "Z" followed by an -alphanumeric name, the name must end with an alphabetical, an optional -version number, and the second letter from the bottom cannot be a numeric if the -last letter is ``p''. For example, -"Zifencei" names the instruction-fetch fence extension described in -<>; "Zifencei2" and -"Zifencei2p0" name version 2.0 are the same. +Standard unprivileged extensions can also be named by using a single "Z" followed by an +alphanumeric name. The name must end with an alphabetical character or an +optional version number. The second letter from the bottom cannot be a numeric if the +last letter is ``p''. For example, "Zifencei" names the instruction-fetch fence extension +described in <>; "Zifencei2" and "Zifencei2p0" name version 2.0 are the same. The first letter following the "Z" conventionally indicates the most closely related alphabetical extension category, IMAFDQLCBKJTPVH. For the @@ -101,14 +99,14 @@ separated from other multi-letter extensions by an underscore, e.g., Standard extensions that extend the supervisor-level virtual-memory architecture are prefixed with the letters "Sv", followed by an alphabetical name and an optional version number, or by a numeric name with no version number. + Other standard extensions that extend the supervisor-level architecture are -prefixed with the letters "Ss", followed by an alphabetical name and an -optional version number. Such extensions are defined in Volume II. In -general, they are named by using ``S'' as a prefix, followed by an -alphanumeric name. The name must end with an alphabetical, an optional -version number, and the second letter from the bottom cannot be a numeric +named by using ``S'' as a prefix, followed by an alphanumeric name. The name +must end with an alphabetical character or an optional +version number. The second letter from the bottom cannot be a numeric character if the last letter is ``p''. Supervisor-level extensions must be separated -from other multi-letter extensions by an underscore. +from other multi-letter extensions by an underscore. These extensions are further +defined in Volume II. Standard supervisor-level extensions should be listed after standard unprivileged extensions. If multiple supervisor-level extensions are @@ -139,7 +137,7 @@ listed, they should be ordered alphabetically. === Non-Standard Extension Names Non-standard extensions are named by using a single "X" followed by the alphanumeric -name. The name must end with an alphabetic character and an optional version number. The +name. The name must end with an alphabetic character or an optional version number. The second letter from the bottom cannot be a numeric if the last letter is ``p''. For example, "Xhwacha" names the Hwacha vector-fetch ISA extension; "Xhwacha2" and "Xhwacha2p0" name version 2.0 of same. From e02012edbbf2424b745c99f1c6066fc5ae7bd111 Mon Sep 17 00:00:00 2001 From: Kersten Richter Date: Wed, 2 Oct 2024 18:43:32 -0500 Subject: [PATCH 03/13] Update src/naming.adoc Signed-off-by: Kersten Richter --- src/naming.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/naming.adoc b/src/naming.adoc index 99c90cf9e..d963acef3 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -138,7 +138,7 @@ listed, they should be ordered alphabetically. Non-standard extensions are named by using a single "X" followed by the alphanumeric name. The name must end with an alphabetic character or an optional version number. The -second letter from the bottom cannot be a numeric if the last letter is +second letter from the end cannot be numeric if the last letter is ``p''. For example, "Xhwacha" names the Hwacha vector-fetch ISA extension; "Xhwacha2" and "Xhwacha2p0" name version 2.0 of same. From abef32733ec403943534997eecf24f44912595f6 Mon Sep 17 00:00:00 2001 From: Kersten Richter Date: Wed, 2 Oct 2024 18:43:44 -0500 Subject: [PATCH 04/13] Update src/naming.adoc Signed-off-by: Kersten Richter --- src/naming.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/naming.adoc b/src/naming.adoc index d963acef3..5a4e9f168 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -103,7 +103,7 @@ name and an optional version number, or by a numeric name with no version number Other standard extensions that extend the supervisor-level architecture are named by using ``S'' as a prefix, followed by an alphanumeric name. The name must end with an alphabetical character or an optional -version number. The second letter from the bottom cannot be a numeric character +version number. The second letter from the end cannot be numeric character if the last letter is ``p''. Supervisor-level extensions must be separated from other multi-letter extensions by an underscore. These extensions are further defined in Volume II. From f93152b7b385b141d2c1296ff84f6e4a2628920c Mon Sep 17 00:00:00 2001 From: Kersten Richter Date: Wed, 2 Oct 2024 18:43:52 -0500 Subject: [PATCH 05/13] Update src/naming.adoc Signed-off-by: Kersten Richter --- src/naming.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/naming.adoc b/src/naming.adoc index 5a4e9f168..72f918894 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -78,7 +78,7 @@ of the P extension. Standard unprivileged extensions can also be named by using a single "Z" followed by an alphanumeric name. The name must end with an alphabetical character or an -optional version number. The second letter from the bottom cannot be a numeric if the +optional version number. The second letter from the end cannot be numeric if the last letter is ``p''. For example, "Zifencei" names the instruction-fetch fence extension described in <>; "Zifencei2" and "Zifencei2p0" name version 2.0 are the same. From a958bceb4e138df7eea92a6c9c46c0c85d782681 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 2 Oct 2024 18:52:38 -0700 Subject: [PATCH 06/13] Restore 'Ss' prefix --- src/naming.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/naming.adoc b/src/naming.adoc index 72f918894..990ee8184 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -101,7 +101,7 @@ architecture are prefixed with the letters "Sv", followed by an alphabetical name and an optional version number, or by a numeric name with no version number. Other standard extensions that extend the supervisor-level architecture are -named by using ``S'' as a prefix, followed by an alphanumeric name. The name +named by using "Ss" as a prefix, followed by an alphanumeric name. The name must end with an alphabetical character or an optional version number. The second letter from the end cannot be numeric character if the last letter is ``p''. Supervisor-level extensions must be separated From 199bd83c5a6d1cc588ad14ecd80a58b0872be5df Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 2 Oct 2024 19:08:05 -0700 Subject: [PATCH 07/13] Add Hypervisor-level to the table in the Subset Naming section. --- src/naming.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/naming.adoc b/src/naming.adoc index 990ee8184..d8f6af2c1 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -203,6 +203,10 @@ e.g., RV32IMACV is legal, whereas RV32IMAVC is not. |Supervisor-level extension "def" |Ssdef | +3+|*Standard Hypervisor-Level Extensions* + +|Hypervisor-level extension "ghi" |Shghi | + 3+|*Standard Machine-Level Extensions* |Machine-level extension "jkl" |Smjkl | From 6b959c19df9f9b3a6296789845d5ae86e276f2bd Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 2 Oct 2024 19:20:12 -0700 Subject: [PATCH 08/13] Use "p" instead of ``p''. Andrew tells me that's a LaTeX-ism. --- src/naming.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/naming.adoc b/src/naming.adoc index d8f6af2c1..99cb1a0f7 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -79,7 +79,7 @@ of the P extension. Standard unprivileged extensions can also be named by using a single "Z" followed by an alphanumeric name. The name must end with an alphabetical character or an optional version number. The second letter from the end cannot be numeric if the -last letter is ``p''. For example, "Zifencei" names the instruction-fetch fence extension +last letter is "p". For example, "Zifencei" names the instruction-fetch fence extension described in <>; "Zifencei2" and "Zifencei2p0" name version 2.0 are the same. The first letter following the "Z" conventionally indicates the most @@ -104,7 +104,7 @@ Other standard extensions that extend the supervisor-level architecture are named by using "Ss" as a prefix, followed by an alphanumeric name. The name must end with an alphabetical character or an optional version number. The second letter from the end cannot be numeric character -if the last letter is ``p''. Supervisor-level extensions must be separated +if the last letter is "p". Supervisor-level extensions must be separated from other multi-letter extensions by an underscore. These extensions are further defined in Volume II. @@ -139,7 +139,7 @@ listed, they should be ordered alphabetically. Non-standard extensions are named by using a single "X" followed by the alphanumeric name. The name must end with an alphabetic character or an optional version number. The second letter from the end cannot be numeric if the last letter is -``p''. For example, "Xhwacha" names the Hwacha vector-fetch ISA +"p". For example, "Xhwacha" names the Hwacha vector-fetch ISA extension; "Xhwacha2" and "Xhwacha2p0" name version 2.0 of same. Non-standard extensions must be listed after all standard extensions, and, From 564cb0d78f89b2d9dfca2252785667aeb953f5fe Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 2 Oct 2024 19:22:56 -0700 Subject: [PATCH 09/13] Move the Version Numbering and Underscore section down. Add 'Name' to the end of the multi-letter section names. --- src/naming.adoc | 64 ++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/naming.adoc b/src/naming.adoc index 99cb1a0f7..cbd080389 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -45,35 +45,6 @@ Some ISA extensions depend on the presence of other extensions, e.g., may be implicit in the ISA name: for example, RV32IF is equivalent to RV32IFZicsr, and RV32ID is equivalent to RV32IFD and RV32IFDZicsr. -=== Version Numbers - -Recognizing that instruction sets may expand or alter over time, we -encode extension version numbers following the extension name. Version -numbers are divided into major and minor version numbers, separated by a -"p". If the minor version is "0", then "p0" can be omitted from -the version string. Changes in major version numbers imply a loss of -backwards compatibility, whereas changes in only the minor version -number must be backwards-compatible. For example, the original 64-bit -standard ISA defined in release 1.0 of this manual can be written in -full as "RV64I1p0M1p0A1p0F1p0D1p0", more concisely as -"RV64I1M1A1F1D1". - -We introduced the version numbering scheme with the second release. -Hence, we define the default version of a standard extension to be the -version present at that time, e.g., "RV32I" is equivalent to -"RV32I2". - -=== Underscores - -Underscores "_" may be used to separate ISA extensions to improve -readability and to provide disambiguation, e.g., "RV32I2_M2_A2". - -Because the "P" extension for Packed SIMD can be confused for the -decimal point in a version number, it must be preceded by an underscore -if it follows a number. For example, "rv32i2p2" means version 2.2 of -RV32I, whereas "rv32i2_p2" means version 2.0 of RV32I with version 2.0 -of the P extension. - === Additional Standard Unprivileged Extension Names Standard unprivileged extensions can also be named by using a single "Z" followed by an @@ -94,7 +65,7 @@ All multi-letter extensions, including those with the "Z" prefix, must be separated from other multi-letter extensions by an underscore, e.g., "RV32IMACZicsr_Zifencei". -=== Supervisor-level Instruction-Set Extensions +=== Supervisor-level Instruction-Set Extension Names Standard extensions that extend the supervisor-level virtual-memory architecture are prefixed with the letters "Sv", followed by an alphabetical @@ -112,7 +83,7 @@ Standard supervisor-level extensions should be listed after standard unprivileged extensions. If multiple supervisor-level extensions are listed, they should be ordered alphabetically. -=== Hypervisor-level Instruction-Set Extensions +=== Hypervisor-level Instruction-Set Extension Names Standard extensions that extend the hypervisor-level architecture are prefixed with the letters "Sh". @@ -125,7 +96,7 @@ described in the previous section. The "Sh" prefix is used by the few hypervisor-level extensions that have no supervisor-visible effects. -=== Machine-level Instruction-Set Extensions +=== Machine-level Instruction-Set Extension Names Standard machine-level instruction-set extensions are prefixed with the letters "Sm". @@ -151,6 +122,35 @@ Bargle may be named "RV64IZifencei_Xargle_Xbargle". If multiple non-standard extensions are listed, they should be ordered alphabetically. +=== Version Numbers + +Recognizing that instruction sets may expand or alter over time, we +encode extension version numbers following the extension name. Version +numbers are divided into major and minor version numbers, separated by a +"p". If the minor version is "0", then "p0" can be omitted from +the version string. Changes in major version numbers imply a loss of +backwards compatibility, whereas changes in only the minor version +number must be backwards-compatible. For example, the original 64-bit +standard ISA defined in release 1.0 of this manual can be written in +full as "RV64I1p0M1p0A1p0F1p0D1p0", more concisely as +"RV64I1M1A1F1D1". + +We introduced the version numbering scheme with the second release. +Hence, we define the default version of a standard extension to be the +version present at that time, e.g., "RV32I" is equivalent to +"RV32I2". + +=== Underscores + +Underscores "_" may be used to separate ISA extensions to improve +readability and to provide disambiguation, e.g., "RV32I2_M2_A2". + +Because the "P" extension for Packed SIMD can be confused for the +decimal point in a version number, it must be preceded by an underscore +if it follows a number. For example, "rv32i2p2" means version 2.2 of +RV32I, whereas "rv32i2_p2" means version 2.0 of RV32I with version 2.0 +of the P extension. + === Subset Naming Convention <> summarizes the standardized extension From e96629dd6522715d217c2bb464b95bf622317e38 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 2 Oct 2024 19:53:38 -0700 Subject: [PATCH 10/13] Move underscore section back up. Remove mentions of version from naming sections Mention underscore as a separor of multi-letter extensions more consistently. Move the special case requiring an underscore for "P" extension to the Version Numbering section. --- src/naming.adoc | 67 ++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/src/naming.adoc b/src/naming.adoc index cbd080389..5abadc210 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -45,13 +45,18 @@ Some ISA extensions depend on the presence of other extensions, e.g., may be implicit in the ISA name: for example, RV32IF is equivalent to RV32IFZicsr, and RV32ID is equivalent to RV32IFD and RV32IFDZicsr. +=== Underscores + +Underscores "_" may be used to separate ISA extensions to improve +readability and to provide disambiguation, e.g., "RV32I2_M2_A2". + === Additional Standard Unprivileged Extension Names Standard unprivileged extensions can also be named by using a single "Z" followed by an -alphanumeric name. The name must end with an alphabetical character or an -optional version number. The second letter from the end cannot be numeric if the +alphanumeric name. The name must end with an alphabetical character. +The second letter from the end cannot be numeric if the last letter is "p". For example, "Zifencei" names the instruction-fetch fence extension -described in <>; "Zifencei2" and "Zifencei2p0" name version 2.0 are the same. +described in <>. The first letter following the "Z" conventionally indicates the most closely related alphabetical extension category, IMAFDQLCBKJTPVH. For the @@ -68,20 +73,20 @@ separated from other multi-letter extensions by an underscore, e.g., === Supervisor-level Instruction-Set Extension Names Standard extensions that extend the supervisor-level virtual-memory -architecture are prefixed with the letters "Sv", followed by an alphabetical -name and an optional version number, or by a numeric name with no version number. +architecture are prefixed with the letters "Sv", followed by an alphanumeric +name. Other standard extensions that extend the supervisor-level architecture are +prefixed with thel letters "Ss", followed by an alphanumeric name. The name +must end with an alphabetical character. The second letter from the end cannot +be numeric if the last letter is "p". These extensions are further defined in +Volume II. -Other standard extensions that extend the supervisor-level architecture are -named by using "Ss" as a prefix, followed by an alphanumeric name. The name -must end with an alphabetical character or an optional -version number. The second letter from the end cannot be numeric character -if the last letter is "p". Supervisor-level extensions must be separated -from other multi-letter extensions by an underscore. These extensions are further -defined in Volume II. +The extensions "sv32", "sv39", "sv48", and "sv59" were defined before the rule +against extension names ending in numbers was established. Standard supervisor-level extensions should be listed after standard -unprivileged extensions. If multiple supervisor-level extensions are -listed, they should be ordered alphabetically. +unprivileged extensions, and like other multi-letter extensions, must be +separated from other multi-letter extensions by an underscore. If multiple +supervisor-level extensions are listed, they should be ordered alphabetically. === Hypervisor-level Instruction-Set Extension Names @@ -102,16 +107,17 @@ Standard machine-level instruction-set extensions are prefixed with the letters "Sm". Standard machine-level extensions should be listed after standard -lesser-privileged extensions. If multiple machine-level extensions are -listed, they should be ordered alphabetically. +lesser-privileged extensions, and like other multi-letter extensions, must be +separated from other multi-letter extensions by an underscore. If multiple +machine-level extensions are listed, they should be ordered alphabetically. === Non-Standard Extension Names Non-standard extensions are named by using a single "X" followed by the alphanumeric -name. The name must end with an alphabetic character or an optional version number. The +name. The name must end with an alphabetic character. The second letter from the end cannot be numeric if the last letter is "p". For example, "Xhwacha" names the Hwacha vector-fetch ISA -extension; "Xhwacha2" and "Xhwacha2p0" name version 2.0 of same. +extension; Non-standard extensions must be listed after all standard extensions, and, like other multi-letter extensions, must be separated from other multi-letter @@ -120,7 +126,8 @@ For example, an ISA with non-standard extensions Argle and Bargle may be named "RV64IZifencei_Xargle_Xbargle". If multiple non-standard extensions are listed, they should be ordered -alphabetically. +alphabetically. Like other multi-letter extensions, they should should be +separated from other multi-leter extensions by an underscore. === Version Numbers @@ -128,7 +135,16 @@ Recognizing that instruction sets may expand or alter over time, we encode extension version numbers following the extension name. Version numbers are divided into major and minor version numbers, separated by a "p". If the minor version is "0", then "p0" can be omitted from -the version string. Changes in major version numbers imply a loss of +the version string. To avoid ambiguity, no extension name may end with a number +or a "p" preceded by a number. + +Because the "P" extension for Packed SIMD can be confused for the +decimal point in a version number, it must be preceded by an underscore +if it follows another extension with a version number. For example, "rv32i2p2" +means version 2.2 of RV32I, whereas "rv32i2_p2" means version 2.0 of RV32I with +version 2.0 of the P extension. + +Changes in major version numbers imply a loss of backwards compatibility, whereas changes in only the minor version number must be backwards-compatible. For example, the original 64-bit standard ISA defined in release 1.0 of this manual can be written in @@ -140,17 +156,6 @@ Hence, we define the default version of a standard extension to be the version present at that time, e.g., "RV32I" is equivalent to "RV32I2". -=== Underscores - -Underscores "_" may be used to separate ISA extensions to improve -readability and to provide disambiguation, e.g., "RV32I2_M2_A2". - -Because the "P" extension for Packed SIMD can be confused for the -decimal point in a version number, it must be preceded by an underscore -if it follows a number. For example, "rv32i2p2" means version 2.2 of -RV32I, whereas "rv32i2_p2" means version 2.0 of RV32I with version 2.0 -of the P extension. - === Subset Naming Convention <> summarizes the standardized extension From deab452741e7e18a92def7340b7b83abcbad7dda Mon Sep 17 00:00:00 2001 From: Kersten Richter Date: Thu, 3 Oct 2024 15:59:25 -0500 Subject: [PATCH 11/13] Update src/naming.adoc Signed-off-by: Kersten Richter --- src/naming.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/naming.adoc b/src/naming.adoc index 5abadc210..d0b01ef13 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -117,7 +117,7 @@ Non-standard extensions are named by using a single "X" followed by the alphanum name. The name must end with an alphabetic character. The second letter from the end cannot be numeric if the last letter is "p". For example, "Xhwacha" names the Hwacha vector-fetch ISA -extension; +extension. Non-standard extensions must be listed after all standard extensions, and, like other multi-letter extensions, must be separated from other multi-letter From dc0e04c63dbc1b3ac700f1644d27b81775832910 Mon Sep 17 00:00:00 2001 From: Kersten Richter Date: Thu, 3 Oct 2024 15:59:32 -0500 Subject: [PATCH 12/13] Update src/naming.adoc Signed-off-by: Kersten Richter --- src/naming.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/naming.adoc b/src/naming.adoc index d0b01ef13..dedb54cdd 100644 --- a/src/naming.adoc +++ b/src/naming.adoc @@ -126,7 +126,7 @@ For example, an ISA with non-standard extensions Argle and Bargle may be named "RV64IZifencei_Xargle_Xbargle". If multiple non-standard extensions are listed, they should be ordered -alphabetically. Like other multi-letter extensions, they should should be +alphabetically. Like other multi-letter extensions, they should be separated from other multi-leter extensions by an underscore. === Version Numbers From e8aaea1be71497d1c495e0f3c37b62e152ac718d Mon Sep 17 00:00:00 2001 From: Kersten Richter Date: Thu, 3 Oct 2024 16:10:42 -0500 Subject: [PATCH 13/13] Update rnmi.adoc https://github.com/riscv/riscv-isa-manual/issues/1626 Signed-off-by: Kersten Richter --- src/rnmi.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rnmi.adoc b/src/rnmi.adoc index 215e7da29..0b999941b 100644 --- a/src/rnmi.adoc +++ b/src/rnmi.adoc @@ -32,7 +32,7 @@ in `mtvec` as the RNMI exception trap handler. === RNMI CSRs -This proposal adds additional M-mode CSRs to enable a resumable +This extension adds additional M-mode CSRs to enable a resumable non-maskable interrupt (RNMI). .Resumable NMI scratch register `mnscratch`