Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/main/scala/Bundles.scala
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ class ArchEvent extends DifftestBaseBundle with HasValid {
val exceptionInst = UInt(32.W)
val hasNMI = Bool()
val virtualInterruptIsHvictlInject = Bool()
val irToHS = Bool()
val irToVS = Bool()
}

class InstrCommit(val numPhyRegs: Int = 32) extends DifftestBaseBundle with HasValid {
Expand Down
4 changes: 4 additions & 0 deletions src/test/csrc/difftest/difftest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,10 @@ void Difftest::do_interrupt() {
} else if (dut->event.virtualInterruptIsHvictlInject) {
proxy->virtual_interrupt_is_hvictl_inject(dut->event.virtualInterruptIsHvictlInject);
}
struct InterruptDelegate intrDeleg;
intrDeleg.irToHS = dut->event.irToHS;
intrDeleg.irToVS = dut->event.irToVS;
proxy->intr_delegate(intrDeleg);
proxy->raise_intr(dut->event.interrupt | (1ULL << 63));
progress = true;
}
Expand Down
12 changes: 12 additions & 0 deletions src/test/csrc/difftest/refproxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ class RefProxyConfig {
f(ref_memcpy_init, difftest_memcpy_init, void, uint64_t, void*, size_t, bool) \
f(raise_nmi_intr, difftest_raise_nmi_intr, void, bool) \
f(ref_virtual_interrupt_is_hvictl_inject, difftest_virtual_interrupt_is_hvictl_inject, void, bool) \
f(ref_interrupt_delegate, difftest_interrupt_delegate, void, void*) \
f(disambiguation_state, difftest_disambiguation_state, int, ) \
f(ref_non_reg_interrupt_pending, difftest_non_reg_interrupt_pending, void, void*) \
f(raise_mhpmevent_overflow, difftest_raise_mhpmevent_overflow, void, uint64_t) \
Expand Down Expand Up @@ -268,6 +269,12 @@ class RefProxy : public AbstractRefProxy {
}
}

inline void intr_delegate(struct InterruptDelegate &intrDeleg) {
if (ref_interrupt_delegate) {
ref_interrupt_delegate(&intrDeleg);
}
}

inline void non_reg_interrupt_pending(struct NonRegInterruptPending &ip) {
if (ref_non_reg_interrupt_pending) {
ref_non_reg_interrupt_pending(&ip);
Expand Down Expand Up @@ -469,6 +476,11 @@ struct FromAIA {
uint64_t hgeip;
};

struct InterruptDelegate {
bool irToHS;
bool irToVS;
};

extern const char *difftest_ref_so;
extern uint8_t *ref_golden_mem;

Expand Down