Skip to content

Commit 6a0c67a

Browse files
authored
Merge branch 'main' into kersten1-patch-1
2 parents dc0e04c + 243eb93 commit 6a0c67a

File tree

8 files changed

+16
-22
lines changed

8 files changed

+16
-22
lines changed

src/j-st-ext.adoc

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/machine.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2785,7 +2785,7 @@ Specific supported values for this PMA are represented by MAG__NN__, e.g.,
27852785
MAG16 indicates the misaligned atomicity granule is at least 16 bytes.
27862786

27872787
The misaligned atomicity granule PMA applies only to AMOs, loads and stores
2788-
defined in the base ISAs, and loads and stores of no more than MXLEN bits
2788+
defined in the base ISAs, and loads and stores of no more than XLEN bits
27892789
defined in the F, D, and Q extensions.
27902790
For an instruction in that set, if all accessed bytes lie within the same
27912791
misaligned atomicity granule, the instruction will not raise an exception for

src/mm-eplan.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ visible memory). Any other hart will therefore observe the load as
239239
performing before the store.
240240

241241
Consider the <<litms_sb_forward>>. When running this program on an implementation with
242-
store buffers, it is possible to arrive at the final outcome a0=1, `a1=0, a2=1, a3=0` as follows:
242+
store buffers, it is possible to arrive at the final outcome `a0=1, a1=0, a2=1, a3=0` as follows:
243243

244244
[[litms_sb_forward]]
245245
.A store buffer forwarding litmus test (outcome permitted)
@@ -295,7 +295,7 @@ Call this "Rule X". Then we get the following:
295295
preceded (d), then (d) would be required to return the value 1. (This is
296296
a perfectly legal execution; it's just not the one in question)
297297
* (e) precedes (f): by rule X
298-
* (f) precedes (h): by rule <<overlapping-ordering, 4]>>
298+
* (f) precedes (h): by rule <<overlapping-ordering, 4>>
299299
* (h) precedes (a): by the load value axiom, as above.
300300

301301
The global memory order must be a total order and cannot be cyclic,

src/priv-preface.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[colophon]
22
= Preface
33

4-
[.big]*_Preface to Version 20240829_*
4+
[.big]*_Preface to Version 20241002_*
55

66
This document describes the RISC-V privileged architecture. This
7-
release, version 20240829, contains the following versions of the RISC-V ISA
7+
release, version 20241002, contains the following versions of the RISC-V ISA
88
modules:
99

1010
[%autowidth,float="center",align="center",cols="^,<,^",options="header",]
@@ -49,7 +49,7 @@ _1.13_ +
4949
*1.0* +
5050
*1.0* +
5151
*1.0* +
52-
_0.1_ +
52+
_1.0_ +
5353
*1.0*
5454

5555
|_Frozen_ +
@@ -70,7 +70,7 @@ _Frozen_ +
7070
*Ratified* +
7171
*Ratified* +
7272
*Ratified* +
73-
_Draft_ +
73+
_Frozen_ +
7474
*Ratified*
7575
|===
7676

src/riscv-privileged.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
= The RISC-V Instruction Set Manual: Volume II: Privileged Architecture
33
include::../docs-resources/global-config.adoc[]
44
:description: Volume II - Privileged Architecture
5-
:revnumber: 20240829
5+
:revnumber: 20241002-Ratification-Vote
66
//:revremark: Pre-release version
77
//development: assume everything can change
88
//stable: assume everything could change

src/riscv-unprivileged.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ include::zfinx.adoc[]
185185
include::c-st-ext.adoc[]
186186
include::zc.adoc[]
187187
include::b-st-ext.adoc[]
188-
include::j-st-ext.adoc[]
189188
include::p-st-ext.adoc[]
190189
include::v-st-ext.adoc[]
191190
include::scalar-crypto.adoc[]

src/supervisor.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,8 +1442,9 @@ Two schemes to manage the A and D bits are defined:
14421442
architecturally. However, updates to the D bit, resulting from an
14431443
explicit store, must be exact (i.e., non-speculative), and observed in
14441444
program order by the local hart. When two-stage address translation is
1445-
active, updates of the D bit in G-stage PTEs may be performed as a
1446-
result of speculative updates of the A bit in VS-stage PTEs. +
1445+
active, updates to the D bit in G-stage PTEs may be performed by an
1446+
implicit access to a VS-stage PTE, if the G-stage PTE provides write
1447+
permission, before any speculative access to the VS-stage PTE. +
14471448
+
14481449
The PTE update must appear in the global memory order before the
14491450
memory access that caused the PTE update and before any subsequent

src/zpm.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ It is worth noting that pointer masking is not applied to `SFENCE.\*`, `HFENCE.*
148148

149149
MPRV and SPVP affect pointer masking as well, causing the pointer masking settings of the effective privilege mode to be applied. When MXR is in effect at the effective privilege mode where explicit memory access is performed, pointer masking does not apply.
150150

151+
[NOTE]
152+
====
153+
Note that this includes cases where page-based virtual memory is not in effect; i.e., although MXR has no effect on permissions checks when page-based virtual memory is not in effect, it is still used in determining whether or not pointer masking should be applied.
154+
====
155+
151156
[NOTE]
152157
====
153158
Cache Management Operations (CMOs) must respect and take into account pointer masking. Otherwise, a few serious security problems can appear, including:

0 commit comments

Comments
 (0)