diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-10-02 23:03:38 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-10-02 23:03:38 -0700 |
| commit | 50e2d20cb876a054f53162e7b01306039c213457 (patch) | |
| tree | 6e7de959159434e1501ab928bdfbebc91388b353 /src/cpu/trace | |
| parent | c2d60abf52fc81119970ab0617f9a979f1377685 (diff) | |
| parent | 7571e8346d0ebbc38806c30a75dbcf298d50f08e (diff) | |
| download | gem5-50e2d20cb876a054f53162e7b01306039c213457.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : 1aa0e4569a7c10e6a395c2c951ac29275b5bcf59
Diffstat (limited to 'src/cpu/trace')
| -rw-r--r-- | src/cpu/trace/trace_cpu.cc | 4 | ||||
| -rw-r--r-- | src/cpu/trace/trace_cpu.hh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc index e5739b2ce..d3cf34e9d 100644 --- a/src/cpu/trace/trace_cpu.cc +++ b/src/cpu/trace/trace_cpu.cc @@ -110,10 +110,10 @@ TraceCPU::tick() if (mainEventQueue.empty()) { exitSimLoop("end of memory trace reached"); } else { - tickEvent.schedule(mainEventQueue.nextEventTime() + cycles(1)); + tickEvent.schedule(mainEventQueue.nextEventTime() + ticks(1)); } } else { - tickEvent.schedule(max(curTick + cycles(1), nextCycle)); + tickEvent.schedule(max(curTick + ticks(1), nextCycle)); } } diff --git a/src/cpu/trace/trace_cpu.hh b/src/cpu/trace/trace_cpu.hh index 9c96d71d5..b88c7072e 100644 --- a/src/cpu/trace/trace_cpu.hh +++ b/src/cpu/trace/trace_cpu.hh @@ -107,7 +107,7 @@ class TraceCPU : public SimObject MemInterface *dcache_interface, MemTraceReader *data_trace); - inline Tick cycles(int numCycles) { return numCycles; } + inline Tick ticks(int numCycles) { return numCycles; } /** * Perform all the accesses for one cycle. |