88c88
< return curTick;
---
> return curTick();
192c192
< numCycles += tickToCycles(curTick - previousTick);
---
> numCycles += tickToCycles(curTick() - previousTick);
220c220
< previousTick = curTick;
---
> previousTick = curTick();
238c238
< schedule(fetchEvent, nextCycle(curTick + ticks(delay)));
---
> schedule(fetchEvent, nextCycle(curTick() + ticks(delay)));
269c269
< new IprEvent(pkt, this, nextCycle(curTick + delay));
---
> new IprEvent(pkt, this, nextCycle(curTick() + delay));
358,359c358,359
< numCycles += tickToCycles(curTick - previousTick);
< previousTick = curTick;
---
> numCycles += tickToCycles(curTick() - previousTick);
> previousTick = curTick();
541c541
< new IprEvent(dcache_pkt, this, nextCycle(curTick + delay));
---
> new IprEvent(dcache_pkt, this, nextCycle(curTick() + delay));
729,730c729,730
< numCycles += tickToCycles(curTick - previousTick);
< previousTick = curTick;
---
> numCycles += tickToCycles(curTick() - previousTick);
> previousTick = curTick();
757,758c757,758
< numCycles += tickToCycles(curTick - previousTick);
< previousTick = curTick;
---
> numCycles += tickToCycles(curTick() - previousTick);
> previousTick = curTick();
790,791c790,791
< numCycles += tickToCycles(curTick - previousTick);
< previousTick = curTick;
---
> numCycles += tickToCycles(curTick() - previousTick);
> previousTick = curTick();
865c865
< Tick next_tick = cpu->nextCycle(curTick);
---
> Tick next_tick = cpu->nextCycle(curTick());
867c867
< if (next_tick == curTick)
---
> if (next_tick == curTick())
909,910c909,910
< numCycles += tickToCycles(curTick - previousTick);
< previousTick = curTick;
---
> numCycles += tickToCycles(curTick() - previousTick);
> previousTick = curTick();
997c997
< Tick next_tick = cpu->nextCycle(curTick);
---
> Tick next_tick = cpu->nextCycle(curTick());
999c999
< if (next_tick == curTick) {
---
> if (next_tick == curTick()) {