Skip to content

Commit 2adf0de

Browse files
authored
Update description of mtval2 in CSR table (riscv#1643)
While it is always a guest physical address for the hypervisor traps, when used by a double trap it holds an mcause value. Change the description to "second trap value" to match the description used in the section heading. While touching this line also sync the description of the other CSRs in this part of the table as well as the *tval registers for the other privilege levels. Signed-off-by: Alex Richardson <[email protected]>
1 parent 62cb1e7 commit 2adf0de

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/priv-csrs.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,10 @@ SRO
273273
`stval` +
274274
`sip` +
275275
`scountovf`
276-
|Scratch register for supervisor trap handlers. +
276+
|Supervisor scratch register. +
277277
Supervisor exception program counter. +
278278
Supervisor trap cause. +
279-
Supervisor bad address or instruction. +
279+
Supervisor trap value. +
280280
Supervisor interrupt pending. +
281281
Supervisor count overflow.
282282

@@ -366,7 +366,7 @@ HRO
366366
`hvip` +
367367
`htinst` +
368368
`hgeip`
369-
|Hypervisor bad guest physical address. +
369+
|Hypervisor trap value. +
370370
Hypervisor interrupt pending. +
371371
Hypervisor virtual interrupt pending. +
372372
Hypervisor trap instruction (transformed). +
@@ -471,7 +471,7 @@ Virtual supervisor trap handler base address. +
471471
Virtual supervisor scratch register. +
472472
Virtual supervisor exception program counter. +
473473
Virtual supervisor trap cause. +
474-
Virtual supervisor bad address or instruction. +
474+
Virtual supervisor trap value. +
475475
Virtual supervisor interrupt pending. +
476476
Virtual supervisor address translation and protection.
477477

@@ -570,13 +570,13 @@ MRW
570570
`mip` +
571571
`mtinst` +
572572
`mtval2`
573-
|Scratch register for machine trap handlers. +
573+
|Machine scratch register. +
574574
Machine exception program counter. +
575575
Machine trap cause. +
576-
Machine bad address or instruction. +
576+
Machine trap value. +
577577
Machine interrupt pending. +
578578
Machine trap instruction (transformed). +
579-
Machine bad guest physical address.
579+
Machine second trap value.
580580

581581
4+^|Machine Configuration
582582

0 commit comments

Comments
 (0)