summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-11-23 10:46:24 -0500
committerSteve Reinhardt <stever@eecs.umich.edu>2006-11-23 10:46:24 -0500
commit3dbb70dd2536bf1451620f48208af461bfcc996a (patch)
treefcd7b6b5e1602edefe75b4b7d3a447598c65ecea /src/arch
parent6fa5c7af9528a2f542fb791e808ea3618ec1114b (diff)
parent28fd4ab39fe7991d335e8496ed2b3434db61140d (diff)
downloadgem5-3dbb70dd2536bf1451620f48208af461bfcc996a.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head --HG-- extra : convert_revision : 154bc605c62b1e51c32e65916d4c2eda3a3f22fd
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/alpha/interrupts.hh3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/arch/alpha/interrupts.hh b/src/arch/alpha/interrupts.hh
index a86fb2d7b..388ccacde 100644
--- a/src/arch/alpha/interrupts.hh
+++ b/src/arch/alpha/interrupts.hh
@@ -138,9 +138,8 @@ namespace AlphaISA
}
if (ipl && ipl > tc->readMiscReg(IPR_IPLR)) {
-// assert(!newInfoSet);
newIpl = ipl;
- newSummary = newSummary;
+ newSummary = summary;
newInfoSet = true;
DPRINTF(Flow, "Interrupt! IPLR=%d ipl=%d summary=%x\n",
tc->readMiscReg(IPR_IPLR), ipl, summary);