summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-03-01 18:45:50 -0500
committerSteve Reinhardt <stever@eecs.umich.edu>2006-03-01 18:45:50 -0500
commit22504f8b48978be286d98be0df72d015ab6ff559 (patch)
tree40b1c96f1c36865abf1171913f1efcd168e63251 /cpu
parent31fc398f0641a9dcc9757520e9dc7fd2cce102fb (diff)
downloadgem5-22504f8b48978be286d98be0df72d015ab6ff559.tar.xz
More progress toward actually running a program.
See configs/test.py for test config (using simple binary in my home directory on zizzer). base/chunk_generator.hh: Fix assertion for chunkSize == 0 (not a power of 2) base/intmath.hh: Fix roundDown to take integer alignments. cpu/base.cc: Register exec contexts regardless of state (not sure why this check was in here in the first place). mem/physical.cc: Add breaks to switch. python/m5/objects/BaseCPU.py: Default mem to Parent.any (e.g. get from System). python/m5/objects/Ethernet.py: python/m5/objects/Root.py: HierParams is gone. python/m5/objects/PhysicalMemory.py: mmu param is full-system only. sim/process.cc: Stack mapping request must be page-aligned and page-sized. Don't delete objFile object in create since we are counting on it being around for startup(). --HG-- extra : convert_revision : 90c43ee927e7d82a045d6e10302d965797d006f7
Diffstat (limited to 'cpu')
-rw-r--r--cpu/base.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/cpu/base.cc b/cpu/base.cc
index 64ea9aaa8..154143712 100644
--- a/cpu/base.cc
+++ b/cpu/base.cc
@@ -212,17 +212,15 @@ BaseCPU::registerExecContexts()
for (int i = 0; i < execContexts.size(); ++i) {
ExecContext *xc = execContexts[i];
- if (xc->status() == ExecContext::Suspended) {
#if FULL_SYSTEM
- int id = params->cpu_id;
- if (id != -1)
- id += i;
+ int id = params->cpu_id;
+ if (id != -1)
+ id += i;
- xc->cpu_id = system->registerExecContext(xc, id);
+ xc->cpu_id = system->registerExecContext(xc, id);
#else
- xc->cpu_id = xc->process->registerExecContext(xc);
+ xc->cpu_id = xc->process->registerExecContext(xc);
#endif
- }
}
}