257c257
< tickEvent.schedule(nextCycle(curTick + cycles(delay)));
---
> tickEvent.schedule(nextCycle(curTick + ticks(delay)));
587c587
< Tick latency = cycles(1); // instruction takes one cycle by default
---
> Tick latency = ticks(1); // instruction takes one cycle by default
645c645
< icache_access ? icache_latency - cycles(1) : 0;
---
> icache_access ? icache_latency - ticks(1) : 0;
647,650c647,650
< dcache_access ? dcache_latency - cycles(1) : 0;
< Tick stall_cycles = (icache_stall + dcache_stall) / cycles(1);
< if (cycles(stall_cycles) < (icache_stall + dcache_stall))
< latency += cycles(stall_cycles+1);
---
> dcache_access ? dcache_latency - ticks(1) : 0;
> Tick stall_cycles = (icache_stall + dcache_stall) / ticks(1);
> if (ticks(stall_cycles) < (icache_stall + dcache_stall))
> latency += ticks(stall_cycles+1);
652c652
< latency += cycles(stall_cycles);
---
> latency += ticks(stall_cycles);