Fix up some merge problems.

src/base/traceflags.py:
    Remove BaseCPU traceflag.
src/cpu/o3/alpha/params.hh:
    Move non-Alpha specific parameters out of this params class.
src/cpu/o3/params.hh:
    Move non-Alpha specific params into this params class.

--HG--
extra : convert_revision : e5b652adb47a240376733400e6054c66c50bd514
This commit is contained in:
Kevin Lim 2006-07-05 16:54:24 -04:00
parent b973fae85d
commit ea9697250c
3 changed files with 16 additions and 14 deletions

View file

@ -51,7 +51,6 @@ baseFlags = [
'Activity',
'AlphaConsole',
'BADADDR',
'BaseCPU',
'BE',
'BPredRAS',
'Bus',

View file

@ -54,19 +54,7 @@ class AlphaSimpleParams : public O3Params
#if FULL_SYSTEM
AlphaITB *itb;
AlphaDTB *dtb;
#else
std::vector<Process *> workload;
Process *process;
#endif // FULL_SYSTEM
MemObject *mem;
BaseCPU *checker;
unsigned decodeToFetchDelay;
unsigned dispatchWidth;
unsigned wbWidth;
unsigned wbDepth;
#endif
};
#endif // __CPU_O3_ALPHA_PARAMS_HH__

View file

@ -46,6 +46,18 @@ class O3Params : public BaseO3CPU::Params
public:
unsigned activity;
//
// Pointers to key objects
//
#if !FULL_SYSTEM
std::vector<Process *> workload;
Process *process;
#endif // FULL_SYSTEM
MemObject *mem;
BaseCPU *checker;
//
// Caches
//
@ -86,7 +98,10 @@ class O3Params : public BaseO3CPU::Params
unsigned commitToIEWDelay;
unsigned renameToIEWDelay;
unsigned issueToExecuteDelay;
unsigned dispatchWidth;
unsigned issueWidth;
unsigned wbWidth;
unsigned wbDepth;
FUPool *fuPool;
//