Merge pull request #1830 from demin-han/master

Fix non-standard interrupt start position
riscv-software-src · Oct 30, 2024 · f0d4d42 · f0d4d42
2 parents 88fc84d + 2688d17
commit f0d4d42
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/riscv/processor.cc b/riscv/processor.cc
@@ -304,8 +304,8 @@ void processor_t::take_interrupt(reg_t pending_interrupts)
   const bool nmie = !(state.mnstatus && !get_field(state.mnstatus->read(), MNSTATUS_NMIE));
   if (!state.debug_mode && nmie && enabled_interrupts) {
     // nonstandard interrupts have highest priority
-    if (enabled_interrupts >> (IRQ_M_EXT + 1))
-      enabled_interrupts = enabled_interrupts >> (IRQ_M_EXT + 1) << (IRQ_M_EXT + 1);
+    if (enabled_interrupts >> (IRQ_LCOF + 1))
+      enabled_interrupts = enabled_interrupts >> (IRQ_LCOF + 1) << (IRQ_LCOF + 1);
     // standard interrupt priority is MEI, MSI, MTI, SEI, SSI, STI
     else if (enabled_interrupts & MIP_MEIP)
       enabled_interrupts = MIP_MEIP;