AIA: Raise virtual instruction exception on writing stimecmp (stimecmph) from VS-mode when hvictl.VTI=1

YenHaoChen · binno · commit 50a4aff9b8f8 · 2025-05-14T00:18:44.000-07:00
diff --git a/riscv/csrs.cc b/riscv/csrs.cc
@@ -1734,6 +1734,9 @@ void stimecmp_csr_t::verify_permissions(insn_t insn, bool write) const {
   }
 
   basic_csr_t::verify_permissions(insn, write);
+
+  if ((state->csrmap[CSR_HVICTL]->read() & HVICTL_VTI) && state->v && write)
+    throw trap_virtual_instruction(insn.bits());
 }
 
 void virtualized_with_special_permission_csr_t::verify_permissions(insn_t insn, bool write) const {

Original file line number	Diff line number	Diff line change
`@@ -1734,6 +1734,9 @@ void stimecmp_csr_t::verify_permissions(insn_t insn, bool write) const {`
`1734`	`1734`	`}`
`1735`	`1735`
`1736`	`1736`	`basic_csr_t::verify_permissions(insn, write);`
	`1737`	`+`
	`1738`	`+ if ((state->csrmap[CSR_HVICTL]->read() & HVICTL_VTI) && state->v && write)`
	`1739`	`+ throw trap_virtual_instruction(insn.bits());`
`1737`	`1740`	`}`
`1738`	`1741`
`1739`	`1742`	`void virtualized_with_special_permission_csr_t::verify_permissions(insn_t insn, bool write) const {`