Skip to content

A bugfix wrt. handling of pending traps #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eyck merged 2 commits into from
Mar 26, 2026
Merged

A bugfix wrt. handling of pending traps #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72f3367
correctly resets pending_trap in check_interrupt
EAlexJ Mar 26, 2026
25c00a4
Makes internal pending_trap only in Debug build visible in logging
EAlexJ Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/iss/arch/riscv_hart_m_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ template <typename BASE, features_e FEAT> void riscv_hart_m_p<BASE, FEAT>::check
bool mstatus_mie = this->state.mstatus.MIE;
auto m_enabled = this->reg.PRIV < PRIV_M || mstatus_mie;
auto enabled_interrupts = m_enabled ? ena_irq : 0;

if(enabled_interrupts != 0) {
this->reg.pending_trap = 0;
if(enabled_interrupts) {
int res = 0;
while((enabled_interrupts & 1) == 0) {
enabled_interrupts >>= 1;
Expand Down
8 changes: 7 additions & 1 deletion src/sysc/core2sc_adapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,13 @@ template <typename PLAT> class core2sc_adapter : public PLAT, public sc2core_if
this->csr[iss::arch::mip] &= ~mask;
this->check_interrupt();
if(value)
SCCTRACE(owner->hier_name()) << "Triggering interrupt " << id << " Pending trap: " << this->reg.pending_trap;
SCCTRACE(owner->hier_name()) << "Triggering interrupt " << id
#ifndef NDEBUG
<< " (Pending trap: " << std::hex << "0x"
<< ((this->reg.pending_trap >> 16) & 0xff) // 0x80 << 24 | (cause << 16) | trap_id
<< ")"
#endif
;
}

void _local_irq_mt(short id, bool value) {
Expand Down
Loading