diff options
| author | Andrew Waterman <andrew@sifive.com> | 2019-11-12 18:37:07 -0800 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2019-11-12 18:37:07 -0800 |
| commit | 9a8ee5efdc97a44d3509abd616297edaf7e3800e (patch) | |
| tree | d46a33f70db3bc58833ed2277b32ffa3fb817410 | |
| parent | 9b06f14085396b99c2a7e33cac8be8ee54948a52 (diff) | |
| download | spike-9a8ee5efdc97a44d3509abd616297edaf7e3800e.zip spike-9a8ee5efdc97a44d3509abd616297edaf7e3800e.tar.gz spike-9a8ee5efdc97a44d3509abd616297edaf7e3800e.tar.bz2 | |
Remove S-mode interrupts when S-mode not present
| -rw-r--r-- | riscv/processor.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/riscv/processor.cc b/riscv/processor.cc index 888d1a4..3dff83e 100644 --- a/riscv/processor.cc +++ b/riscv/processor.cc @@ -488,8 +488,9 @@ int processor_t::paddr_bits() void processor_t::set_csr(int which, reg_t val) { val = zext_xlen(val); - reg_t delegable_ints = MIP_SSIP | MIP_STIP | MIP_SEIP - | ((ext != NULL) << IRQ_COP); + reg_t supervisor_ints = supports_extension('S') ? MIP_SSIP | MIP_STIP | MIP_SEIP : 0; + reg_t coprocessor_ints = (ext != NULL) << IRQ_COP; + reg_t delegable_ints = supervisor_ints | coprocessor_ints; reg_t all_ints = delegable_ints | MIP_MSIP | MIP_MTIP; if (which >= CSR_PMPADDR0 && which < CSR_PMPADDR0 + state.n_pmp) { @@ -561,7 +562,7 @@ void processor_t::set_csr(int which, reg_t val) break; } case CSR_MIP: { - reg_t mask = MIP_SSIP | MIP_STIP; + reg_t mask = supervisor_ints & (MIP_SSIP | MIP_STIP); state.mip = (state.mip & ~mask) | (val & mask); break; } @@ -836,8 +837,14 @@ reg_t processor_t::get_csr(int which) case CSR_MVENDORID: return 0; case CSR_MHARTID: return id; case CSR_MTVEC: return state.mtvec; - case CSR_MEDELEG: return state.medeleg; - case CSR_MIDELEG: return state.mideleg; + case CSR_MEDELEG: + if (!supports_extension('S')) + break; + return state.medeleg; + case CSR_MIDELEG: + if (!supports_extension('S')) + break; + return state.mideleg; case CSR_TSELECT: return state.tselect; case CSR_TDATA1: if (state.tselect < state.num_triggers) { |