diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-06-30 20:51:07 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-06-30 20:51:07 -0400 |
| commit | ed821702e02b9c02c3b5f18dc61dad1f0fbc7164 (patch) | |
| tree | e299605370852ed8331e512b92590f0fcd875f9d /src/cpu/o3/cpu.cc | |
| parent | 7a4929813423c6f72827c58453cb9bd591f1801c (diff) | |
| parent | 51261196bde3403544631cdb4895c2d2a51c3f1e (diff) | |
| download | gem5-ed821702e02b9c02c3b5f18dc61dad1f0fbc7164.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 : 3c1405d8b4831c6240e02ba65a72043ca55f4a46
Diffstat (limited to 'src/cpu/o3/cpu.cc')
| -rw-r--r-- | src/cpu/o3/cpu.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 553399048..87fee8361 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -41,8 +41,7 @@ #include "cpu/activity.hh" #include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" -#include "cpu/o3/alpha_dyn_inst.hh" -#include "cpu/o3/alpha_impl.hh" +#include "cpu/o3/isa_specific.hh" #include "cpu/o3/cpu.hh" #include "sim/root.hh" @@ -1212,4 +1211,4 @@ FullO3CPU<Impl>::updateThreadPriority() } // Forward declaration of FullO3CPU. -template class FullO3CPU<AlphaSimpleImpl>; +template class FullO3CPU<O3CPUImpl>; |