Skip to content

Commit 8e80a51

Browse files
authored
Merge pull request riscv#1806 from trdthg/fix-typos
Fix typos
2 parents 4785b33 + e1b5256 commit 8e80a51

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

src/b-st-ext.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3671,7 +3671,7 @@ Included in::
36713671

36723672
Synopsis::
36733673
Interleave upper and lower halves of the source register into odd and even
3674-
bits of the destination register, respectivley.
3674+
bits of the destination register, respectively.
36753675

36763676
Mnemonic::
36773677
zip _rd_, _rs_

src/example/sgemm.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ c_col_loop: # Loop across one row of C blocks
7878
mv akp, ap # reset pointer into A to beginning
7979
mv bkp, bnp # step to next column in B matrix
8080

81-
# Initalize current C submatrix block from memory.
81+
# Initialize current C submatrix block from memory.
8282
vle32.v v0, (cnp); add ccp, cnp, cstride;
8383
vle32.v v1, (ccp); add ccp, ccp, cstride;
8484
vle32.v v2, (ccp); add ccp, ccp, cstride;

src/machine.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ implementation may not support one or more of the Zba, Zbb, or Zbs extensions.
199199
When the "M" bit is 1, the implementation supports all multiply and
200200
division instructions defined by the M extension. When the "M" bit
201201
is 0, it indicates that the implementation may not support those
202-
instructions. However if the Zmmul extension is suppported then
202+
instructions. However if the Zmmul extension is supported then
203203
the multiply instructions it specifies are supported irrespective
204204
of the value of the "M" bit.
205205

src/q-st-ext.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ FCVT.D.Q or FCVT.Q.D converts a quad-precision floating-point number to
7777
a double-precision floating-point number, or vice-versa, respectively.
7878

7979
include::images/wavedrom/quad-cnvt-interchange.edn[]
80-
[[quad-convrt-interchange]]
80+
[[quad-convert-interchange]]
8181
//.Quad-precision convert and move interchangeably
8282

8383
Floating-point to floating-point sign-injection instructions, FSGNJ.Q,

src/scalar-crypto.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3464,7 +3464,7 @@ Included in::
34643464

34653465
Synopsis::
34663466
Interleave upper and lower halves of the source register into odd and even
3467-
bits of the destination register, respectivley.
3467+
bits of the destination register, respectively.
34683468

34693469
Mnemonic::
34703470
zip _rd_, _rs_
@@ -5323,7 +5323,7 @@ is recommended reading in order to best understand the supporting code.
53235323

