Skip to content

Commit 7e41b0f

Browse files
authored
Merge pull request #259 from kbroch-rivosinc/dev/kbroch/fix-schema-typos
fix typos in schema files and a few adocs
2 parents 5f96554 + e151647 commit 7e41b0f

File tree

9 files changed

+28
-27
lines changed

9 files changed

+28
-27
lines changed

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This repository contains:
3030

3131
=== Working examples:
3232

33-
* Generate https://riscv-software-src.github.io/riscv-unified-db/manual/html/index.html[configuration-specific documentation] taylored to the set of implemented extensions and unnamed implementation options (_e.g._, `./do gen:html[generic_rv64]`).
33+
* Generate https://riscv-software-src.github.io/riscv-unified-db/manual/html/index.html[configuration-specific documentation] tailored to the set of implemented extensions and unnamed implementation options (_e.g._, `./do gen:html[generic_rv64]`).
3434
** Only implemented extensions/instructions/CSRs are included
3535
** Unreachable/unimplemented parts of the formal specification are pruned away
3636
** A dedicated documentation page for every implemented instruction, including its encoding, pruned execution behavior, and what types of exceptions it may cause.

arch/csr/schema.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
= Schema for CSR defintions
1+
= Schema for CSR definitions
22

3-
A CSR defintion is a mapping (_i.e._, hash, dictionary, ...) containing exactly one key
3+
A CSR definition is a mapping (_i.e._, hash, dictionary, ...) containing exactly one key
44
equal to the CSR name, and pointing to an object specified below. For example:
55

66
.CSR object
@@ -30,7 +30,7 @@ Description::
3030
|===
3131
| *key* | description
3232
| *value type* | String
33-
| *description* | A full Asciidoc description of the CSR, indended to be used as documentation.
33+
| *description* | A full Asciidoc description of the CSR, intended to be used as documentation.
3434
|===
3535

3636
Defining extension::
@@ -118,12 +118,12 @@ Fields::
118118

119119
== Schema for CSR fields
120120

121-
A CSR field defintion is a mapping (_i.e._, hash, dictionary, ...) containing exactly one key
121+
A CSR field definition is a mapping (_i.e._, hash, dictionary, ...) containing exactly one key
122122
equal to the CSR field name, in uppercase, and pointing to an object specified below.
123123

124124
Location::
125125

126-
[IMPORTANT] `location` is required *unless* the location is depenent on the XLEN of a certain mode, in which case both `location_rv32` and `location_rv64` are required
126+
[IMPORTANT] `location` is required *unless* the location is dependent on the XLEN of a certain mode, in which case both `location_rv32` and `location_rv64` are required
127127

128128
|===
129129
| *key* | location
@@ -160,13 +160,13 @@ Reset Value::
160160
|===
161161
| *key* | reset_value
162162
| *value type* | Integer -OR- "UNDEFINED_LEGAL"
163-
| *description* | Value of the field coming out of reset. When the specific value is not defined, "UNDEFINED_LEGAL" is use to indicate that the value isn't known but is gauranteed to a legal value for the field.
163+
| *description* | Value of the field coming out of reset. When the specific value is not defined, "UNDEFINED_LEGAL" is use to indicate that the value isn't known but is guaranteed to a legal value for the field.
164164
|===
165165

166166
|===
167167
| *key* | reset_value()
168168
| *value type* | String of IDL code that returns a reset value
169-
| *description* | Value of the field coming out of reset. When the specific value is not defined, the special value UNDEFINED_LEGAL can be returned to indicate that the value isn't known but is gauranteed to a legal value for the field.
169+
| *description* | Value of the field coming out of reset. When the specific value is not defined, the special value UNDEFINED_LEGAL can be returned to indicate that the value isn't known but is guaranteed to a legal value for the field.
170170
|===
171171

172172
Type::

arch/manual/isa/20240411/contents.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,9 @@ volumes:
174174
authors:
175175
- name: Andrew Waterman
176176
177-
organization: SiFive, Inc.
178-
url: https://www.sifive.com/
177+
organization:
178+
name: SiFive, Inc.
179+
url: https://www.sifive.com/
179180
chapters:
180181
- riscv-isa-manual/src/priv-preface.adoc
181182
- riscv-isa-manual/src/priv-intro.adoc

