diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-07-05 16:01:38 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-07-05 16:01:38 -0400 |
commit | ec72f6534c2bb6aada305815fb306680508d7a7c (patch) | |
tree | 1886edde38b2da28cb45f4e13135b1993502f45d /src/cpu/o3/base_dyn_inst.cc | |
parent | c33b5b3fc469e8f4885254122e60d781dcb11687 (diff) | |
parent | 4201ec84b2dd7d96148bf661124dd7b5d0e7204b (diff) | |
download | gem5-ec72f6534c2bb6aada305815fb306680508d7a7c.tar.xz |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
--HG--
extra : convert_revision : f5b6daa2d512f38153246fc9a39cc6560d939ebc
Diffstat (limited to 'src/cpu/o3/base_dyn_inst.cc')
-rw-r--r-- | src/cpu/o3/base_dyn_inst.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cpu/o3/base_dyn_inst.cc b/src/cpu/o3/base_dyn_inst.cc index 1f7540d6a..0979c5c8f 100644 --- a/src/cpu/o3/base_dyn_inst.cc +++ b/src/cpu/o3/base_dyn_inst.cc @@ -29,12 +29,11 @@ */ #include "cpu/base_dyn_inst_impl.hh" -#include "cpu/o3/alpha_cpu.hh" -#include "cpu/o3/alpha_impl.hh" +#include "cpu/o3/isa_specific.hh" // Explicit instantiation -template class BaseDynInst<AlphaSimpleImpl>; +template class BaseDynInst<O3CPUImpl>; template <> int -BaseDynInst<AlphaSimpleImpl>::instcount = 0; +BaseDynInst<O3CPUImpl>::instcount = 0; |