From ac778b1d02b0e7674811ab2a7463add16a430b36 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Fri, 29 Mar 2013 14:05:26 -0500 Subject: o3cpu: commit: changes interrupt handling Currently the commit stage keeps a local copy of the interrupt object. Since the interrupt is usually handled several cycles after the commit stage becomes aware of it, it is possible that the local copy of the interrupt object may not be the interrupt that is actually handled. It is possible that another interrupt occurred in the interval between interrupt detection and interrupt handling. This patch creates a copy of the interrupt just before the interrupt is handled. The local copy is ignored. --- src/cpu/o3/commit_impl.hh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index c7b255123..2c1c9fef2 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -752,8 +752,10 @@ DefaultCommit::handleInterrupt() cpu->checker->handlePendingInt(); } - // CPU will handle interrupt. - cpu->processInterrupts(interrupt); + // CPU will handle interrupt. Note that we ignore the local copy of + // interrupt. This is because the local copy may no longer be the + // interrupt that the interrupt controller thinks is being handled. + cpu->processInterrupts(cpu->getInterrupts()); thread[0]->noSquashFromTC = false; -- cgit v1.2.3