diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-11-10 18:37:33 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-11-10 18:37:33 -0500 |
| commit | ab8409738e0c5279f1900e81e8024deb72b25226 (patch) | |
| tree | cdc6f1676b0a4faba383af8a2928c49101932ac7 /cpu/simple_cpu/simple_cpu.cc | |
| parent | 82638c2e98e8daa54124b0a5f368a6920485801a (diff) | |
| parent | 4328480b5602decbcc7239e1884324ce23eaa3ec (diff) | |
| download | gem5-ab8409738e0c5279f1900e81e8024deb72b25226.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision : 64eca6a11aeae236e802f9ca8eb97ca05d394ec7
Diffstat (limited to 'cpu/simple_cpu/simple_cpu.cc')
| -rw-r--r-- | cpu/simple_cpu/simple_cpu.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc index 6af67eee0..04783574f 100644 --- a/cpu/simple_cpu/simple_cpu.cc +++ b/cpu/simple_cpu/simple_cpu.cc @@ -641,13 +641,11 @@ SimpleCPU::tick() Fault fault = No_Fault; #ifdef FULL_SYSTEM - if (AlphaISA::check_interrupts && - xc->cpu->check_interrupts() && - !PC_PAL(xc->regs.pc) && + if (checkInterrupts && check_interrupts() && !xc->inPalMode() && status() != IcacheMissComplete) { int ipl = 0; int summary = 0; - AlphaISA::check_interrupts = 0; + checkInterrupts = false; IntReg *ipr = xc->regs.ipr; if (xc->regs.ipr[TheISA::IPR_SIRR]) { |