60d59
< cpuId = tc->readCpuId();
66c65
< TheISA::initCPU(tc, cpuId);
---
> TheISA::initCPU(tc, _cpuId);
206c205
< cpuId = tc->readCpuId();
---
> _cpuId = tc->cpuId();
253c252
< cpuId, /* thread ID */ 0);
---
> _cpuId, /* thread ID */ 0);
304c303
< new Request(0, vaddr, size, flags, thread->readPC(), cpuId, 0);
---
> new Request(0, vaddr, size, flags, thread->readPC(), _cpuId, 0);
376c375
< cpuId, /* thread ID */ 0);
---
> _cpuId, /* thread ID */ 0);
445c444
< new Request(0, vaddr, size, flags, thread->readPC(), cpuId, 0);
---
> new Request(0, vaddr, size, flags, thread->readPC(), _cpuId, 0);
531c530
< ifetch_req->setThreadContext(cpuId, /* thread ID */ 0);
---
> ifetch_req->setThreadContext(_cpuId, /* thread ID */ 0);