aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYenHaoChen <howard25336284@gmail.com>2023-12-07 10:54:03 +0800
committerYenHaoChen <howard25336284@gmail.com>2023-12-07 10:54:07 +0800
commitbdfbd54959b31575e410e2267c12b59b0c9917ae (patch)
treed0acb01d2a4c3dc9445d32b7b1229b09a9f9d04a
parentaa0bbeb296417a8e0e0857aeeaca6c545d2e142d (diff)
downloadriscv-isa-sim-bdfbd54959b31575e410e2267c12b59b0c9917ae.zip
riscv-isa-sim-bdfbd54959b31575e410e2267c12b59b0c9917ae.tar.gz
riscv-isa-sim-bdfbd54959b31575e410e2267c12b59b0c9917ae.tar.bz2
refactor: single statement of declaration and initialization on miselect, siselect, and vsiselect
-rw-r--r--riscv/processor.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/riscv/processor.cc b/riscv/processor.cc
index 02ff29a..5a43d56 100644
--- a/riscv/processor.cc
+++ b/riscv/processor.cc
@@ -535,15 +535,12 @@ void state_t::reset(processor_t* const proc, reg_t max_isa)
// Smcsrind / Sscsrind
- csr_t_p miselect;
- csr_t_p siselect;
- csr_t_p vsiselect;
sscsrind_reg_csr_t::sscsrind_reg_csr_t_p mireg[6];
sscsrind_reg_csr_t::sscsrind_reg_csr_t_p sireg[6];
sscsrind_reg_csr_t::sscsrind_reg_csr_t_p vsireg[6];
if (proc->extension_enabled_const(EXT_SMCSRIND)) {
- miselect = std::make_shared<basic_csr_t>(proc, CSR_MISELECT, 0);
+ csr_t_p miselect = std::make_shared<basic_csr_t>(proc, CSR_MISELECT, 0);
csrmap[CSR_MISELECT] = miselect;
const reg_t mireg_csrs[] = { CSR_MIREG, CSR_MIREG2, CSR_MIREG3, CSR_MIREG4, CSR_MIREG5, CSR_MIREG6 };
@@ -555,9 +552,9 @@ void state_t::reset(processor_t* const proc, reg_t max_isa)
}
if (proc->extension_enabled_const(EXT_SSCSRIND)) {
- vsiselect = std::make_shared<basic_csr_t>(proc, CSR_VSISELECT, 0);
+ csr_t_p vsiselect = std::make_shared<basic_csr_t>(proc, CSR_VSISELECT, 0);
csrmap[CSR_VSISELECT] = vsiselect;
- siselect = std::make_shared<basic_csr_t>(proc, CSR_SISELECT, 0);
+ csr_t_p siselect = std::make_shared<basic_csr_t>(proc, CSR_SISELECT, 0);
csrmap[CSR_SISELECT] = std::make_shared<virtualized_csr_t>(proc, siselect, vsiselect);
const reg_t vsireg_csrs[] = { CSR_VSIREG, CSR_VSIREG2, CSR_VSIREG3, CSR_VSIREG4, CSR_VSIREG5, CSR_VSIREG6 };