diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-20 19:04:37 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-20 19:04:37 +0000 |
| commit | 0a971cc0c9a6302afb6da5d561b7df24f443eca4 (patch) | |
| tree | 4a56e8a6ee996bdf2381be4cbaf5f7c540d3af8e /src/cpu/o3/cpu.cc | |
| parent | a68ddf685c739220d09fdc44000dd217d0707f8e (diff) | |
| parent | 4a7bc06553577f25e8dc895fa20506c62455a4b6 (diff) | |
| download | gem5-0a971cc0c9a6302afb6da5d561b7df24f443eca4.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : f2fac2b1a09e709021cd8382a9fbe805df2177ef
Diffstat (limited to 'src/cpu/o3/cpu.cc')
| -rw-r--r-- | src/cpu/o3/cpu.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index a775b66d5..9e1b5d132 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -204,19 +204,17 @@ FullO3CPU<Impl>::FullO3CPU(O3CPU *o3_cpu, Params *params) _status = Idle; } - checker = NULL; - - if (params->checker) { #if USE_CHECKER + if (params->checker) { BaseCPU *temp_checker = params->checker; checker = dynamic_cast<Checker<DynInstPtr> *>(temp_checker); #if FULL_SYSTEM checker->setSystem(params->system); #endif -#else - panic("Checker enabled but not compiled in!"); -#endif // USE_CHECKER + } else { + checker = NULL; } +#endif // USE_CHECKER #if !FULL_SYSTEM thread.resize(number_of_threads); |