From 66287defa0f4b149337d4e90d513079dd91ae128 Mon Sep 17 00:00:00 2001
From: Jalali <110232072+AyoubJalali@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:20:10 +0000
Subject: [PATCH] CSR_REGFILE : No need to check single step if we don't
 support debug mode (#1659)

---
 core/csr_regfile.sv | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/csr_regfile.sv b/core/csr_regfile.sv
index 881559e67f..e39e3b0674 100644
--- a/core/csr_regfile.sv
+++ b/core/csr_regfile.sv
@@ -1324,7 +1324,8 @@ module csr_regfile
   assign irq_ctrl_o.mideleg = mideleg_q;
   assign irq_ctrl_o.global_enable = (~debug_mode_q)
       // interrupts are enabled during single step or we are not stepping
-      & (~dcsr_q.step | dcsr_q.stepie)
+      // No need to check interrupts during single step if we don't support DEBUG mode
+      & (~CVA6Cfg.DebugEn | (~dcsr_q.step | dcsr_q.stepie))
                                     & ((mstatus_q.mie & (priv_lvl_o == riscv::PRIV_LVL_M))
                                     | (priv_lvl_o != riscv::PRIV_LVL_M));