diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-06-12 00:49:24 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-06-12 00:49:24 -0400 |
| commit | 15a8f050605919579e81b6abb98a0b596334216d (patch) | |
| tree | 583b0b30f13d9874a69015d58d041ce2d7352960 /src/cpu/o3/inst_queue.cc | |
| parent | 60a734e1750f3c051fe92fea6f12158db6e2dcb9 (diff) | |
| parent | df4b4f001e4db902297acf3b75480e4886e4e882 (diff) | |
| download | gem5-15a8f050605919579e81b6abb98a0b596334216d.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
src/arch/sparc/regfile.hh:
Hand Merge
--HG--
extra : convert_revision : c47202689202069892524a7d71962082469996ee
Diffstat (limited to 'src/cpu/o3/inst_queue.cc')
| -rw-r--r-- | src/cpu/o3/inst_queue.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cpu/o3/inst_queue.cc b/src/cpu/o3/inst_queue.cc index 2ff2282b4..f2c6b8213 100644 --- a/src/cpu/o3/inst_queue.cc +++ b/src/cpu/o3/inst_queue.cc @@ -24,6 +24,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: Kevin Lim */ #include "cpu/o3/alpha_dyn_inst.hh" @@ -32,7 +34,3 @@ // Force instantiation of InstructionQueue. template class InstructionQueue<AlphaSimpleImpl>; - -template<> -unsigned -InstructionQueue<AlphaSimpleImpl>::DependencyEntry::mem_alloc_counter = 0; |