1 files changed, 5 insertions, 16 deletions

diff --git a/src/mem/ruby/structures/TimerTable.hh b/src/mem/ruby/structures/TimerTable.hh
index 606201eb4..9efe7ca04 100644
--- a/src/mem/ruby/structures/TimerTable.hh
+++ b/src/mem/ruby/structures/TimerTable.hh
@@ -49,25 +49,16 @@ class TimerTable
         m_consumer_ptr = consumer_ptr;
     }
 
-    void setClockObj(ClockedObject* obj)
-    {
-        assert(m_clockobj_ptr == NULL);
-        m_clockobj_ptr = obj;
-    }
-
     void
     setDescription(const std::string& name)
     {
         m_name = name;
     }
 
-    bool isReady() const;
-    Addr readyAddress() const;
+    bool isReady(Tick curTime) const;
+    Addr nextAddress() const;
     bool isSet(Addr address) const { return !!m_map.count(address); }
-    void set(Addr address, Cycles relative_latency);
-    void set(Addr address, uint64_t relative_latency)
-    { set(address, Cycles(relative_latency)); }
-
+    void set(Addr address, Tick ready_time);
     void unset(Addr address);
     void print(std::ostream& out) const;
 
@@ -82,14 +73,12 @@ class TimerTable
 
     // use a std::map for the address map as this container is sorted
     // and ensures a well-defined iteration order
-    typedef std::map<Addr, Cycles> AddressMap;
+    typedef std::map<Addr, Tick> AddressMap;
     AddressMap m_map;
     mutable bool m_next_valid;
-    mutable Cycles m_next_time; // Only valid if m_next_valid is true
+    mutable Tick m_next_time; // Only valid if m_next_valid is true
     mutable Addr m_next_address;  // Only valid if m_next_valid is true
 
-    //! Object used for querying time.
-    ClockedObject* m_clockobj_ptr;
     //! Consumer to signal a wakeup()
     Consumer* m_consumer_ptr;