107,108c107
< : BaseSimpleCPU(p), icachePort(this, p->clock), dcachePort(this, p->clock),
< cpu_id(p->cpu_id)
---
> : BaseSimpleCPU(p), icachePort(this, p->clock), dcachePort(this, p->clock)
209a209,210
> assert(threadContexts.size() == 1);
> cpuId = tc->readCpuId();
252c253
< cpu_id, /* thread ID */ 0);
---
> cpuId, /* thread ID */ 0);
352c353
< cpu_id, /* thread ID */ 0);
---
> cpuId, /* thread ID */ 0);
477c478
< ifetch_req->setThreadContext(cpu_id, /* thread ID */ 0);
---
> ifetch_req->setThreadContext(cpuId, /* thread ID */ 0);