diff options
Diffstat (limited to 'src/cpu/o3')
| -rw-r--r-- | src/cpu/o3/commit_impl.hh | 7 | ||||
| -rw-r--r-- | src/cpu/o3/inst_queue_impl.hh | 5 | ||||
| -rw-r--r-- | src/cpu/o3/lsq_impl.hh | 5 | ||||
| -rw-r--r-- | src/cpu/o3/rob_impl.hh | 5 |
4 files changed, 13 insertions, 9 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index 8fd142c08..4775e98d1 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -49,8 +49,9 @@ #include <string> #include "arch/utility.hh" -#include "base/loader/symtab.hh" #include "base/cp_annotate.hh" +#include "base/loader/symtab.hh" +#include "base/logging.hh" #include "config/the_isa.hh" #include "cpu/checker/cpu.hh" #include "cpu/o3/commit.hh" @@ -127,8 +128,8 @@ DefaultCommit<Impl>::DefaultCommit(O3CPU *_cpu, DerivO3CPUParams *params) DPRINTF(Commit,"Commit Policy set to Oldest Ready."); } else { - assert(0 && "Invalid SMT Commit Policy. Options Are: {Aggressive," - "RoundRobin,OldestReady}"); + panic("Invalid SMT commit policy. Options are: Aggressive, " + "RoundRobin, OldestReady"); } for (ThreadID tid = 0; tid < numThreads; tid++) { diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh index bc4822ba7..410c15ffa 100644 --- a/src/cpu/o3/inst_queue_impl.hh +++ b/src/cpu/o3/inst_queue_impl.hh @@ -48,6 +48,7 @@ #include <limits> #include <vector> +#include "base/logging.hh" #include "cpu/o3/fu_pool.hh" #include "cpu/o3/inst_queue.hh" #include "debug/IQ.hh" @@ -162,8 +163,8 @@ InstructionQueue<Impl>::InstructionQueue(O3CPU *cpu_ptr, IEW *iew_ptr, DPRINTF(IQ, "IQ sharing policy set to Threshold:" "%i entries per thread.\n",thresholdIQ); } else { - assert(0 && "Invalid IQ Sharing Policy.Options Are:{Dynamic," - "Partitioned, Threshold}"); + panic("Invalid IQ sharing policy. Options are: Dynamic, " + "Partitioned, Threshold"); } } diff --git a/src/cpu/o3/lsq_impl.hh b/src/cpu/o3/lsq_impl.hh index 967a496f6..83de8ddff 100644 --- a/src/cpu/o3/lsq_impl.hh +++ b/src/cpu/o3/lsq_impl.hh @@ -48,6 +48,7 @@ #include <list> #include <string> +#include "base/logging.hh" #include "cpu/o3/lsq.hh" #include "debug/Drain.hh" #include "debug/Fetch.hh" @@ -109,8 +110,8 @@ LSQ<Impl>::LSQ(O3CPU *cpu_ptr, IEW *iew_ptr, DerivO3CPUParams *params) "%i entries per LQ | %i entries per SQ\n", maxLQEntries,maxSQEntries); } else { - assert(0 && "Invalid LSQ Sharing Policy.Options Are:{Dynamic," - "Partitioned, Threshold}"); + panic("Invalid LSQ sharing policy. Options are: Dynamic, " + "Partitioned, Threshold"); } //Initialize LSQs diff --git a/src/cpu/o3/rob_impl.hh b/src/cpu/o3/rob_impl.hh index 223f94caa..991dc967d 100644 --- a/src/cpu/o3/rob_impl.hh +++ b/src/cpu/o3/rob_impl.hh @@ -46,6 +46,7 @@ #include <list> +#include "base/logging.hh" #include "cpu/o3/rob.hh" #include "debug/Fetch.hh" #include "debug/ROB.hh" @@ -99,8 +100,8 @@ ROB<Impl>::ROB(O3CPU *_cpu, DerivO3CPUParams *params) maxEntries[tid] = threshold; } } else { - assert(0 && "Invalid ROB Sharing Policy.Options Are:{Dynamic," - "Partitioned, Threshold}"); + panic("Invalid ROB sharing policy. Options are: Dynamic, " + "Partitioned, Threshold"); } resetState(); |