diff options
| author | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-01-07 13:05:45 -0500 |
|---|---|---|
| committer | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-01-07 13:05:45 -0500 |
| commit | 2cfe62adc4f9206f616669a103133b906f705e8b (patch) | |
| tree | 8dc7c3253a50302aecd990182f562c779cf02b85 /src/cpu/simple | |
| parent | f7da0fddd1506c9fe2325c1720bf08635ac7db05 (diff) | |
| download | gem5-2cfe62adc4f9206f616669a103133b906f705e8b.tar.xz | |
cpu: Rename defer_registration->switched_out
The defer_registration parameter is used to prevent a CPU from
initializing at startup, leaving it in the "switched out" mode. The
name of this parameter (and the help string) is confusing. This patch
renames it to switched_out, which should be more descriptive.
Diffstat (limited to 'src/cpu/simple')
| -rw-r--r-- | src/cpu/simple/atomic.cc | 4 | ||||
| -rw-r--r-- | src/cpu/simple/timing.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index 2d026e733..5348d24d8 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -83,7 +83,7 @@ AtomicSimpleCPU::init() { BaseCPU::init(); - if (!params()->defer_registration && + if (!params()->switched_out && system->getMemoryMode() != Enums::atomic) { fatal("The atomic CPU requires the memory system to be in " "'atomic' mode.\n"); @@ -92,7 +92,7 @@ AtomicSimpleCPU::init() // Initialise the ThreadContext's memory proxies tcBase()->initMemProxies(tcBase()); - if (FullSystem && !params()->defer_registration) { + if (FullSystem && !params()->switched_out) { ThreadID size = threadContexts.size(); for (ThreadID i = 0; i < size; ++i) { ThreadContext *tc = threadContexts[i]; diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc index 121db090b..621f99f29 100644 --- a/src/cpu/simple/timing.cc +++ b/src/cpu/simple/timing.cc @@ -66,7 +66,7 @@ TimingSimpleCPU::init() { BaseCPU::init(); - if (!params()->defer_registration && + if (!params()->switched_out && system->getMemoryMode() != Enums::timing) { fatal("The timing CPU requires the memory system to be in " "'timing' mode.\n"); @@ -75,7 +75,7 @@ TimingSimpleCPU::init() // Initialise the ThreadContext's memory proxies tcBase()->initMemProxies(tcBase()); - if (FullSystem && !params()->defer_registration) { + if (FullSystem && !params()->switched_out) { for (int i = 0; i < threadContexts.size(); ++i) { ThreadContext *tc = threadContexts[i]; // initialize CPU, including PC |