Skip to content

Commit 9271036

Browse files
committed
Register hidelegh csr with aia_rv32_high_csr_t class
Signed-off-by: Binno <[email protected]>
1 parent f874622 commit 9271036

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

riscv/csr_init.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ void state_t::csr_init(processor_t* const proc, reg_t max_isa)
220220
hideleg = std::make_shared<hideleg_csr_t>(proc, CSR_HIDELEG, mideleg);
221221
if (xlen == 32 && proc->extension_enabled_const(EXT_SSAIA)) {
222222
add_hypervisor_csr(CSR_HIDELEG, std::make_shared<rv32_low_csr_t>(proc, CSR_HIDELEG, hideleg));
223-
add_hypervisor_csr(CSR_HIDELEGH, std::make_shared<rv32_high_csr_t>(proc, CSR_HIDELEGH, hideleg));
223+
add_hypervisor_csr(CSR_HIDELEGH, std::make_shared<aia_rv32_high_csr_t>(proc, CSR_HIDELEGH, hideleg));
224224
} else {
225225
add_hypervisor_csr(CSR_HIDELEG, hideleg);
226226
}

riscv/csrs.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1715,10 +1715,6 @@ bool stimecmp_csr_t::unlogged_write(const reg_t val) noexcept {
17151715
return basic_csr_t::unlogged_write(val);
17161716
}
17171717

1718-
virtualized_with_special_permission_csr_t::virtualized_with_special_permission_csr_t(processor_t* const proc, csr_t_p orig, csr_t_p virt):
1719-
virtualized_csr_t(proc, orig, virt) {
1720-
}
1721-
17221718
void stimecmp_csr_t::verify_permissions(insn_t insn, bool write) const {
17231719
if (!(state->menvcfg->read() & MENVCFG_STCE)) {
17241720
// access to (v)stimecmp with MENVCFG.STCE = 0
@@ -1739,6 +1735,10 @@ void stimecmp_csr_t::verify_permissions(insn_t insn, bool write) const {
17391735
throw trap_virtual_instruction(insn.bits());
17401736
}
17411737

1738+
virtualized_with_special_permission_csr_t::virtualized_with_special_permission_csr_t(processor_t* const proc, csr_t_p orig, csr_t_p virt):
1739+
virtualized_csr_t(proc, orig, virt) {
1740+
}
1741+
17421742
void virtualized_with_special_permission_csr_t::verify_permissions(insn_t insn, bool write) const {
17431743
orig_csr->verify_permissions(insn, write);
17441744
}

0 commit comments

Comments
 (0)