Some minor cleanups.

src/cpu/SConscript:
    Change the error message to be slightly nicer.
src/cpu/o3/commit.hh:
    Remove old code.
src/cpu/o3/commit_impl.hh:
    Remove old unused code.

--HG--
extra : convert_revision : 48aa430e1f3554007dd5e4f3d9e89b5e4f124390
This commit is contained in:
Kevin Lim 2006-07-10 15:41:28 -04:00
parent fcaafdc48c
commit f60d8217e3
3 changed files with 5 additions and 28 deletions

View file

@ -188,9 +188,10 @@ if env['USE_CHECKER']:
if i in env['CPU_MODELS']: if i in env['CPU_MODELS']:
checker_supports = True checker_supports = True
if not checker_supports: if not checker_supports:
print "Checker only supports CPU models %s, please " \ print "Checker only supports CPU models",
"set USE_CHECKER=False or use one of those CPU models" \ for i in CheckerSupportedCPUList:
% CheckerSupportedCPUList print i,
print ", please set USE_CHECKER=False or use one of those CPU models"
Exit(1) Exit(1)

View file

@ -162,10 +162,6 @@ class DefaultCommit
/** Sets the pointer to the queue coming from IEW. */ /** Sets the pointer to the queue coming from IEW. */
void setIEWQueue(TimeBuffer<IEWStruct> *iq_ptr); void setIEWQueue(TimeBuffer<IEWStruct> *iq_ptr);
void setFetchStage(Fetch *fetch_stage);
Fetch *fetchStage;
/** Sets the pointer to the IEW stage. */ /** Sets the pointer to the IEW stage. */
void setIEWStage(IEW *iew_stage); void setIEWStage(IEW *iew_stage);
@ -335,10 +331,6 @@ class DefaultCommit
/** Vector of all of the threads. */ /** Vector of all of the threads. */
std::vector<Thread *> thread; std::vector<Thread *> thread;
Fault fetchFault;
int fetchTrapWait;
/** Records that commit has written to the time buffer this cycle. Used for /** Records that commit has written to the time buffer this cycle. Used for
* the CPU to determine if it can deschedule itself if there is no activity. * the CPU to determine if it can deschedule itself if there is no activity.
*/ */
@ -397,10 +389,6 @@ class DefaultCommit
*/ */
Tick trapLatency; Tick trapLatency;
Tick fetchTrapLatency;
Tick fetchFaultTick;
/** The commit PC of each thread. Refers to the instruction that /** The commit PC of each thread. Refers to the instruction that
* is currently being processed/committed. * is currently being processed/committed.
*/ */

View file

@ -82,8 +82,7 @@ DefaultCommit<Impl>::DefaultCommit(Params *params)
numThreads(params->numberOfThreads), numThreads(params->numberOfThreads),
drainPending(false), drainPending(false),
switchedOut(false), switchedOut(false),
trapLatency(params->trapLatency), trapLatency(params->trapLatency)
fetchTrapLatency(params->fetchTrapLatency)
{ {
_status = Active; _status = Active;
_nextStatus = Inactive; _nextStatus = Inactive;
@ -123,9 +122,6 @@ DefaultCommit<Impl>::DefaultCommit(Params *params)
tcSquash[i] = false; tcSquash[i] = false;
PC[i] = nextPC[i] = 0; PC[i] = nextPC[i] = 0;
} }
fetchFaultTick = 0;
fetchTrapWait = 0;
} }
template <class Impl> template <class Impl>
@ -235,7 +231,6 @@ DefaultCommit<Impl>::setCPU(O3CPU *cpu_ptr)
cpu->activateStage(O3CPU::CommitIdx); cpu->activateStage(O3CPU::CommitIdx);
trapLatency = cpu->cycles(trapLatency); trapLatency = cpu->cycles(trapLatency);
fetchTrapLatency = cpu->cycles(fetchTrapLatency);
} }
template <class Impl> template <class Impl>
@ -292,13 +287,6 @@ DefaultCommit<Impl>::setIEWQueue(TimeBuffer<IEWStruct> *iq_ptr)
fromIEW = iewQueue->getWire(-iewToCommitDelay); fromIEW = iewQueue->getWire(-iewToCommitDelay);
} }
template <class Impl>
void
DefaultCommit<Impl>::setFetchStage(Fetch *fetch_stage)
{
fetchStage = fetch_stage;
}
template <class Impl> template <class Impl>
void void
DefaultCommit<Impl>::setIEWStage(IEW *iew_stage) DefaultCommit<Impl>::setIEWStage(IEW *iew_stage)