diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-07-26 03:48:48 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-07-26 03:48:48 -0400 |
| commit | 36e9ca5611b3fb38cba2fc190836c022d99973e4 (patch) | |
| tree | eb8993d3529364489bc8ec68fbdabde515be24f5 /src/cpu/o3/inst_queue_impl.hh | |
| parent | e803c8a9120b1d7f30490703d1ff84bcbcb8deed (diff) | |
| parent | 6e969c31c7c0671ce201f40dd67afad2e9fee832 (diff) | |
| download | gem5-36e9ca5611b3fb38cba2fc190836c022d99973e4.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 3bb2cdd9b286e7f0235fb5fd5099b89775e05a10
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) { |