53245324
[source,sail]
53255325
----
5326-
/* Auxiliary function for performing GF multiplicaiton */
5326+
/* Auxiliary function for performing GF multiplication */
53275327
val xt2 : bits(8) -> bits(8)
53285328
function xt2(x) = {
53295329
(x << 1) ^ (if bit_to_bool(x[7]) then 0x1b else 0x00)

src/smctr.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ See <<State Enable Access Control>> for cases where CTR accesses from S-mode and
292292

293293
The `ctrsource` register contains the source program counter, which is the `pc` of the recorded control transfer instruction, or the epc of the recorded trap. The valid (V) bit is set by the hardware when a transfer is recorded in the selected CTR buffer entry, and implies that data in `ctrsource`, `ctrtarget`, and `ctrdata` is valid for this entry.
294294

295-
`ctrsource` is an MXLEN-bit WARL register that must be able to hold all valid virtual or physical addresses that can serve as a `pc`. It need not be able to hold any invalid addresses; implementations may convert an invalid address into a valid address that the register is capable of holding. When XLEN < MXLEN, both explicit writes (by software) and implict writes (for recorded transfers) will be zero-extended.
295+
`ctrsource` is an MXLEN-bit WARL register that must be able to hold all valid virtual or physical addresses that can serve as a `pc`. It need not be able to hold any invalid addresses; implementations may convert an invalid address into a valid address that the register is capable of holding. When XLEN < MXLEN, both explicit writes (by software) and implicit writes (for recorded transfers) will be zero-extended.
296296

297297
.Control Transfer Record Source Register Format for MXLEN=64
298298
[%unbreakable]
@@ -318,7 +318,7 @@ when the recorded transfer is an instruction whose target or
318318
taken/not-taken direction was mispredicted by the branch predictor. MISP
319319
is read-only 0 when not implemented.
320320

321-
`ctrtarget` is an MXLEN-bit WARL register that must be able to hold all valid virtual or physical addresses that can serve as a `pc`. It need not be able to hold any invalid addresses; implementations may convert an invalid address into a valid address that the register is capable of holding. When XLEN < MXLEN, both explicit writes (by software) and implict writes (by recorded transfers) will be zero-extended.
321+
`ctrtarget` is an MXLEN-bit WARL register that must be able to hold all valid virtual or physical addresses that can serve as a `pc`. It need not be able to hold any invalid addresses; implementations may convert an invalid address into a valid address that the register is capable of holding. When XLEN < MXLEN, both explicit writes (by software) and implicit writes (by recorded transfers) will be zero-extended.
322322

323323
.Control Transfer Record Target Register Format for MXLEN=64
324324
[%unbreakable]

src/smepmp.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Without being able to protect less-privileged modes from Machine mode, it is not
4242
Note that this feature is intended to be used as a debug mechanism, or as a temporary workaround during the boot process for simplifying software, and optimizing the allocation of memory and PMP rules. Using this functionality under normal operation, after the boot process is completed, should be avoided since it weakens the protection of _M-mode-only_ rules. Vendors who don’t need this functionality may hardwire this field to 0.
4343
====
4444

45-
. On ``mseccfg`` we introduce a field in bit 1 called *Machine-Mode alloWlist Policy (mseccfg.MMWP)*. This is a sticky bit, meaning that once set it cannot be unset until a *PMP reset*. When set it changes the default PMP policy for M-mode when accessing memory regions that don’t have a matching PMP rule, to *denied* instead of *ignored*.
45+
. On ``mseccfg`` we introduce a field in bit 1 called *Machine-Mode Allowlist Policy (mseccfg.MMWP)*. This is a sticky bit, meaning that once set it cannot be unset until a *PMP reset*. When set it changes the default PMP policy for M-mode when accessing memory regions that don’t have a matching PMP rule, to *denied* instead of *ignored*.
4646

4747
. On ``mseccfg`` we introduce a field in bit 0 called *Machine Mode Lockdown (mseccfg.MML)*. This is a sticky bit, meaning that once set it cannot be unset until a *PMP reset*. When ``mseccfg.MML`` is set the system's behavior changes in the following way:
4848

@@ -113,7 +113,7 @@ Also when ``mseccfg.MML`` is set, according to 4b it’s not possible to add a _
113113
+
114114
[WARNING]
115115
====
116-
*Be aware that RLB introduces a security vulnerability if left set after the boot process is over and in general it should be used with caution, even when used temporarily.* Having editable PMP rules in M-mode gives a false sense of security since it only takes a few malicious instructions to lift any PMP restrictions this way. It doesn’t make sense to have a security control in place and leave it unprotected. Rule Locking Bypass is only meant as a way to optimize the allocation of PMP rules, catch errors durring debugging, and allow the bootrom/firmware to register executable _Shared-Region_ rules. If developers / vendors have no use for such functionality, they should never set ``mseccfg.RLB`` and if possible hard-wire it to 0. In any case *RLB should be disabled and locked as soon as possible*.
116+
*Be aware that RLB introduces a security vulnerability if left set after the boot process is over and in general it should be used with caution, even when used temporarily.* Having editable PMP rules in M-mode gives a false sense of security since it only takes a few malicious instructions to lift any PMP restrictions this way. It doesn’t make sense to have a security control in place and leave it unprotected. Rule Locking Bypass is only meant as a way to optimize the allocation of PMP rules, catch errors during debugging, and allow the bootrom/firmware to register executable _Shared-Region_ rules. If developers / vendors have no use for such functionality, they should never set ``mseccfg.RLB`` and if possible hard-wire it to 0. In any case *RLB should be disabled and locked as soon as possible*.
117117
====
118118
+
119119
[NOTE]

src/vector-crypto.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ This extension is shorthand for the following set of other extensions:
922922
[NOTE]
923923
====
924924
This extension combines the NIST Algorithm Suite with the
925-
GCM/GMAC extension to enable high-performace AES-GCM.
925+
GCM/GMAC extension to enable high-performance AES-GCM.
926926
====
927927

928928
<<<
@@ -997,7 +997,7 @@ This extension is shorthand for the following set of other extensions:
997997
[NOTE]
998998
====
999999
This extension combines the ShangMi Algorithm Suite with the
1000-
GCM/GMAC extension to enable high-performace SM4-GCM.
1000+
GCM/GMAC extension to enable high-performance SM4-GCM.
10011001
====
10021002

10031003
<<<
@@ -4570,7 +4570,7 @@ is recommended reading in order to best understand the supporting code.
45704570

45714571
[source,sail]
45724572
----
4573-
/* Auxiliary function for performing GF multiplicaiton */
4573+
/* Auxiliary function for performing GF multiplication */
45744574
val xt2 : bits(8) -> bits(8)
45754575
function xt2(x) = {
45764576
(x << 1) ^ (if bit_to_bool(x[7]) then 0x1b else 0x00)
@@ -4588,13 +4588,13 @@ function gfmul( x, y) = {
45884588
(if bit_to_bool(y[3]) then xt2(xt2(xt2(x))) else 0x00)
45894589
}
45904590
4591-
/* 8-bit to 32-bit partial AES Mix Colum - forwards */
4591+
/* 8-bit to 32-bit partial AES Mix Column - forwards */
45924592
val aes_mixcolumn_byte_fwd : bits(8) -> bits(32)
45934593
function aes_mixcolumn_byte_fwd(so) = {
45944594
gfmul(so, 0x3) @ so @ so @ gfmul(so, 0x2)
45954595
}
45964596
4597-
/* 8-bit to 32-bit partial AES Mix Colum - inverse*/
4597+
/* 8-bit to 32-bit partial AES Mix Column - inverse*/
45984598
val aes_mixcolumn_byte_inv : bits(8) -> bits(32)
45994599
function aes_mixcolumn_byte_inv(so) = {
46004600
gfmul(so, 0xb) @ gfmul(so, 0xd) @ gfmul(so, 0x9) @ gfmul(so, 0xe)

0 commit comments

Comments
 (0)