diff options
author | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-21 16:50:38 -0500 |
---|---|---|
committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-21 16:50:38 -0500 |
commit | 9dd1ab1dba6f72f11ce4985a166cb1327eee3551 (patch) | |
tree | a9eed695686a885021901129a5fb91d02ca05b60 /cpu/base_cpu.hh | |
parent | f825d103daa2eeaa26549862cd57d870aa1cb448 (diff) | |
parent | 9b1e2db811f86d9911bacaad475d1fec70c4aecd (diff) | |
download | gem5-9dd1ab1dba6f72f11ce4985a166cb1327eee3551.tar.xz |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : db688679bfd9c670ef44611de71640c3bf564fc0
Diffstat (limited to 'cpu/base_cpu.hh')
-rw-r--r-- | cpu/base_cpu.hh | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/cpu/base_cpu.hh b/cpu/base_cpu.hh index 802da340b..f346f4ec5 100644 --- a/cpu/base_cpu.hh +++ b/cpu/base_cpu.hh @@ -91,28 +91,31 @@ class BaseCPU : public SimObject virtual void haltContext(int thread_num) {} public: - + struct Params + { + std::string name; + int numberOfThreads; + bool deferRegistration; + Counter max_insts_any_thread; + Counter max_insts_all_threads; + Counter max_loads_any_thread; + Counter max_loads_all_threads; + Tick freq; + bool functionTrace; + Tick functionTraceStart; #ifdef FULL_SYSTEM - BaseCPU(const std::string &_name, int _number_of_threads, bool _def_reg, - Counter max_insts_any_thread, Counter max_insts_all_threads, - Counter max_loads_any_thread, Counter max_loads_all_threads, - System *_system, Tick freq, - bool _function_trace = false, Tick _function_trace_start = 0); -#else - BaseCPU(const std::string &_name, int _number_of_threads, bool _def_reg, - Counter max_insts_any_thread = 0, - Counter max_insts_all_threads = 0, - Counter max_loads_any_thread = 0, - Counter max_loads_all_threads = 0, - bool _function_trace = false, Tick _function_trace_start = 0); + System *system; #endif + }; + + const Params *params; + BaseCPU(Params *params); virtual ~BaseCPU(); virtual void init(); virtual void regStats(); - bool deferRegistration; void registerExecContexts(); /// Prepare for another CPU to take over execution. When it is |