Check if any vector extensions for vector CSRs

YenHaoChen · YenHaoChen · commit cefa747e9a24 · 2024-07-19T08:25:18.000+08:00
diff --git a/riscv/csrs.cc b/riscv/csrs.cc
@@ -1446,7 +1446,7 @@ vector_csr_t::vector_csr_t(processor_t* const proc, const reg_t addr, const reg_
 }
 
 void vector_csr_t::verify_permissions(insn_t insn, bool write) const {
-  require_vector_vs;
+  require(proc->any_vector_extensions() && STATE.sstatus->enabled(SSTATUS_VS));
   basic_csr_t::verify_permissions(insn, write);
 }
 
@@ -1467,7 +1467,7 @@ vxsat_csr_t::vxsat_csr_t(processor_t* const proc, const reg_t addr):
 }
 
 void vxsat_csr_t::verify_permissions(insn_t insn, bool write) const {
-  require_vector_vs;
+  require(proc->any_vector_extensions() && STATE.sstatus->enabled(SSTATUS_VS));
   masked_csr_t::verify_permissions(insn, write);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1446,7 +1446,7 @@ vector_csr_t::vector_csr_t(processor_t* const proc, const reg_t addr, const reg_`
`1446`	`1446`	`}`
`1447`	`1447`
`1448`	`1448`	`void vector_csr_t::verify_permissions(insn_t insn, bool write) const {`
`1449`		`- require_vector_vs;`
	`1449`	`+ require(proc->any_vector_extensions() && STATE.sstatus->enabled(SSTATUS_VS));`
`1450`	`1450`	`basic_csr_t::verify_permissions(insn, write);`
`1451`	`1451`	`}`
`1452`	`1452`
`@@ -1467,7 +1467,7 @@ vxsat_csr_t::vxsat_csr_t(processor_t* const proc, const reg_t addr):`
`1467`	`1467`	`}`
`1468`	`1468`
`1469`	`1469`	`void vxsat_csr_t::verify_permissions(insn_t insn, bool write) const {`
`1470`		`- require_vector_vs;`
	`1470`	`+ require(proc->any_vector_extensions() && STATE.sstatus->enabled(SSTATUS_VS));`
`1471`	`1471`	`masked_csr_t::verify_permissions(insn, write);`
`1472`	`1472`	`}`
`1473`	`1473`