diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-05-09 22:04:58 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-05-09 22:04:58 -0700 |
| commit | 6d199f0b25e2e8c46f626187bb6f5f06d7bcc55c (patch) | |
| tree | 3ba190ad2fdd26122e4b9047a88e1e18957fe44c /src/cpu/o3/inst_queue_impl.hh | |
| parent | e08a5c60524d9e8d9a84d661c9464e3fe1289e2f (diff) | |
| parent | 4ad1b58fdd7cc9ba9704ae966a41c99fd0f1dbc9 (diff) | |
| download | gem5-6d199f0b25e2e8c46f626187bb6f5f06d7bcc55c.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into doughnut.mwconnections.com:/home/gblack/newmem-o3-micro
--HG--
extra : convert_revision : 56c2205cdbb9af64c30b381a80b4d14c97841da7
Diffstat (limited to 'src/cpu/o3/inst_queue_impl.hh')
| -rw-r--r-- | src/cpu/o3/inst_queue_impl.hh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh index 10c3287f2..bdf5f07aa 100644 --- a/src/cpu/o3/inst_queue_impl.hh +++ b/src/cpu/o3/inst_queue_impl.hh @@ -1005,11 +1005,7 @@ InstructionQueue<Impl>::squash(unsigned tid) // Read instruction sequence number of last instruction out of the // time buffer. -#if ISA_HAS_DELAY_SLOT - squashedSeqNum[tid] = fromCommit->commitInfo[tid].bdelayDoneSeqNum; -#else squashedSeqNum[tid] = fromCommit->commitInfo[tid].doneSeqNum; -#endif // Call doSquash if there are insts in the IQ if (count[tid] > 0) { |