Basic cleanup pass to get rid of a few things that made the Python
configuration unnecessarily awkward. Biggest changes are:
- External and internal object names now match in all cases. The
macros still allow them to be different; the only reason I didn't
get rid of that is that the macros themselves should be going away
soon. In the few conflicting cases, I sometimes renamed the C++ object
and sometimes renamed the config object. The latter sets of substitions
are:
s/BaseBus/Bus/;
s/MemoryObject/FunctionalMemory/;
s/MemoryControl/MemoryController/;
s/FUPool/FuncUnitPool/;
- SamplingCPU is temporarily broken... we need to change the model
of how this works in the .ini file. Having it as a CPU proxy is
really awkward.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
cpu/simple_cpu/simple_cpu.cc:
sim/process.cc:
Rename objects to match config name.
cpu/base_cpu.cc:
Uncomment SimObject define since SamplingCPU no longer
does this for us.
dev/ethertap.cc:
Use unsigned instead of uint16_t for params.
kern/tru64/tru64_system.cc:
Use unsigned instead of uint64_t for init_param param.
test/paramtest.cc:
Fix old SimObjectParam.
--HG--
extra : convert_revision : 378ebbc6a71ad0694501d09979a44d111a59e8dc
This commit is contained in:
@@ -237,10 +237,4 @@ BaseCPU::clear_interrupts()
|
||||
|
||||
#endif // FULL_SYSTEM
|
||||
|
||||
//
|
||||
// This declaration is not needed now that SamplingCPU provides a
|
||||
// BaseCPUBuilder object.
|
||||
//
|
||||
#if 0
|
||||
DEFINE_SIM_OBJECT_CLASS_NAME("BaseCPU", BaseCPU)
|
||||
#endif
|
||||
|
||||
@@ -116,7 +116,7 @@ SimpleCPU::SimpleCPU(const string &_name,
|
||||
Counter max_insts_all_threads,
|
||||
Counter max_loads_any_thread,
|
||||
Counter max_loads_all_threads,
|
||||
AlphaItb *itb, AlphaDtb *dtb,
|
||||
AlphaITB *itb, AlphaDTB *dtb,
|
||||
FunctionalMemory *mem,
|
||||
MemInterface *icache_interface,
|
||||
MemInterface *dcache_interface,
|
||||
@@ -778,8 +778,8 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(SimpleCPU)
|
||||
Param<Counter> max_loads_all_threads;
|
||||
|
||||
#ifdef FULL_SYSTEM
|
||||
SimObjectParam<AlphaItb *> itb;
|
||||
SimObjectParam<AlphaDtb *> dtb;
|
||||
SimObjectParam<AlphaITB *> itb;
|
||||
SimObjectParam<AlphaDTB *> dtb;
|
||||
SimObjectParam<FunctionalMemory *> mem;
|
||||
SimObjectParam<System *> system;
|
||||
Param<int> mult;
|
||||
@@ -852,11 +852,7 @@ CREATE_SIM_OBJECT(SimpleCPU)
|
||||
defer_registration);
|
||||
|
||||
#endif // FULL_SYSTEM
|
||||
#if 0
|
||||
if (!defer_registration) {
|
||||
cpu->registerExecContexts();
|
||||
}
|
||||
#endif
|
||||
|
||||
return cpu;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user