Merge pull request #2114 from riscv-software-src/wrs-trap

aswaterman · web-flow · commit 217cbc507791 · 2025-10-22T00:47:44.000-07:00
WRS instructions should trap when Zawrs is not implemented
diff --git a/riscv/insns/wrs_nto.h b/riscv/insns/wrs_nto.h
@@ -1,3 +1,5 @@
+require_extension(EXT_ZAWRS);
+
 if (get_field(STATE.mstatus->read(), MSTATUS_TW)) {
   require_privilege(PRV_M);
 } else if (STATE.v) {
diff --git a/riscv/insns/wrs_sto.h b/riscv/insns/wrs_sto.h
@@ -1 +1,3 @@
+require_extension(EXT_ZAWRS);
+
 // WRS.STO stalls for a short duration

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+require_extension(EXT_ZAWRS);`
	`2`	`+`
`1`	`3`	`if (get_field(STATE.mstatus->read(), MSTATUS_TW)) {`
`2`	`4`	`require_privilege(PRV_M);`
`3`	`5`	`} else if (STATE.v) {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+require_extension(EXT_ZAWRS);`
	`2`	`+`
`1`	`3`	`// WRS.STO stalls for a short duration`