diff options
| author | Miguel Serrano <mserrano@umich.edu> | 2005-07-01 15:12:09 -0400 |
|---|---|---|
| committer | Miguel Serrano <mserrano@umich.edu> | 2005-07-01 15:12:09 -0400 |
| commit | 4f2480a18bdf98792e2ebf3471ce7cd3109ef824 (patch) | |
| tree | b2d8d27e41eae3d659dbe6e6665436d02bcea429 /cpu/base.cc | |
| parent | 16a2357e8637fed706a94ab0da6226df8a2e7f07 (diff) | |
| parent | efd0c5d4b04f630f1b591af509458224b6d98655 (diff) | |
| download | gem5-4f2480a18bdf98792e2ebf3471ce7cd3109ef824.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
--HG--
extra : convert_revision : bb3e977e79599c459fb32f309ce5b486f1639afa
Diffstat (limited to 'cpu/base.cc')
| -rw-r--r-- | cpu/base.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpu/base.cc b/cpu/base.cc index 9e66d934f..50c777b0d 100644 --- a/cpu/base.cc +++ b/cpu/base.cc @@ -189,15 +189,15 @@ BaseCPU::registerExecContexts() { for (int i = 0; i < execContexts.size(); ++i) { ExecContext *xc = execContexts[i]; - int cpu_id; - #ifdef FULL_SYSTEM - cpu_id = system->registerExecContext(xc); + int id = params->cpu_id; + if (id != -1) + id += i; + + xc->cpu_id = system->registerExecContext(xc, id); #else - cpu_id = xc->process->registerExecContext(xc); + xc->cpu_id = xc->process->registerExecContext(xc); #endif - - xc->cpu_id = cpu_id; } } |