AIA: include hypervisor interrupts in HS stopi

Author: i2h2

riscv/csr_init.cc

@@ -155,7 +155,7 @@ void state_t::csr_init(processor_t* const proc, reg_t max_isa)
     add_hypervisor_csr(CSR_VSIP, vsip);
     add_supervisor_csr(CSR_SIP, sip);
   }
-  add_hypervisor_csr(CSR_HIP, std::make_shared<mip_proxy_csr_t>(proc, CSR_HIP, hip_hie_accr));
+  add_hypervisor_csr(CSR_HIP, hip = std::make_shared<mip_proxy_csr_t>(proc, CSR_HIP, hip_hie_accr));
   hvip = std::make_shared<hvip_csr_t>(proc, CSR_HVIP, 0);
   if (xlen == 32 && proc->extension_enabled_const(EXT_SSAIA)) {
     add_hypervisor_csr(CSR_HVIP, std::make_shared<rv32_low_csr_t>(proc, CSR_HVIP, hvip));
@@ -176,7 +176,7 @@ void state_t::csr_init(processor_t* const proc, reg_t max_isa)
     add_hypervisor_csr(CSR_VSIE, vsie);
     add_supervisor_csr(CSR_SIE, sie);
   }
-  add_hypervisor_csr(CSR_HIE, std::make_shared<mie_proxy_csr_t>(proc, CSR_HIE, hip_hie_accr));
+  add_hypervisor_csr(CSR_HIE, hie = std::make_shared<mie_proxy_csr_t>(proc, CSR_HIE, hip_hie_accr));
 
   add_supervisor_csr(CSR_MEDELEG, medeleg = std::make_shared<medeleg_csr_t>(proc, CSR_MEDELEG));
   mideleg = std::make_shared<mideleg_csr_t>(proc, CSR_MIDELEG);

riscv/csrs.cc

@@ -2132,7 +2132,11 @@ void nonvirtual_stopi_csr_t::verify_permissions(insn_t insn, bool write) const {
 }
 
 reg_t nonvirtual_stopi_csr_t::read() const noexcept {
-  reg_t enabled_interrupts = state->nonvirtual_sip->read() & state->nonvirtual_sie->read() & ~state->hideleg->read();
+  reg_t enabled_interrupts = state->nonvirtual_sip->read() & state->nonvirtual_sie->read();
+  // include hypervisor interrupts for HS stopi
+  enabled_interrupts |= state->hip->read() & state->hie->read();
+  // mask out delegated interrupts
+  enabled_interrupts &= ~state->hideleg->read();
   if (!enabled_interrupts)
     return 0; // no enabled pending interrupt to S-mode
 

riscv/processor.h

@@ -133,6 +133,8 @@ struct state_t
   csr_t_p hgatp;
   csr_t_p hgeie;
   csr_t_p hgeip;
+  csr_t_p hip;
+  csr_t_p hie;
   hvip_csr_t_p hvip;
   sstatus_csr_t_p sstatus;
   vsstatus_csr_t_p vsstatus;