diff options
| author | Miguel Serrano <mserrano@umich.edu> | 2005-07-01 15:12:09 -0400 |
|---|---|---|
| committer | Miguel Serrano <mserrano@umich.edu> | 2005-07-01 15:12:09 -0400 |
| commit | 4f2480a18bdf98792e2ebf3471ce7cd3109ef824 (patch) | |
| tree | b2d8d27e41eae3d659dbe6e6665436d02bcea429 /cpu/simple/cpu.cc | |
| parent | 16a2357e8637fed706a94ab0da6226df8a2e7f07 (diff) | |
| parent | efd0c5d4b04f630f1b591af509458224b6d98655 (diff) | |
| download | gem5-4f2480a18bdf98792e2ebf3471ce7cd3109ef824.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
--HG--
extra : convert_revision : bb3e977e79599c459fb32f309ce5b486f1639afa
Diffstat (limited to 'cpu/simple/cpu.cc')
| -rw-r--r-- | cpu/simple/cpu.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index de28913e4..1164e35a4 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -823,7 +823,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(SimpleCPU) SimObjectParam<AlphaDTB *> dtb; SimObjectParam<FunctionalMemory *> mem; SimObjectParam<System *> system; - Param<int> mult; + Param<int> cpu_id; #else SimObjectParam<Process *> workload; #endif // FULL_SYSTEM @@ -855,7 +855,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(SimpleCPU) INIT_PARAM(dtb, "Data TLB"), INIT_PARAM(mem, "memory"), INIT_PARAM(system, "system object"), - INIT_PARAM(mult, "system clock multiplier"), + INIT_PARAM(cpu_id, "processor ID"), #else INIT_PARAM(workload, "processes to run"), #endif // FULL_SYSTEM @@ -873,11 +873,6 @@ END_INIT_SIM_OBJECT_PARAMS(SimpleCPU) CREATE_SIM_OBJECT(SimpleCPU) { -#ifdef FULL_SYSTEM - if (mult != 1) - panic("processor clock multiplier must be 1\n"); -#endif - SimpleCPU::Params *params = new SimpleCPU::Params(); params->name = getInstanceName(); params->numberOfThreads = 1; @@ -898,6 +893,7 @@ CREATE_SIM_OBJECT(SimpleCPU) params->dtb = dtb; params->mem = mem; params->system = system; + params->cpu_id = cpu_id; #else params->process = workload; #endif |