Skip to content

Commit 149d82c

Browse files
committed
AIA: add null pointer check to VS get_csrmap(1)
1 parent 217285a commit 149d82c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

riscv/csr_init.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,12 @@ void state_t::csr_init(processor_t* const proc, reg_t max_isa)
498498
if (proc->extension_enabled_const(EXT_SSAIA)) {
499499
auto aia_vsireg = std::make_shared<aia_ireg_proxy_csr_t>(proc, CSR_VSIREG, vsiselect);
500500
// csrmaps of vs files are the same as vgein = 1
501-
for (auto &csr : *aia_vsireg->get_csrmap(1))
502-
vsireg->add_ireg_proxy(csr.first, aia_vsireg);
503-
add_ireg_proxy(vsireg, aia_vsireg);
501+
auto *csrmap = aia_vsireg->get_csrmap(1);
502+
if (csrmap) {
503+
for (auto &csr : *csrmap)
504+
vsireg->add_ireg_proxy(csr.first, aia_vsireg);
505+
add_ireg_proxy(vsireg, aia_vsireg);
506+
}
504507

505508
auto aia_sireg = std::make_shared<aia_ireg_proxy_csr_t>(proc, CSR_SIREG, siselect);
506509
for (auto &csr : *aia_sireg->get_csrmap())

0 commit comments

Comments
 (0)