82d81
< cpuId = tc->readCpuId();
88c87
< TheISA::initCPU(tc, cpuId);
---
> TheISA::initCPU(tc, _cpuId);
97,99c96,98
< ifetch_req.setThreadContext(cpuId, 0); // Add thread ID if we add MT
< data_read_req.setThreadContext(cpuId, 0); // Add thread ID here too
< data_write_req.setThreadContext(cpuId, 0); // Add thread ID here too
---
> ifetch_req.setThreadContext(_cpuId, 0); // Add thread ID if we add MT
> data_read_req.setThreadContext(_cpuId, 0); // Add thread ID here too
> data_write_req.setThreadContext(_cpuId, 0); // Add thread ID here too
240,243c239,241
< cpuId = tc->readCpuId();
< ifetch_req.setThreadContext(cpuId, 0); // Add thread ID if we add MT
< data_read_req.setThreadContext(cpuId, 0); // Add thread ID here too
< data_write_req.setThreadContext(cpuId, 0); // Add thread ID here too
---
> ifetch_req.setThreadContext(_cpuId, 0); // Add thread ID if we add MT
> data_read_req.setThreadContext(_cpuId, 0); // Add thread ID here too
> data_write_req.setThreadContext(_cpuId, 0); // Add thread ID here too