97c97,98
< : MemObject(p), clock(p->clock), instCnt(0), interrupts(p->interrupts),
---
> : MemObject(p), clock(p->clock), instCnt(0), _cpuId(p->cpu_id),
> interrupts(p->interrupts),
102c103
< : MemObject(p), clock(p->clock),
---
> : MemObject(p), clock(p->clock), _cpuId(p->cpu_id),
108a110,114
> // if Python did not provide a valid ID, do it here
> if (_cpuId == -1 ) {
> _cpuId = cpuList.size();
> }
>
111a118,119
> DPRINTF(SyscallVerbose, "Constructing CPU with id %d\n", _cpuId);
>
281,285c289
< int id = params()->cpu_id;
< if (id != -1)
< id += i;
<
< tc->setCpuId(system->registerThreadContext(tc, id));
---
> system->registerThreadContext(tc);
287c291
< tc->setCpuId(tc->getProcessPtr()->registerThreadContext(tc));
---
> tc->getProcessPtr()->registerThreadContext(tc);
317a322,323
> _cpuId = oldCPU->cpuId();
>
326c332
< assert(newTC->readCpuId() == oldTC->readCpuId());
---
> assert(newTC->cpuId() == oldTC->cpuId());
328c334
< system->replaceThreadContext(newTC, newTC->readCpuId());
---
> system->replaceThreadContext(newTC, newTC->cpuId());
331c337
< newTC->getProcessPtr()->replaceThreadContext(newTC, newTC->readCpuId());
---
> newTC->getProcessPtr()->replaceThreadContext(newTC, newTC->cpuId());