From 8a476d387c84f037d0ccf3cc20dc88870ab45fec Mon Sep 17 00:00:00 2001
From: Mitch Hayenga <mitch.hayenga@arm.com>
Date: Thu, 21 Jul 2016 17:19:15 +0100
Subject: isa: Modify get/check interrupt routines

Make it so that getInterrupt *always* returns an interrupt if
checkInterrupts() returns true.  This fixes/simplifies handling
of interrupts on the SMT FS CPUs (currently minor).
---
 src/arch/mips/interrupts.hh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/arch/mips/interrupts.hh')

diff --git a/src/arch/mips/interrupts.hh b/src/arch/mips/interrupts.hh
index b5323e4e1..2205510d2 100755
--- a/src/arch/mips/interrupts.hh
+++ b/src/arch/mips/interrupts.hh
@@ -107,13 +107,7 @@ class Interrupts : public SimObject
     void updateIntrInfo(ThreadContext *tc) const;
     bool interruptsPending(ThreadContext *tc) const;
     bool onCpuTimerInterrupt(ThreadContext *tc) const;
-
-    bool
-    checkInterrupts(ThreadContext *tc) const
-    {
-        return interruptsPending(tc);
-    }
-
+    bool checkInterrupts(ThreadContext *tc) const;
 
     void
     serialize(CheckpointOut &cp) const override
-- 
cgit v1.2.3