59a60
> cpuId = tc->readCpuId();
65c66
< TheISA::initCPU(tc, tc->readCpuId());
---
> TheISA::initCPU(tc, cpuId);