diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-02-22 16:03:30 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-02-22 16:03:30 -0500 |
| commit | e8a564b0fdd8c5b6ae8f73613e3ad25005556ec5 (patch) | |
| tree | fe9cd45b453f15fb3d903572edc754489be04016 /cpu/trace/trace_cpu.hh | |
| parent | 79e83cea971bf346a5b0d6e88541e502a614c777 (diff) | |
| parent | 884a8de50955422f3691496c19bf582c0f8f5e32 (diff) | |
| download | gem5-e8a564b0fdd8c5b6ae8f73613e3ad25005556ec5.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : 8a558785c64b7c33e64523d3d887ea6e760c3d2b
Diffstat (limited to 'cpu/trace/trace_cpu.hh')
| -rw-r--r-- | cpu/trace/trace_cpu.hh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpu/trace/trace_cpu.hh b/cpu/trace/trace_cpu.hh index 1711646a8..cdac4bb4f 100644 --- a/cpu/trace/trace_cpu.hh +++ b/cpu/trace/trace_cpu.hh @@ -32,14 +32,14 @@ * provided memory hierarchy. */ -#ifndef __TRACE_CPU_HH__ -#define __TRACE_CPU_HH__ +#ifndef __CPU_TRACE_TRACE_CPU_HH__ +#define __CPU_TRACE_TRACE_CPU_HH__ #include <string> -#include "cpu/base_cpu.hh" #include "mem/mem_req.hh" // for MemReqPtr #include "sim/eventq.hh" // for Event +#include "sim/sim_object.hh" // Forward declaration. class MemInterface; @@ -48,8 +48,9 @@ class MemTraceReader; /** * A cpu object for running memory traces through a memory hierarchy. */ -class TraceCPU : public BaseCPU +class TraceCPU : public SimObject { + private: /** Interface for instruction trace requests, if any. */ MemInterface *icacheInterface; /** Interface for data trace requests, if any. */ @@ -133,5 +134,5 @@ class TraceCompleteEvent : public Event virtual const char *description(); }; -#endif //__TRACE_CPU_HH__ +#endif // __CPU_TRACE_TRACE_CPU_HH__ |