diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-06-29 11:17:12 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-06-29 11:17:12 -0400 |
| commit | eaeb1b6ff084b4797a31908fa5fb1d688c55dd60 (patch) | |
| tree | 7a8e4d4bcd25f2f51c1020fedeff0f47449fd0c9 /cpu/o3/alpha_cpu_builder.cc | |
| parent | bc76a807af2a2a874be461f0c6be9a6c5ec8bfad (diff) | |
| parent | 8a0bc840221cf7af4845f4ee44de11bc7271ff10 (diff) | |
| download | gem5-eaeb1b6ff084b4797a31908fa5fb1d688c55dd60.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision : a27bb3737d8a7d5c1fadf27f4cb5018d0b6054da
Diffstat (limited to 'cpu/o3/alpha_cpu_builder.cc')
| -rw-r--r-- | cpu/o3/alpha_cpu_builder.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpu/o3/alpha_cpu_builder.cc b/cpu/o3/alpha_cpu_builder.cc index 57061c052..57c567471 100644 --- a/cpu/o3/alpha_cpu_builder.cc +++ b/cpu/o3/alpha_cpu_builder.cc @@ -71,9 +71,9 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(DerivAlphaFullCPU) #ifdef FULL_SYSTEM SimObjectParam<System *> system; +Param<int> cpu_id; SimObjectParam<AlphaITB *> itb; SimObjectParam<AlphaDTB *> dtb; -Param<int> mult; #else SimObjectVectorParam<Process *> workload; #endif // FULL_SYSTEM @@ -164,9 +164,9 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(DerivAlphaFullCPU) #ifdef FULL_SYSTEM INIT_PARAM(system, "System object"), + INIT_PARAM(cpu_id, "processor ID"), INIT_PARAM(itb, "Instruction translation buffer"), INIT_PARAM(dtb, "Data translation buffer"), - INIT_PARAM(mult, "System clock multiplier"), #else INIT_PARAM(workload, "Processes to run"), #endif // FULL_SYSTEM @@ -274,9 +274,6 @@ CREATE_SIM_OBJECT(DerivAlphaFullCPU) DerivAlphaFullCPU *cpu; #ifdef FULL_SYSTEM - if (mult != 1) - panic("Processor clock multiplier must be 1?\n"); - // Full-system only supports a single thread for the moment. int actual_num_threads = 1; #else @@ -300,6 +297,7 @@ CREATE_SIM_OBJECT(DerivAlphaFullCPU) #ifdef FULL_SYSTEM params.system = system; + params.cpu_id = cpu_id; params.itb = itb; params.dtb = dtb; #else |