Skip to content

Commit 1525331

Browse files
a4lga4lg
committed
RISC-V: Add 'Ssstateen' extension and its CSRs
This commit adds 'Ssstateen' extension, which is a supervisor-visible view of the 'Smstateen' extension. It means, this extension implements sstateen* and hstateen* CSRs of the 'Smstateen' extension. Note that 'Smstateen' extension itself is unchanged but due to implementation simplicity, it is implemented so that 'Smstateen' implies 'Ssstateen' (just like 'M' implies 'Zmmul'). This is based on the latest version of RISC-V Profiles (version 0.9-draft, Frozen): <riscv/riscv-profiles@226b7f6> bfd/ChangeLog: * elfxx-riscv.c (riscv_implicit_subsets): Update implication rules. (riscv_supported_std_s_ext) Add 'Ssstateen' extension. gas/ChangeLog: * config/tc-riscv.c (enum riscv_csr_class): Rename CSR_CLASS_SMSTATEEN_AND_H{,_32} to CSR_CLASS_SSSTATEEN_... Add CSR_CLASS_SSSTATEEN. (riscv_csr_address): Support new/renamed CSR classes. * testsuite/gas/riscv/csr.s: Add 'Ssstateen' extension to comment. * testsuite/gas/riscv/csr-version-1p9p1.l: Reflect changes to error messages. * testsuite/gas/riscv/csr-version-1p10.l: Likewise. * testsuite/gas/riscv/csr-version-1p11.l: Likewise. * testsuite/gas/riscv/csr-version-1p12.l: Likewise. * testsuite/gas/riscv/ssstateen-csr.s: Test for 'Ssstateen' CSRs. * testsuite/gas/riscv/ssstateen-csr.d: Likewise. * testsuite/gas/riscv/smstateen-csr-s.d: Test to make sure that supervisor/hypervisor part of 'Smstateen' CSRs are accessible from 'RV32IH_Smstateen', not just from 'RV32IH_Ssstateen' that is tested in ssstateen-csr.d. include/ChangeLog: * opcode/riscv-opc.h: Update DECLARE_CSR declarations with new CSR classes.
1 parent 84bcca5 commit 1525331

File tree

11 files changed

+182
-119
lines changed

11 files changed

+182
-119
lines changed

‎bfd/elfxx-riscv.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,9 +1097,10 @@ static struct riscv_implicit_subset riscv_implicit_subsets[] =
10971097
{"zks", "zbkx", check_implicit_always},
10981098
{"zks", "zksed", check_implicit_always},
10991099
{"zks", "zksh", check_implicit_always},
1100+
{"smstateen", "ssstateen", check_implicit_always},
11001101
{"smepmp", "zicsr", check_implicit_always},
1101-
{"smstateen", "zicsr", check_implicit_always},
11021102
{"sscofpmf", "zicsr", check_implicit_always},
1103+
{"ssstateen", "zicsr", check_implicit_always},
11031104
{"sstc", "zicsr", check_implicit_always},
11041105
{NULL, NULL, NULL}
11051106
};
@@ -1219,6 +1220,7 @@ static struct riscv_supported_ext riscv_supported_std_s_ext[] =
12191220
{"smepmp", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 },
12201221
{"smstateen", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 },
12211222
{"sscofpmf", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 },
1223+
{"ssstateen", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 },
12221224
{"sstc", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 },
12231225
{"svinval", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 },
12241226
{"svnapot", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 },

