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/rename.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/rename.hh')
-rw-r--r-- | src/cpu/o3/rename.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cpu/o3/rename.hh b/src/cpu/o3/rename.hh index 034087feb..ba26a01dd 100644 --- a/src/cpu/o3/rename.hh +++ b/src/cpu/o3/rename.hh @@ -76,6 +76,7 @@ class DefaultRename // using a list instead of a queue. (Most other stages use a // queue) typedef std::list<DynInstPtr> InstQueue; + typedef typename std::list<DynInstPtr>::iterator ListIt; public: /** Overall rename status. Used to determine if the CPU can @@ -170,7 +171,7 @@ class DefaultRename void takeOverFrom(); /** Squashes all instructions in a thread. */ - void squash(unsigned tid); + void squash(const InstSeqNum &squash_seq_num, unsigned tid); /** Ticks rename, which processes all input signals and attempts to rename * as many instructions as possible. @@ -222,7 +223,7 @@ class DefaultRename bool unblock(unsigned tid); /** Executes actual squash, removing squashed instructions. */ - void doSquash(unsigned tid); + void doSquash(const InstSeqNum &squash_seq_num, unsigned tid); /** Removes a committed instruction's rename history. */ void removeFromHistory(InstSeqNum inst_seq_num, unsigned tid); |