Skip to content

Commit 6c95820

Browse files
Merge pull request riscv#2688 from riscv/2687-change-norm-rule-mconfigptr_zero-to-mconfigptr_val
Renamed norm rule MCONFIGPTR_ZERO to MCONFIGPTR_VAL
2 parents 92389c9 + 19ac78a commit 6c95820

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

normative_rule_defs/machine.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,8 +904,8 @@ normative_rule_definitions:
904904
tag: "norm:mconfigptr_align"
905905
- name: mconfigptr_mandatory
906906
tag: "norm:mconfigptr_mandatory"
907-
- name: MCONFIGPTR_ZERO
908-
tag: "norm:mconfigptr_zero"
907+
- name: MCONFIGPTR_VAL
908+
tag: "norm:mconfigptr_val"
909909
impl-def-behavior: true
910910

911911
# CSR menvcfg

ref/riscv-privileged-norm-tags.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@
338338
"norm:mconfigptr_enc_img": "",
339339
"norm:mconfigptr_align": "The pointer alignment in bits must be no smaller than MXLEN: i.e., if MXLEN is\n8{times}n, then mconfigptr[log~2n~-1:0] must be zero.",
340340
"norm:mconfigptr_mandatory": "The mconfigptr register must be implemented",
341-
"norm:mconfigptr_zero": "it may be zero to indicate the\nconfiguration data structure does not exist or that an alternative\nmechanism must be used to locate it.",
341+
"norm:mconfigptr_val": "it may be zero to indicate the\nconfiguration data structure does not exist or that an alternative\nmechanism must be used to locate it.",
342342
"norm:menvcfg_sz_acc": "The menvcfg CSR is a 64-bit read/write register, formatted\nas shown in <<norm:menvcfg_enc_img>>",
343343
"norm:menvcfg_op": "controls certain characteristics of the execution environment\nfor modes less privileged than M.",
344344
"norm:menvcfg_enc_img": "",
@@ -2027,7 +2027,7 @@
20272027
"norm:mconfigptr_enc_img",
20282028
"norm:mconfigptr_align",
20292029
"norm:mconfigptr_mandatory",
2030-
"norm:mconfigptr_zero"
2030+
"norm:mconfigptr_val"
20312031
]
20322032
},
20332033
{

src/machine.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2148,7 +2148,7 @@ include::images/bytefield/mconfigptrreg.edn[]
21482148
8{times}__n__, then `mconfigptr`[log~2n~-1:0] must be zero.#
21492149

21502150
[#norm:mconfigptr_mandatory]#The `mconfigptr` register must be implemented#, but
2151-
[#norm:mconfigptr_zero]#it may be zero to indicate the
2151+
[#norm:mconfigptr_val]#it may be zero to indicate the
21522152
configuration data structure does not exist or that an alternative
21532153
mechanism must be used to locate it.#
21542154

0 commit comments

Comments
 (0)