summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-10-02 18:33:57 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-10-02 18:33:57 -0700
commit7571e8346d0ebbc38806c30a75dbcf298d50f08e (patch)
treeee99d978950c13eb66cdd22f8d859ef0193a452f
parent8ca7feb726b2a5524307a7a77cd51ad4ecb9eec7 (diff)
downloadgem5-7571e8346d0ebbc38806c30a75dbcf298d50f08e.tar.xz
CPU: Make the cpuid parameter get set in SE mode as well.
--HG-- extra : convert_revision : bc47206acb683ebaaa31f57af79b4b8db64e4d31
-rw-r--r--src/cpu/o3/checker_builder.cc2
-rw-r--r--src/cpu/ozone/checker_builder.cc2
-rw-r--r--src/cpu/ozone/cpu_builder.cc2
-rw-r--r--src/cpu/ozone/simple_cpu_builder.cc3
4 files changed, 4 insertions, 5 deletions
diff --git a/src/cpu/o3/checker_builder.cc b/src/cpu/o3/checker_builder.cc
index baa604962..b9afb3f9f 100644
--- a/src/cpu/o3/checker_builder.cc
+++ b/src/cpu/o3/checker_builder.cc
@@ -89,8 +89,8 @@ O3CheckerParams::create()
params->itb = itb;
params->dtb = dtb;
params->system = system;
-#if FULL_SYSTEM
params->cpu_id = cpu_id;
+#if FULL_SYSTEM
params->profile = profile;
#else
params->process = workload;
diff --git a/src/cpu/ozone/checker_builder.cc b/src/cpu/ozone/checker_builder.cc
index eacec6461..37b9f951a 100644
--- a/src/cpu/ozone/checker_builder.cc
+++ b/src/cpu/ozone/checker_builder.cc
@@ -90,8 +90,8 @@ OzoneCheckerParams::create()
params->itb = itb;
params->dtb = dtb;
params->system = system;
-#if FULL_SYSTEM
params->cpu_id = cpu_id;
+#if FULL_SYSTEM
params->profile = profile;
#else
params->process = workload;
diff --git a/src/cpu/ozone/cpu_builder.cc b/src/cpu/ozone/cpu_builder.cc
index 927370339..beb179d41 100644
--- a/src/cpu/ozone/cpu_builder.cc
+++ b/src/cpu/ozone/cpu_builder.cc
@@ -83,8 +83,8 @@ DerivOzoneCPUParams::create()
params->dtb = dtb;
params->system = system;
-#if FULL_SYSTEM
params->cpu_id = cpu_id;
+#if FULL_SYSTEM
params->profile = profile;
params->do_quiesce = do_quiesce;
params->do_checkpoint_insts = do_checkpoint_insts;
diff --git a/src/cpu/ozone/simple_cpu_builder.cc b/src/cpu/ozone/simple_cpu_builder.cc
index 23f5455e4..9cd56fdb4 100644
--- a/src/cpu/ozone/simple_cpu_builder.cc
+++ b/src/cpu/ozone/simple_cpu_builder.cc
@@ -86,9 +86,8 @@ SimpleOzoneCPUParams::create()
params->dtb = dtb;
params->system = system;
-#if FULL_SYSTEM
params->cpu_id = cpu_id;
-#else
+#if !FULL_SYSTEM
params->workload = workload;
// params->pTable = page_table;
#endif // FULL_SYSTEM