dev-arm: Add a VExpress_GEM5_V2 platform with GICv3 support

[gem5.git] / src / dev / intel_8254_timer.hh

diff --git a/src/dev/intel_8254_timer.hh b/src/dev/intel_8254_timer.hh
index bb650d33bb2478872710ca72730249ce8db8bf12..86b91620db674eb129409dc90ccd0decaf599b98 100644 (file)
--- a/src/dev/intel_8254_timer.hh
+++ b/src/dev/intel_8254_timer.hh
@@ -33,12 +33,14 @@
 #ifndef __DEV_8254_HH__
 #define __DEV_8254_HH__
 
-#include <string>
 #include <iostream>
+#include <string>
 
 #include "base/bitunion.hh"
-#include "sim/eventq.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
+#include "base/trace.hh"
+#include "debug/Intel8254Timer.hh"
+#include "sim/eventq_impl.hh"
 #include "sim/serialize.hh"
 
 /** Programmable Interval Timer (Intel 8254) */
@@ -98,6 +100,10 @@ class Intel8254Timer : public EventManager
             friend class Counter;
 
             void setTo(int clocks);
+
+            int clocksLeft();
+
+            Tick getInterval();
         };
 
       private:
@@ -108,8 +114,11 @@ class Intel8254Timer : public EventManager
 
         CounterEvent event;
 
-        /** Current count value */
-        uint16_t count;
+        /** True after startup is called. */
+        bool running;
+
+        /** Initial count value */
+        uint16_t initial_count;
 
         /** Latched count */
         uint16_t latched_count;
@@ -117,6 +126,9 @@ class Intel8254Timer : public EventManager
         /** Interrupt period */
         uint16_t period;
 
+        /** When to start ticking */
+        Tick offset;
+
         /** Current mode of operation */
         uint8_t mode;
 
@@ -141,6 +153,9 @@ class Intel8254Timer : public EventManager
         /** Latch the current count (if one is not already latched) */
         void latchCount();
 
+        /** Get the current count for this counter */
+        int currentCount();
+
         /** Set the read/write mode */
         void setRW(int rw_val);
 
@@ -164,7 +179,7 @@ class Intel8254Timer : public EventManager
          * @param base The base name of the counter object.
          * @param os   The stream to serialize to.
          */
-        void serialize(const std::string &base, std::ostream &os);
+        void serialize(const std::string &base, CheckpointOut &cp) const;
 
         /**
          * Reconstruct the state of this object from a checkpoint.
@@ -172,8 +187,10 @@ class Intel8254Timer : public EventManager
          * @param cp The checkpoint use.
          * @param section The section name of this object
          */
-        void unserialize(const std::string &base, Checkpoint *cp,
-                         const std::string &section);
+        void unserialize(const std::string &base, CheckpointIn &cp);
+
+        /** Start ticking */
+        void startup();
     };
 
   protected:
@@ -229,7 +246,7 @@ class Intel8254Timer : public EventManager
      * @param base The base name of the counter object.
      * @param os The stream to serialize to.
      */
-    void serialize(const std::string &base, std::ostream &os);
+    void serialize(const std::string &base, CheckpointOut &cp) const;
 
     /**
      * Reconstruct the state of this object from a checkpoint.
@@ -237,8 +254,10 @@ class Intel8254Timer : public EventManager
      * @param cp The checkpoint use.
      * @param section The section name of this object
      */
-    void unserialize(const std::string &base, Checkpoint *cp,
-                     const std::string &section);
+    void unserialize(const std::string &base, CheckpointIn &cp);
+
+    /** Start ticking */
+    void startup();
 };
 
 #endif // __DEV_8254_HH__