diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-07-23 13:41:53 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-07-23 13:41:53 -0400 |
| commit | 6e969c31c7c0671ce201f40dd67afad2e9fee832 (patch) | |
| tree | 1a7a5bc1e52dd54ff3319837fa87c018d8dd08b0 /src/cpu/o3/inst_queue_impl.hh | |
| parent | f9729e999f71895f6b53f8189bdff535e7c7b70e (diff) | |
| parent | 19ca97af79f3a40111991b4f8375592c7ede65fa (diff) | |
| download | gem5-6e969c31c7c0671ce201f40dd67afad2e9fee832.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3
--HG--
extra : convert_revision : be1e5dcb1c5025db8526e628c2060b1790d38227
Diffstat (limited to 'src/cpu/o3/inst_queue_impl.hh')
| -rw-r--r-- | src/cpu/o3/inst_queue_impl.hh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh index 36e0842be..8faae3ebf 100644 --- a/src/cpu/o3/inst_queue_impl.hh +++ b/src/cpu/o3/inst_queue_impl.hh @@ -993,7 +993,11 @@ InstructionQueue<Impl>::squash(unsigned tid) // Read instruction sequence number of last instruction out of the // time buffer. +#if THE_ISA == ALPHA_ISA squashedSeqNum[tid] = fromCommit->commitInfo[tid].doneSeqNum; +#else + squashedSeqNum[tid] = fromCommit->commitInfo[tid].bdelayDoneSeqNum; +#endif // Call doSquash if there are insts in the IQ if (count[tid] > 0) { |