‎gas/config/tc-riscv.c‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ enum riscv_csr_class
6969
CSR_CLASS_H, /* hypervisor */
7070
CSR_CLASS_H_32, /* hypervisor, rv32 only */
7171
CSR_CLASS_SMSTATEEN, /* Smstateen only */
72-
CSR_CLASS_SMSTATEEN_AND_H, /* Smstateen only (with H) */
7372
CSR_CLASS_SMSTATEEN_32, /* Smstateen RV32 only */
74-
CSR_CLASS_SMSTATEEN_AND_H_32, /* Smstateen RV32 only (with H) */
73+
CSR_CLASS_SSSTATEEN, /* S[ms]stateen only */
74+
CSR_CLASS_SSSTATEEN_AND_H, /* S[ms]stateen only (with H) */
75+
CSR_CLASS_SSSTATEEN_AND_H_32, /* S[ms]stateen RV32 only (with H) */
7576
CSR_CLASS_SSCOFPMF, /* Sscofpmf only */
7677
CSR_CLASS_SSCOFPMF_32, /* Sscofpmf RV32 only */
7778
CSR_CLASS_SSTC, /* Sstc only */
@@ -1029,15 +1030,18 @@ riscv_csr_address (const char *csr_name,
10291030
extension = "zve32x";
10301031
break;
10311032
case CSR_CLASS_SMSTATEEN:
1032-
case CSR_CLASS_SMSTATEEN_AND_H:
10331033
case CSR_CLASS_SMSTATEEN_32:
1034-
case CSR_CLASS_SMSTATEEN_AND_H_32:
1035-
is_rv32_only = (csr_class == CSR_CLASS_SMSTATEEN_32
1036-
|| csr_class == CSR_CLASS_SMSTATEEN_AND_H_32);
1037-
is_h_required = (csr_class == CSR_CLASS_SMSTATEEN_AND_H
1038-
|| csr_class == CSR_CLASS_SMSTATEEN_AND_H_32);
1034+
is_rv32_only = (csr_class == CSR_CLASS_SMSTATEEN_32);
10391035
extension = "smstateen";
10401036
break;
1037+
case CSR_CLASS_SSSTATEEN:
1038+
case CSR_CLASS_SSSTATEEN_AND_H:
1039+
case CSR_CLASS_SSSTATEEN_AND_H_32:
1040+
is_rv32_only = (csr_class == CSR_CLASS_SSSTATEEN_AND_H_32);
1041+
is_h_required = (csr_class == CSR_CLASS_SSSTATEEN_AND_H
1042+
|| csr_class == CSR_CLASS_SSSTATEEN_AND_H_32);
1043+
extension = "ssstateen";
1044+
break;
10411045
case CSR_CLASS_SSCOFPMF_32:
10421046
is_rv32_only = true;
10431047
/* Fall through. */

‎gas/testsuite/gas/riscv/csr-version-1p10.l‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -419,30 +419,30 @@
419419
.*Warning: invalid CSR `mstateen2', needs `smstateen' extension
420420
.*Warning: invalid CSR `mstateen3', needs `smstateen' extension
421421
.*Warning: invalid CSR `mstateen3', needs `smstateen' extension
422-
.*Warning: invalid CSR `sstateen0', needs `smstateen' extension
423-
.*Warning: invalid CSR `sstateen0', needs `smstateen' extension
424-
.*Warning: invalid CSR `sstateen1', needs `smstateen' extension
425-
.*Warning: invalid CSR `sstateen1', needs `smstateen' extension
426-
.*Warning: invalid CSR `sstateen2', needs `smstateen' extension
427-
.*Warning: invalid CSR `sstateen2', needs `smstateen' extension
428-
.*Warning: invalid CSR `sstateen3', needs `smstateen' extension
429-
.*Warning: invalid CSR `sstateen3', needs `smstateen' extension
422+
.*Warning: invalid CSR `sstateen0', needs `ssstateen' extension
423+
.*Warning: invalid CSR `sstateen0', needs `ssstateen' extension
424+
.*Warning: invalid CSR `sstateen1', needs `ssstateen' extension
425+
.*Warning: invalid CSR `sstateen1', needs `ssstateen' extension
426+
.*Warning: invalid CSR `sstateen2', needs `ssstateen' extension
427+
.*Warning: invalid CSR `sstateen2', needs `ssstateen' extension
428+
.*Warning: invalid CSR `sstateen3', needs `ssstateen' extension
429+
.*Warning: invalid CSR `sstateen3', needs `ssstateen' extension
430430
.*Warning: invalid CSR `hstateen0', needs `h' extension
431-
.*Warning: invalid CSR `hstateen0', needs `smstateen' extension
431+
.*Warning: invalid CSR `hstateen0', needs `ssstateen' extension
432432
.*Warning: invalid CSR `hstateen0', needs `h' extension
433-
.*Warning: invalid CSR `hstateen0', needs `smstateen' extension
433+
.*Warning: invalid CSR `hstateen0', needs `ssstateen' extension
434434
.*Warning: invalid CSR `hstateen1', needs `h' extension
435-
.*Warning: invalid CSR `hstateen1', needs `smstateen' extension
435+
.*Warning: invalid CSR `hstateen1', needs `ssstateen' extension
436436
.*Warning: invalid CSR `hstateen1', needs `h' extension
437-
.*Warning: invalid CSR `hstateen1', needs `smstateen' extension
437+
.*Warning: invalid CSR `hstateen1', needs `ssstateen' extension
438438
.*Warning: invalid CSR `hstateen2', needs `h' extension
439-
.*Warning: invalid CSR `hstateen2', needs `smstateen' extension
439+
.*Warning: invalid CSR `hstateen2', needs `ssstateen' extension
440440
.*Warning: invalid CSR `hstateen2', needs `h' extension
441-
.*Warning: invalid CSR `hstateen2', needs `smstateen' extension
441+
.*Warning: invalid CSR `hstateen2', needs `ssstateen' extension
442442
.*Warning: invalid CSR `hstateen3', needs `h' extension
443-
.*Warning: invalid CSR `hstateen3', needs `smstateen' extension
443+
.*Warning: invalid CSR `hstateen3', needs `ssstateen' extension
444444
.*Warning: invalid CSR `hstateen3', needs `h' extension
445-
.*Warning: invalid CSR `hstateen3', needs `smstateen' extension
445+
.*Warning: invalid CSR `hstateen3', needs `ssstateen' extension
446446
.*Warning: invalid CSR `mstateen0h', needs rv32i extension
447447
.*Warning: invalid CSR `mstateen0h', needs `smstateen' extension
448448
.*Warning: invalid CSR `mstateen0h', needs rv32i extension
@@ -461,28 +461,28 @@
461461
.*Warning: invalid CSR `mstateen3h', needs `smstateen' extension
462462
.*Warning: invalid CSR `hstateen0h', needs rv32i extension
463463
.*Warning: invalid CSR `hstateen0h', needs `h' extension
464-
.*Warning: invalid CSR `hstateen0h', needs `smstateen' extension
464+
.*Warning: invalid CSR `hstateen0h', needs `ssstateen' extension
465465
.*Warning: invalid CSR `hstateen0h', needs rv32i extension
466466
.*Warning: invalid CSR `hstateen0h', needs `h' extension
467-
.*Warning: invalid CSR `hstateen0h', needs `smstateen' extension
467+
.*Warning: invalid CSR `hstateen0h', needs `ssstateen' extension
468468
.*Warning: invalid CSR `hstateen1h', needs rv32i extension
469469
.*Warning: invalid CSR `hstateen1h', needs `h' extension
470-
.*Warning: invalid CSR `hstateen1h', needs `smstateen' extension
470+
.*Warning: invalid CSR `hstateen1h', needs `ssstateen' extension
471471
.*Warning: invalid CSR `hstateen1h', needs rv32i extension
472472
.*Warning: invalid CSR `hstateen1h', needs `h' extension
473-
.*Warning: invalid CSR `hstateen1h', needs `smstateen' extension
473+
.*Warning: invalid CSR `hstateen1h', needs `ssstateen' extension
474474
.*Warning: invalid CSR `hstateen2h', needs rv32i extension
475475
.*Warning: invalid CSR `hstateen2h', needs `h' extension
476-
.*Warning: invalid CSR `hstateen2h', needs `smstateen' extension
476+
.*Warning: invalid CSR `hstateen2h', needs `ssstateen' extension
477477
.*Warning: invalid CSR `hstateen2h', needs rv32i extension
478478
.*Warning: invalid CSR `hstateen2h', needs `h' extension
479-
.*Warning: invalid CSR `hstateen2h', needs `smstateen' extension
479+
.*Warning: invalid CSR `hstateen2h', needs `ssstateen' extension
480480
.*Warning: invalid CSR `hstateen3h', needs rv32i extension
481481
.*Warning: invalid CSR `hstateen3h', needs `h' extension
482-
.*Warning: invalid CSR `hstateen3h', needs `smstateen' extension
482+
.*Warning: invalid CSR `hstateen3h', needs `ssstateen' extension
483483
.*Warning: invalid CSR `hstateen3h', needs rv32i extension
484484
.*Warning: invalid CSR `hstateen3h', needs `h' extension
485-
.*Warning: invalid CSR `hstateen3h', needs `smstateen' extension
485+
.*Warning: invalid CSR `hstateen3h', needs `ssstateen' extension
486486
.*Warning: invalid CSR `scountovf', needs `sscofpmf' extension
487487
.*Warning: invalid CSR `scountovf', needs `sscofpmf' extension
488488
.*Warning: read-only CSR is written `csrw scountovf,a1'

‎gas/testsuite/gas/riscv/csr-version-1p11.l‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -417,30 +417,30 @@
417417
.*Warning: invalid CSR `mstateen2', needs `smstateen' extension
418418
.*Warning: invalid CSR `mstateen3', needs `smstateen' extension
419419
.*Warning: invalid CSR `mstateen3', needs `smstateen' extension
420-
.*Warning: invalid CSR `sstateen0', needs `smstateen' extension
421-
.*Warning: invalid CSR `sstateen0', needs `smstateen' extension
422-
.*Warning: invalid CSR `sstateen1', needs `smstateen' extension
423-
.*Warning: invalid CSR `sstateen1', needs `smstateen' extension
424-
.*Warning: invalid CSR `sstateen2', needs `smstateen' extension
425-
.*Warning: invalid CSR `sstateen2', needs `smstateen' extension
426-
.*Warning: invalid CSR `sstateen3', needs `smstateen' extension
427-
.*Warning: invalid CSR `sstateen3', needs `smstateen' extension
420+
.*Warning: invalid CSR `sstateen0', needs `ssstateen' extension
421+
.*Warning: invalid CSR `sstateen0', needs `ssstateen' extension
422+
.*Warning: invalid CSR `sstateen1', needs `ssstateen' extension
423+
.*Warning: invalid CSR `sstateen1', needs `ssstateen' extension
424+
.*Warning: invalid CSR `sstateen2', needs `ssstateen' extension
425+
.*Warning: invalid CSR `sstateen2', needs `ssstateen' extension
426+
.*Warning: invalid CSR `sstateen3', needs `ssstateen' extension
427+
.*Warning: invalid CSR `sstateen3', needs `ssstateen' extension
428428
.*Warning: invalid CSR `hstateen0', needs `h' extension
429-
.*Warning: invalid CSR `hstateen0', needs `smstateen' extension
429+
.*Warning: invalid CSR `hstateen0', needs `ssstateen' extension
430430
.*Warning: invalid CSR `hstateen0', needs `h' extension
431-
.*Warning: invalid CSR `hstateen0', needs `smstateen' extension
431+
.*Warning: invalid CSR `hstateen0', needs `ssstateen' extension
432432
.*Warning: invalid CSR `hstateen1', needs `h' extension
433-
.*Warning: invalid CSR `hstateen1', needs `smstateen' extension
433+
.*Warning: invalid CSR `hstateen1', needs `ssstateen' extension
434434
.*Warning: invalid CSR `hstateen1', needs `h' extension
435-
.*Warning: invalid CSR `hstateen1', needs `smstateen' extension
435+
.*Warning: invalid CSR `hstateen1', needs `ssstateen' extension
436436
.*Warning: invalid CSR `hstateen2', needs `h' extension
437-
.*Warning: invalid CSR `hstateen2', needs `smstateen' extension
437+
.*Warning: invalid CSR `hstateen2', needs `ssstateen' extension
438438
.*Warning: invalid CSR `hstateen2', needs `h' extension
439-
.*Warning: invalid CSR `hstateen2', needs `smstateen' extension
439+
.*Warning: invalid CSR `hstateen2', needs `ssstateen' extension
440440
.*Warning: invalid CSR `hstateen3', needs `h' extension
441-
.*Warning: invalid CSR `hstateen3', needs `smstateen' extension
441+
.*Warning: invalid CSR `hstateen3', needs `ssstateen' extension
442442
.*Warning: invalid CSR `hstateen3', needs `h' extension
443-
.*Warning: invalid CSR `hstateen3', needs `smstateen' extension
443+
.*Warning: invalid CSR `hstateen3', needs `ssstateen' extension
444444
.*Warning: invalid CSR `mstateen0h', needs rv32i extension
445445
.*Warning: invalid CSR `mstateen0h', needs `smstateen' extension
446446
.*Warning: invalid CSR `mstateen0h', needs rv32i extension
@@ -459,28 +459,28 @@
459459
.*Warning: invalid CSR `mstateen3h', needs `smstateen' extension
460460
.*Warning: invalid CSR `hstateen0h', needs rv32i extension
461461
.*Warning: invalid CSR `hstateen0h', needs `h' extension
462-
.*Warning: invalid CSR `hstateen0h', needs `smstateen' extension
462+
.*Warning: invalid CSR `hstateen0h', needs `ssstateen' extension
463463
.*Warning: invalid CSR `hstateen0h', needs rv32i extension
464464
.*Warning: invalid CSR `hstateen0h', needs `h' extension
465-
.*Warning: invalid CSR `hstateen0h', needs `smstateen' extension
465+
.*Warning: invalid CSR `hstateen0h', needs `ssstateen' extension
466466
.*Warning: invalid CSR `hstateen1h', needs rv32i extension
467467
.*Warning: invalid CSR `hstateen1h', needs `h' extension
468-
.*Warning: invalid CSR `hstateen1h', needs `smstateen' extension
468+
.*Warning: invalid CSR `hstateen1h', needs `ssstateen' extension
469469
.*Warning: invalid CSR `hstateen1h', needs rv32i extension
470470
.*Warning: invalid CSR `hstateen1h', needs `h' extension
471-
.*Warning: invalid CSR `hstateen1h', needs `smstateen' extension
471+
.*Warning: invalid CSR `hstateen1h', needs `ssstateen' extension
472472
.*Warning: invalid CSR `hstateen2h', needs rv32i extension
473473
.*Warning: invalid CSR `hstateen2h', needs `h' extension
474-
.*Warning: invalid CSR `hstateen2h', needs `smstateen' extension
474+
.*Warning: invalid CSR `hstateen2h', needs `ssstateen' extension
475475
.*Warning: invalid CSR `hstateen2h', needs rv32i extension
476476
.*Warning: invalid CSR `hstateen2h', needs `h' extension
477-
.*Warning: invalid CSR `hstateen2h', needs `smstateen' extension
477+
.*Warning: invalid CSR `hstateen2h', needs `ssstateen' extension
478478
.*Warning: invalid CSR `hstateen3h', needs rv32i extension
479479
.*Warning: invalid CSR `hstateen3h', needs `h' extension
480-
.*Warning: invalid CSR `hstateen3h', needs `smstateen' extension
480+
.*Warning: invalid CSR `hstateen3h', needs `ssstateen' extension
481481
.*Warning: invalid CSR `hstateen3h', needs rv32i extension
482482
.*Warning: invalid CSR `hstateen3h', needs `h' extension
483-
.*Warning: invalid CSR `hstateen3h', needs `smstateen' extension
483+
.*Warning: invalid CSR `hstateen3h', needs `ssstateen' extension
484484
.*Warning: invalid CSR `scountovf', needs `sscofpmf' extension
485485
.*Warning: invalid CSR `scountovf', needs `sscofpmf' extension
486486
.*Warning: read-only CSR is written `csrw scountovf,a1'

‎gas/testsuite/gas/riscv/csr-version-1p12.l‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -279,30 +279,30 @@
279279
.*Warning: invalid CSR `mstateen2', needs `smstateen' extension
280280
.*Warning: invalid CSR `mstateen3', needs `smstateen' extension
281281
.*Warning: invalid CSR `mstateen3', needs `smstateen' extension
282-
.*Warning: invalid CSR `sstateen0', needs `smstateen' extension
283-
.*Warning: invalid CSR `sstateen0', needs `smstateen' extension
284-
.*Warning: invalid CSR `sstateen1', needs `smstateen' extension
285-
.*Warning: invalid CSR `sstateen1', needs `smstateen' extension
286-
.*Warning: invalid CSR `sstateen2', needs `smstateen' extension
287-
.*Warning: invalid CSR `sstateen2', needs `smstateen' extension
288-
.*Warning: invalid CSR `sstateen3', needs `smstateen' extension
289-
.*Warning: invalid CSR `sstateen3', needs `smstateen' extension
282+
.*Warning: invalid CSR `sstateen0', needs `ssstateen' extension
283+
.*Warning: invalid CSR `sstateen0', needs `ssstateen' extension
284+
.*Warning: invalid CSR `sstateen1', needs `ssstateen' extension
285+
.*Warning: invalid CSR `sstateen1', needs `ssstateen' extension
286+
.*Warning: invalid CSR `sstateen2', needs `ssstateen' extension
287+
.*Warning: invalid CSR `sstateen2', needs `ssstateen' extension
288+
.*Warning: invalid CSR `sstateen3', needs `ssstateen' extension
289+
.*Warning: invalid CSR `sstateen3', needs `ssstateen' extension
290290
.*Warning: invalid CSR `hstateen0', needs `h' extension
291-
.*Warning: invalid CSR `hstateen0', needs `smstateen' extension
291+
.*Warning: invalid CSR `hstateen0', needs `ssstateen' extension
292292
.*Warning: invalid CSR `hstateen0', needs `h' extension
293-
.*Warning: invalid CSR `hstateen0', needs `smstateen' extension
293+
.*Warning: invalid CSR `hstateen0', needs `ssstateen' extension
294294
.*Warning: invalid CSR `hstateen1', needs `h' extension
295-
.*Warning: invalid CSR `hstateen1', needs `smstateen' extension
295+
.*Warning: invalid CSR `hstateen1', needs `ssstateen' extension
296296
.*Warning: invalid CSR `hstateen1', needs `h' extension
297-
.*Warning: invalid CSR `hstateen1', needs `smstateen' extension
297+
.*Warning: invalid CSR `hstateen1', needs `ssstateen' extension
298298
.*Warning: invalid CSR `hstateen2', needs `h' extension
299-
.*Warning: invalid CSR `hstateen2', needs `smstateen' extension
299+
.*Warning: invalid CSR `hstateen2', needs `ssstateen' extension
300300
.*Warning: invalid CSR `hstateen2', needs `h' extension
301-
.*Warning: invalid CSR `hstateen2', needs `smstateen' extension
301+
.*Warning: invalid CSR `hstateen2', needs `ssstateen' extension
302302
.*Warning: invalid CSR `hstateen3', needs `h' extension
303-
.*Warning: invalid CSR `hstateen3', needs `smstateen' extension
303+
.*Warning: invalid CSR `hstateen3', needs `ssstateen' extension
304304
.*Warning: invalid CSR `hstateen3', needs `h' extension
305-
.*Warning: invalid CSR `hstateen3', needs `smstateen' extension
305+
.*Warning: invalid CSR `hstateen3', needs `ssstateen' extension
306306
.*Warning: invalid CSR `mstateen0h', needs rv32i extension
307307
.*Warning: invalid CSR `mstateen0h', needs `smstateen' extension
308308
.*Warning: invalid CSR `mstateen0h', needs rv32i extension
@@ -321,28 +321,28 @@
321321
.*Warning: invalid CSR `mstateen3h', needs `smstateen' extension
322322
.*Warning: invalid CSR `hstateen0h', needs rv32i extension
323323
.*Warning: invalid CSR `hstateen0h', needs `h' extension
324-
.*Warning: invalid CSR `hstateen0h', needs `smstateen' extension
324+
.*Warning: invalid CSR `hstateen0h', needs `ssstateen' extension
325325
.*Warning: invalid CSR `hstateen0h', needs rv32i extension
326326
.*Warning: invalid CSR `hstateen0h', needs `h' extension
327-
.*Warning: invalid CSR `hstateen0h', needs `smstateen' extension
327+
.*Warning: invalid CSR `hstateen0h', needs `ssstateen' extension
328328
.*Warning: invalid CSR `hstateen1h', needs rv32i extension
329329
.*Warning: invalid CSR `hstateen1h', needs `h' extension
330-
.*Warning: invalid CSR `hstateen1h', needs `smstateen' extension
330+
.*Warning: invalid CSR `hstateen1h', needs `ssstateen' extension
331331
.*Warning: invalid CSR `hstateen1h', needs rv32i extension
332332
.*Warning: invalid CSR `hstateen1h', needs `h' extension
333-
.*Warning: invalid CSR `hstateen1h', needs `smstateen' extension
333+
.*Warning: invalid CSR `hstateen1h', needs `ssstateen' extension
334334
.*Warning: invalid CSR `hstateen2h', needs rv32i extension
335335
.*Warning: invalid CSR `hstateen2h', needs `h' extension
336-
.*Warning: invalid CSR `hstateen2h', needs `smstateen' extension
336+
.*Warning: invalid CSR `hstateen2h', needs `ssstateen' extension
337337
.*Warning: invalid CSR `hstateen2h', needs rv32i extension
338338
.*Warning: invalid CSR `hstateen2h', needs `h' extension
339-
.*Warning: invalid CSR `hstateen2h', needs `smstateen' extension
339+
.*Warning: invalid CSR `hstateen2h', needs `ssstateen' extension
340340
.*Warning: invalid CSR `hstateen3h', needs rv32i extension
341341
.*Warning: invalid CSR `hstateen3h', needs `h' extension
342-
.*Warning: invalid CSR `hstateen3h', needs `smstateen' extension
342+
.*Warning: invalid CSR `hstateen3h', needs `ssstateen' extension
343343
.*Warning: invalid CSR `hstateen3h', needs rv32i extension
344344
.*Warning: invalid CSR `hstateen3h', needs `h' extension
345-
.*Warning: invalid CSR `hstateen3h', needs `smstateen' extension
345+
.*Warning: invalid CSR `hstateen3h', needs `ssstateen' extension
346346
.*Warning: invalid CSR `scountovf', needs `sscofpmf' extension
347347
.*Warning: invalid CSR `scountovf', needs `sscofpmf' extension
348348
.*Warning: read-only CSR is written `csrw scountovf,a1'

0 commit comments

Comments
 (0)