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/base.hh | |
| parent | c2d60abf52fc81119970ab0617f9a979f1377685 (diff) | |
| parent | 7571e8346d0ebbc38806c30a75dbcf298d50f08e (diff) | |
| download | gem5-50e2d20cb876a054f53162e7b01306039c213457.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : 1aa0e4569a7c10e6a395c2c951ac29275b5bcf59
Diffstat (limited to 'src/cpu/base.hh')
| -rw-r--r-- | src/cpu/base.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/base.hh b/src/cpu/base.hh index 76f6e4684..3c3e91523 100644 --- a/src/cpu/base.hh +++ b/src/cpu/base.hh @@ -82,8 +82,9 @@ class BaseCPU : public MemObject public: // Tick currentTick; inline Tick frequency() const { return Clock::Frequency / clock; } - inline Tick cycles(int numCycles) const { return clock * numCycles; } + inline Tick ticks(int numCycles) const { return clock * numCycles; } inline Tick curCycle() const { return curTick / clock; } + inline Tick tickToCycles(Tick val) const { return val / clock; } // @todo remove me after debugging with legion done Tick instCount() { return instCnt; } |