schemas/config_schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,12 @@
316316
"REPORT_ENCODING_IN_STVAL_ON_ILLEGAL_INSTRUCTION": {
317317
"type": "boolean",
318318
"default": false,
319-
"description": "When true, stval is written with the faulting instruciton encoding when a IllegalInstruction exception occurs.\nWhen false, stval is written with 0"
319+
"description": "When true, stval is written with the faulting instruction encoding when a IllegalInstruction exception occurs.\nWhen false, stval is written with 0"
320320
},
321321
"REPORT_CAUSE_IN_STVAL_ON_SOFTWARE_CHECK": {
322322
"type": "boolean",
323323
"default": false,
324-
"description": "When true, stval is written with the casue when a SoftwareCheck exception occurs.\nWhen false, stval is written with 0"
324+
"description": "When true, stval is written with the cause when a SoftwareCheck exception occurs.\nWhen false, stval is written with 0"
325325
},
326326
"STVAL_WIDTH": {
327327
"type": "integer",

schemas/csr_schema.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@
6464
},
6565
"type": {
6666
"enum": ["RO", "RO-H", "RW", "RW-R", "RW-H", "RW-RH"],
67-
"description": "Type of the field. One of:\n * RO: Read-only immutable\n * RO-H: Read-only, updated by hardware\n * RW: Read-write, not updated by hardware\n * RW-R: Read-write, but values are restricted. sw_write(value) must be provided\n * RW-H: Read-write, with hardware updates\n * RW-RH: Read-write, with hardware updates, but values are restricted. sw_write(value) must be provded"
67+
"description": "Type of the field. One of:\n * RO: Read-only immutable\n * RO-H: Read-only, updated by hardware\n * RW: Read-write, not updated by hardware\n * RW-R: Read-write, but values are restricted. sw_write(value) must be provided\n * RW-H: Read-write, with hardware updates\n * RW-RH: Read-write, with hardware updates, but values are restricted. sw_write(value) must be provided"
6868
},
6969
"type()": {
7070
"type": "string",
71-
"description": "Function that returns a configuration-depenent type. The return value should be a CsrFieldType enum, and must be compile-time-known."
71+
"description": "Function that returns a configuration-dependent type. The return value should be a CsrFieldType enum, and must be compile-time-known."
7272
},
7373
"alias": {
7474
"oneOf": [
@@ -182,7 +182,7 @@
182182
},
183183
"description": {
184184
"type": "string",
185-
"description": "A full Asciidoc description of the CSR, indended to be used as documentation."
185+
"description": "A full Asciidoc description of the CSR, intended to be used as documentation."
186186
},
187187
"definedBy": {
188188
"$ref": "schema_defs.json#/$defs/requires_entry",
@@ -196,7 +196,7 @@
196196
},
197197
"indirect_address": {
198198
"type": "integer",
199-
"description": "Indirect sddress of the CSR, as given to the indirect CSRs of the `Smcsrind`/`Sscdrind` extensions"
199+
"description": "Indirect address of the CSR, as given to the indirect CSRs of the `Smcsrind`/`Sscdrind` extensions"
200200
},
201201
"indirect": {
202202
"type": "boolean",
@@ -230,7 +230,7 @@
230230
"description": "Function that returns the value of the CSR when read by software (i.e., a Zicsr instruction). If not specified, the value last written (through hw_write) is returned."
231231
},
232232
"__source": {
233-
"description": "Path to the source file this defintion came from; used by downstream tooling -- not expected to be in handwritten files",
233+
"description": "Path to the source file this definition came from; used by downstream tooling -- not expected to be in handwritten files",
234234
"type": "string"
235235
}
236236
},

schemas/ext_schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
}
7171
},
7272
"doc_license": {
73-
"description": "License that applies to the textual documantation for this extension",
73+
"description": "License that applies to the textual documentation for this extension",
7474
"type": "object",
7575
"properties": {
7676
"name": {
@@ -150,7 +150,7 @@
150150
},
151151
"url": { "type": "string", "format": "uri", "description": "Link to ratified document" },
152152
"implies": {
153-
"description": "Extension(s) implied by this extension (i.e., any subextesions)",
153+
"description": "Extension(s) implied by this extension (i.e., any subextensions)",
154154
"oneOf": [
155155
{ "$ref": "schema_defs.json#/$defs/extension_name_and_version" },
156156
{ "type": "array", "items": { "$ref": "schema_defs.json#/$defs/extension_name_and_version" }}

schemas/inst_schema.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@
152152
"name": {
153153
"type": "string",
154154
"pattern": "^[a-z0-9.]+$",
155-
"desription": "Instruction mnemonic (must be lowercase)"
155+
"description": "Instruction mnemonic (must be lowercase)"
156156
},
157157
"long_name": {
158158
"type": "string",
159-
"description": "Short descrption of the instruction"
159+
"description": "Short description of the instruction"
160160
},
161161
"description": {
162162
"type": "string",
@@ -254,7 +254,7 @@
254254
},
255255
"to": {
256256
"type": "string",
257-
"description": "pseduoinstruction format"
257+
"description": "pseudoinstruction format"
258258
}
259259
},
260260
"additionalProperties": false

schemas/manual_version_schema.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"authors": {
2525
"type": "array",
26-
"itesm": {
26+
"items": {
2727
"$ref": "schema_defs.json#/$defs/author"
2828
}
2929
},
@@ -66,7 +66,7 @@
6666
},
6767
"marketing_version": {
6868
"type": "string",
69-
"description": "The publically displayed version number"
69+
"description": "The publicly displayed version number"
7070
},
7171
"state": {
7272
"$ref": "schema_defs.json#/$defs/spec_state",
@@ -91,7 +91,7 @@
9191
"items": {
9292
"$ref": "#/$defs/volume"
9393
},
94-
"descriptoin": "List of volumes in this version"
94+
"description": "List of volumes in this version"
9595
}
9696
},
9797
"additionalProperties": false

schemas/schema_defs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"field_location": {
1212
"oneOf": [
1313
{"type": "number", "description": "Location of a single bit"},
14-
{"type": "string", "pattern": "^[0-9]+-[0-9]+$", "description": "Location range of a multibit field"}
14+
{"type": "string", "pattern": "^[0-9]+-[0-9]+$", "description": "Location range of a multi-bit field"}
1515
],
1616
"description": "Location of a field in a register"
1717
},
@@ -43,7 +43,7 @@
4343
"pattern": "^((>=)|(>)|(~>)|(<)|(<=)|(=))?\\s*[0-9]+(\\.[0-9]+(\\.[0-9]+(-[a-fA-F0-9]+)?)?)?$"
4444
},
4545
"version_requirements": {
46-
"description": "A (set of) version requirments",
46+
"description": "A (set of) version requirements",
4747
"oneOf": [
4848
{
4949
"$ref": "#/$defs/requirement_string"

0 commit comments

Comments
 (0)