summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-02-23 15:06:06 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-02-23 15:06:06 -0500
commite1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79 (patch)
tree490fb46c6254fea699d419d58035a1e0b67eebdd /sim
parent99484cfae81f3f01ccdfcd273ddc2bdb41e6456b (diff)
parent1166d4f0bfe67a9dc178be3454b4f0eac38663ad (diff)
downloadgem5-e1c3acd91c65ae7d51a7d0b3c0f7be764b2c8f79.tar.xz
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.head cpu/simple/cpu.cc: remove initCPU from constructor dev/alpha_console.cc: we are panicing, so no need to return a fault --HG-- extra : convert_revision : 72389ea0c96e91a55f35b884200325224bfb6ed9
Diffstat (limited to 'sim')
-rw-r--r--sim/system.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/sim/system.cc b/sim/system.cc
index ebeb5b244..41de8cee4 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -307,11 +307,9 @@ System::registerExecContext(ExecContext *xc, int id)
void
System::startup()
{
- if (!execContexts.empty()) {
- // activate with zero delay so that we start ticking right
- // away on cycle 0
- execContexts[0]->activate(0);
- }
+ int i;
+ for (i = 0; i < execContexts.size(); i++)
+ execContexts[i]->activate(0);
}
void